build: setup header generator in its own include/Makefile

Also move helper files to the new `build-aux' directory.
This commit is contained in:
Aleksander Morgado
2011-10-18 19:57:17 +02:00
parent 4643dca4a2
commit 365b906a3e
6 changed files with 22 additions and 11 deletions

3
.gitignore vendored
View File

@@ -37,11 +37,12 @@ src/tests/test-qcdm-serial-port
src/tests/test-at-serial-port src/tests/test-at-serial-port
src/tests/test-sms src/tests/test-sms
policy/org.freedesktop.modem-manager.policy policy/org.freedesktop.modem-manager.policy
include/
libqcdm/tests/test-qcdm libqcdm/tests/test-qcdm
libwmc/tests/test-wmc libwmc/tests/test-wmc
include/ModemManager.h
po/Makefile.in.in po/Makefile.in.in
po/POTFILES po/POTFILES
po/stamp-it po/stamp-it

View File

@@ -20,7 +20,7 @@ all: $(GENERATED_FILES)
CLEANFILES = $(GENERATED_FILES) CLEANFILES = $(GENERATED_FILES)
endif 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 if WITH_POLKIT
SUBDIRS += policy SUBDIRS += policy
@@ -44,14 +44,6 @@ dbusactivationdir = $(datadir)/dbus-1/system-services
dbusactivation_in_files = org.freedesktop.ModemManager.service.in dbusactivation_in_files = org.freedesktop.ModemManager.service.in
dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service) 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 %service: %service.in
$(edit) $< >$@ $(edit) $< >$@
@@ -84,7 +76,6 @@ DISTCLEANFILES = \
EXTRA_DIST = \ EXTRA_DIST = \
doc-generator.xsl \ doc-generator.xsl \
header-generator.xsl \
$(dbusactivation_in_files) \ $(dbusactivation_in_files) \
$(INTLTOOL_FILES) \ $(INTLTOOL_FILES) \
$(dbusservice_file_polkit) \ $(dbusservice_file_polkit) \

3
build-aux/Makefile.am Normal file
View File

@@ -0,0 +1,3 @@
EXTRA_DIST = \
header-generator.xsl

View File

@@ -146,6 +146,8 @@ AM_CONDITIONAL(WMC_STANDALONE, test "yes" = "no")
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
marshallers/Makefile marshallers/Makefile
include/Makefile
build-aux/Makefile
libqcdm/Makefile libqcdm/Makefile
libqcdm/src/Makefile libqcdm/src/Makefile
libqcdm/tests/Makefile libqcdm/tests/Makefile

14
include/Makefile.am Normal file
View File

@@ -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