diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-01-09 17:42:42 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-01-09 18:04:24 +0100 |
| commit | 68f9b97fc9618208b5fc951c1b74a8f9db1fd0e2 (patch) | |
| tree | 99cbe905289d93523dfe01a6f5e1841129428d76 | |
| parent | 549146755c4a510dd3fd8db87724c3b573927d89 (diff) | |
| download | msitools-68f9b97fc9618208b5fc951c1b74a8f9db1fd0e2.tar.gz msitools-68f9b97fc9618208b5fc951c1b74a8f9db1fd0e2.tar.xz msitools-68f9b97fc9618208b5fc951c1b74a8f9db1fd0e2.zip | |
merge wixl makefile into toplevel
| -rw-r--r-- | Makefile.am | 63 | ||||
| -rw-r--r-- | config.vapi (renamed from wixl/config.vapi) | 0 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | wixl/Makefile.am | 46 |
4 files changed, 56 insertions, 54 deletions
diff --git a/Makefile.am b/Makefile.am index 623c479..7832032 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,6 @@ +NULL = ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = libmsi tests . - -if WIXL -SUBDIRS += po wixl -endif +SUBDIRS = libmsi tests po . dist_include_HEADERS = \ include/libmsi.h \ @@ -13,10 +10,14 @@ dist_include_HEADERS = \ include/libmsi-summary-info.h \ include/libmsi-types.h -AM_CPPFLAGS = -Iinclude -I$(srcdir)/include $(GLIB_CFLAGS) $(GSF_CFLAGS) $(UUID_CFLAGS) +AM_CPPFLAGS = -Iinclude -I$(srcdir)/include \ + $(GLIB_CFLAGS) $(GSF_CFLAGS) $(UUID_CFLAGS) \ + $(NULL) AM_LDFLAGS = -Llibmsi +# Low-level tools + bin_PROGRAMS = msibuild msiinfo msibuild_SOURCES = tools/msibuild.c tools/sqldelim.c tools/sqldelim.h @@ -27,6 +28,54 @@ msiinfo_SOURCES = tools/msiinfo.c msiinfo_LDADD = -lmsi $(GLIB_LIBS) $(GSF_LIBS) msiinfo_DEPENDENCIES = libmsi/libmsi.la +# Wixl + +bin_PROGRAMS += wixl + +wixl_CFLAGS = -w + +# --vapidir paths are relative to the source directory! + +wixl_VALAFLAGS = \ + -H wixl.h --use-header \ + --vapidir=. \ + --vapidir=vapi \ + --vapidir=$(abs_top_builddir)/libmsi \ + --pkg config \ + --enable-experimental \ + --pkg gio-2.0 \ + --pkg libmsi-1.0 \ + --pkg libgcab-1.0 \ + --pkg libxml-2.0 \ + --pkg posix \ + $(NULL) + +wixl_SOURCES = \ + wixl/builder.vala \ + wixl/msi.vala \ + wixl/preprocessor.vala \ + wixl/util.vala \ + wixl/wix.vala \ + wixl/wixl.vala \ + $(NULL) + +wixl_CPPFLAGS = \ + -include config.h \ + -I $(top_srcdir)/include \ + $(WIXL_CFLAGS) \ + -DG_LOG_DOMAIN=\""wixl"\" \ + -DLOCALEDIR=\""$(localedir)"\" \ + -DPKGDATADIR=\""$(pkgdatadir)"\" \ + -DPKGLIBDIR=\""$(pkglibdir)"\" \ + $(NULL) + +wixl_LDADD = \ + $(WIXL_LIBS) \ + libmsi/libmsi.la \ + $(NULL) + +wixl_DEPENDENCIES = libmsi/libmsi.la + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libmsi-1.0.pc @@ -37,7 +86,7 @@ DISTCLEANFILES = atconfig atlocal CLEANFILES = testsuite.log check-local: $(srcdir)/tests/testsuite atconfig atlocal - $(SHELL) $(srcdir)/tests/testsuite AUTOTEST_PATH=.:wixl $(TESTSUITEFLAGS) + $(SHELL) $(srcdir)/tests/testsuite AUTOTEST_PATH=. $(TESTSUITEFLAGS) installcheck-local: $(srcdir)/tests/testsuite atconfig atlocal $(SHELL) $(srcdir)/tests/testsuite AUTOTEST_PATH=$(bindir) $(TESTSUITEFLAGS) diff --git a/wixl/config.vapi b/config.vapi index 96bf752..96bf752 100644 --- a/wixl/config.vapi +++ b/config.vapi diff --git a/configure.ac b/configure.ac index a28fc48..123446e 100644 --- a/configure.ac +++ b/configure.ac @@ -70,7 +70,6 @@ AC_CONFIG_FILES([ libmsi-1.0.pc po/Makefile.in libmsi/Makefile - wixl/Makefile tests/Makefile ]) AC_OUTPUT diff --git a/wixl/Makefile.am b/wixl/Makefile.am deleted file mode 100644 index 8e1bfa7..0000000 --- a/wixl/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -NULL = -bin_PROGRAMS = wixl - -AM_CFLAGS = -w - -# --vapidir paths are relative to the source directory! - -AM_VALAFLAGS = \ - -H wixl.h --use-header \ - --vapidir=. \ - --vapidir=../vapi \ - --vapidir=$(abs_top_builddir)/libmsi \ - --pkg config \ - --enable-experimental \ - --pkg gio-2.0 \ - --pkg libmsi-1.0 \ - --pkg libgcab-1.0 \ - --pkg libxml-2.0 \ - --pkg posix \ - $(NULL) - -wixl_SOURCES = \ - builder.vala \ - msi.vala \ - preprocessor.vala \ - util.vala \ - wix.vala \ - wixl.vala \ - $(NULL) - -AM_CPPFLAGS = \ - -include config.h \ - -I $(top_srcdir)/include \ - $(WIXL_CFLAGS) \ - -DG_LOG_DOMAIN=\""wixl"\" \ - -DLOCALEDIR=\""$(localedir)"\" \ - -DPKGDATADIR=\""$(pkgdatadir)"\" \ - -DPKGLIBDIR=\""$(pkglibdir)"\" \ - $(NULL) - -wixl_LDADD = \ - $(WIXL_LIBS) \ - ../libmsi/libmsi.la \ - $(NULL) - -wixl_DEPENDENCIES = ../libmsi/libmsi.la |