From 365b906a3e1bda05af10f92451a6b6ae60f8b879 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@lanedo.com>
Date: Tue, 18 Oct 2011 19:57:17 +0200
Subject: [PATCH] build: setup header generator in its own include/Makefile

Also move helper files to the new `build-aux' directory.
---
 .gitignore                                         |  3 ++-
 Makefile.am                                        | 11 +----------
 build-aux/Makefile.am                              |  3 +++
 .../header-generator.xsl                           |  0
 configure.ac                                       |  2 ++
 include/Makefile.am                                | 14 ++++++++++++++
 6 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 build-aux/Makefile.am
 rename header-generator.xsl => build-aux/header-generator.xsl (100%)
 create mode 100644 include/Makefile.am

diff --git a/.gitignore b/.gitignore
index f5804567..5ec4fc80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,11 +37,12 @@ src/tests/test-qcdm-serial-port
 src/tests/test-at-serial-port
 src/tests/test-sms
 policy/org.freedesktop.modem-manager.policy
-include/
 
 libqcdm/tests/test-qcdm
 libwmc/tests/test-wmc
 
+include/ModemManager.h
+
 po/Makefile.in.in
 po/POTFILES
 po/stamp-it
diff --git a/Makefile.am b/Makefile.am
index dd35a28e..095bd162 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ all: $(GENERATED_FILES)
 CLEANFILES = $(GENERATED_FILES)
 endif
 
-SUBDIRS = . marshallers libqcdm libwmc src plugins introspection po test
+SUBDIRS = . marshallers build-aux include libqcdm libwmc src plugins introspection po test
 
 if WITH_POLKIT
 SUBDIRS += policy
@@ -44,14 +44,6 @@ dbusactivationdir = $(datadir)/dbus-1/system-services
 dbusactivation_in_files = org.freedesktop.ModemManager.service.in
 dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service)
 
-includedir = @includedir@/mm
-
-include_HEADERS = include/ModemManager.h
-
-include/ModemManager.h: $(XMLS) introspection/all.xml header-generator.xsl
-	@install -d include
-	$(XSLTPROC) $(top_srcdir)/header-generator.xsl $(top_srcdir)/introspection/all.xml > $@
-
 %service: %service.in
 	$(edit) $< >$@
 
@@ -84,7 +76,6 @@ DISTCLEANFILES = \
 
 EXTRA_DIST = \
 	doc-generator.xsl \
-	header-generator.xsl \
 	$(dbusactivation_in_files) \
 	$(INTLTOOL_FILES) \
 	$(dbusservice_file_polkit) \
diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am
new file mode 100644
index 00000000..fdcf628c
--- /dev/null
+++ b/build-aux/Makefile.am
@@ -0,0 +1,3 @@
+
+EXTRA_DIST = \
+	header-generator.xsl
diff --git a/header-generator.xsl b/build-aux/header-generator.xsl
similarity index 100%
rename from header-generator.xsl
rename to build-aux/header-generator.xsl
diff --git a/configure.ac b/configure.ac
index 1e4dd1f3..fd0871fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,6 +146,8 @@ AM_CONDITIONAL(WMC_STANDALONE, test "yes" = "no")
 AC_CONFIG_FILES([
 Makefile
 marshallers/Makefile
+include/Makefile
+build-aux/Makefile
 libqcdm/Makefile
 libqcdm/src/Makefile
 libqcdm/tests/Makefile
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 00000000..03b6b934
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1,14 @@
+XSLTPROC = xsltproc --xinclude --nonet
+
+XMLS = $(wildcard $(top_srcdir)/introspection/*.xml)
+
+includedir = @includedir@/mm
+
+include_HEADERS = \
+	ModemManager.h
+
+ModemManager.h: $(XMLS) $(top_srcdir)/introspection/all.xml $(top_srcdir)/build-aux/header-generator.xsl
+	$(XSLTPROC) $(top_srcdir)/build-aux/header-generator.xsl $(top_srcdir)/introspection/all.xml > $@
+
+CLEANFILES = \
+	ModemManager.h
\ No newline at end of file