Commit 40fc79d5 authored by Daiki Ueno's avatar Daiki Ueno Committed by Kristian Høgsberg

build: Add wayland-scanner.pc.

To allow user program to include wayland-scanner.m4 in tarball, move
the path variables from it into wayland-scanner.pc.
parent 60fc83af
......@@ -7,6 +7,6 @@ SUBDIRS = src protocol $(doc_subdir) tests cursor
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
aclocaldir = $(datadir)/aclocal
aclocal_DATA = wayland-scanner.m4
dist_aclocal_DATA = wayland-scanner.m4
dist_pkgdata_DATA = wayland-scanner.mk
......@@ -127,7 +127,6 @@ fi
AM_CONDITIONAL([HAVE_PUBLICAN], [test "x$PUBLICAN" != "x"])
AC_CONFIG_FILES([Makefile
wayland-scanner.m4
cursor/Makefile
cursor/wayland-cursor.pc
cursor/wayland-cursor-uninstalled.pc
......@@ -138,8 +137,10 @@ AC_CONFIG_FILES([Makefile
src/Makefile
src/wayland-server-uninstalled.pc
src/wayland-client-uninstalled.pc
src/wayland-scanner-uninstalled.pc
src/wayland-server.pc
src/wayland-client.pc
src/wayland-scanner.pc
src/wayland-version.h
protocol/Makefile
tests/Makefile])
......
......@@ -57,6 +57,9 @@ wayland_scanner_SOURCES = \
wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la
$(BUILT_SOURCES) : wayland-scanner
scannerpkgconfigdir = $(datadir)/pkgconfig
scannerpkgconfig_DATA = wayland-scanner.pc
endif
BUILT_SOURCES = \
......
pkgdatadir=@abs_top_srcdir@
wayland_scanner=@abs_builddir@/wayland-scanner
Name: Wayland Scanner
Description: Wayland scanner (not installed)
Version: @PACKAGE_VERSION@
prefix=@prefix@
exec_prefix=@exec_prefix@
datarootdir=@datarootdir@
pkgdatadir=@datadir@/@PACKAGE@
wayland_scanner=@bindir@/wayland-scanner
Name: Wayland Scanner
Description: Wayland scanner
Version: @WAYLAND_VERSION@
AC_DEFUN([WAYLAND_SCANNER_RULES], [
PKG_PROG_PKG_CONFIG
wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
AC_SUBST([wayland_scanner])
wayland_scanner_rules=`$PKG_CONFIG --variable=pkgdatadir wayland-scanner`/wayland-scanner.mk
AC_SUBST_FILE([wayland_scanner_rules])
AC_SUBST([wayland_protocoldir], [$1])
])
AC_DEFUN([WAYLAND_SCANNER_RULES], [
wayland__prefix=${prefix}
wayland__exec_prefix=${exec_prefix}
prefix=@prefix@
exec_prefix=@exec_prefix@
AC_PATH_PROG([wayland_scanner], [wayland-scanner], [/bin/false],
[@bindir@$PATH_SEPARATOR$PATH])
AC_SUBST_FILE([wayland_scanner_rules])
AC_SUBST([wayland_protocoldir], [$1])
wayland_scanner_rules=@datarootdir@/aclocal/wayland-scanner.mk
prefix=${wayland__prefix}
exec_prefix=${wayland__exec_prefix}
])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment