[PATCH] build: Remove wayland-scanner.{m4,mk,pc}

Daiki Ueno ueno at gnu.org
Wed Aug 21 00:28:28 PDT 2013


Remove autotools related stuff no longer used by weston.
---
 Makefile.am                           |  5 -----
 configure.ac                          |  2 --
 src/Makefile.am                       |  3 ---
 src/wayland-scanner-uninstalled.pc.in |  6 ------
 src/wayland-scanner.pc.in             |  9 ---------
 wayland-scanner.m4                    | 13 -------------
 wayland-scanner.mk                    |  8 --------
 7 files changed, 46 deletions(-)
 delete mode 100644 src/wayland-scanner-uninstalled.pc.in
 delete mode 100644 src/wayland-scanner.pc.in
 delete mode 100644 wayland-scanner.m4
 delete mode 100644 wayland-scanner.mk

diff --git a/Makefile.am b/Makefile.am
index ddf39d1..b56b214 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,8 +5,3 @@ endif
 SUBDIRS = src protocol $(doc_subdir) tests cursor
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-aclocaldir = $(datadir)/aclocal
-dist_aclocal_DATA = wayland-scanner.m4
-
-dist_pkgdata_DATA = wayland-scanner.mk
diff --git a/configure.ac b/configure.ac
index 536df9e..ee1260a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,10 +137,8 @@ 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])
diff --git a/src/Makefile.am b/src/Makefile.am
index 4226f63..4fa7425 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,9 +57,6 @@ 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 =					\
diff --git a/src/wayland-scanner-uninstalled.pc.in b/src/wayland-scanner-uninstalled.pc.in
deleted file mode 100644
index 8dcfef3..0000000
--- a/src/wayland-scanner-uninstalled.pc.in
+++ /dev/null
@@ -1,6 +0,0 @@
-pkgdatadir=@abs_top_srcdir@
-wayland_scanner=@abs_builddir@/wayland-scanner
- 
-Name: Wayland Scanner
-Description: Wayland scanner (not installed)
-Version: @PACKAGE_VERSION@
diff --git a/src/wayland-scanner.pc.in b/src/wayland-scanner.pc.in
deleted file mode 100644
index 7b2a4c9..0000000
--- a/src/wayland-scanner.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-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@
diff --git a/wayland-scanner.m4 b/wayland-scanner.m4
deleted file mode 100644
index 4e4222a..0000000
--- a/wayland-scanner.m4
+++ /dev/null
@@ -1,13 +0,0 @@
-AC_DEFUN([WAYLAND_SCANNER_RULES], [
-    PKG_PROG_PKG_CONFIG
-
-    PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner])
-
-    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])
-])
diff --git a/wayland-scanner.mk b/wayland-scanner.mk
deleted file mode 100644
index 0a72062..0000000
--- a/wayland-scanner.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-%-protocol.c : $(wayland_protocoldir)/%.xml
-	$(AM_V_GEN)$(wayland_scanner) code < $< > $@
-
-%-server-protocol.h : $(wayland_protocoldir)/%.xml
-	$(AM_V_GEN)$(wayland_scanner) server-header < $< > $@
-
-%-client-protocol.h : $(wayland_protocoldir)/%.xml
-	$(AM_V_GEN)$(wayland_scanner) client-header < $< > $@
-- 
1.8.3.1



More information about the wayland-devel mailing list