mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-31 22:25:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: Add wayland-scanner.pc.

Browse source 
To allow user program to include wayland-scanner.m4 in tarball, move
the path variables from it into wayland-scanner.pc.
This commit is contained in:
Daiki Ueno 2013-07-02 18:38:15 +09:00 • committed by Kristian Høgsberg
parent 60fc83af6e
commit 40fc79d5b0
7 changed files with 32 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -7,6 +7,6 @@ SUBDIRS = src protocol $(doc_subdir) tests cursor
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
aclocaldir = $(datadir)/aclocal aclocaldir = $(datadir)/aclocal
aclocal_DATA = wayland-scanner.m4 dist_aclocal_DATA = wayland-scanner.m4
dist_pkgdata_DATA = wayland-scanner.mk dist_pkgdata_DATA = wayland-scanner.mk

3
configure.ac
View file

@ -127,7 +127,6 @@ fi
AM_CONDITIONAL([HAVE_PUBLICAN], [test "x$PUBLICAN" != "x"]) AM_CONDITIONAL([HAVE_PUBLICAN], [test "x$PUBLICAN" != "x"])
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
wayland-scanner.m4
cursor/Makefile cursor/Makefile
cursor/wayland-cursor.pc cursor/wayland-cursor.pc
cursor/wayland-cursor-uninstalled.pc cursor/wayland-cursor-uninstalled.pc
@ -138,8 +137,10 @@ AC_CONFIG_FILES([Makefile
src/Makefile src/Makefile
src/wayland-server-uninstalled.pc src/wayland-server-uninstalled.pc
src/wayland-client-uninstalled.pc src/wayland-client-uninstalled.pc
src/wayland-scanner-uninstalled.pc
src/wayland-server.pc src/wayland-server.pc
src/wayland-client.pc src/wayland-client.pc
src/wayland-scanner.pc
src/wayland-version.h src/wayland-version.h
protocol/Makefile protocol/Makefile
tests/Makefile]) tests/Makefile])

3
src/Makefile.am
View file

@ -57,6 +57,9 @@ wayland_scanner_SOURCES = \
wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la
$(BUILT_SOURCES) : wayland-scanner $(BUILT_SOURCES) : wayland-scanner
scannerpkgconfigdir = $(datadir)/pkgconfig
scannerpkgconfig_DATA = wayland-scanner.pc
endif endif
BUILT_SOURCES = \ BUILT_SOURCES = \

6
src/wayland-scanner-uninstalled.pc.in Normal file
View file

@ -0,0 +1,6 @@
pkgdatadir=@abs_top_srcdir@
wayland_scanner=@abs_builddir@/wayland-scanner
Name: Wayland Scanner
Description: Wayland scanner (not installed)
Version: @PACKAGE_VERSION@

9
src/wayland-scanner.pc.in Normal file
View file

@ -0,0 +1,9 @@
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@

11
wayland-scanner.m4 Normal file
View file

@ -0,0 +1,11 @@
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])
])

16
wayland-scanner.m4.in
View file

@ -1,16 +0,0 @@
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}
])