diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-01-25 15:12:21 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-01-25 15:12:21 +0100 |
| commit | 7971b1728a5ff9acd4afa3736627ebddea28d90c (patch) | |
| tree | f81c596c3846391f04faa28a68dc3d88bd54fb8c /Makefile.am | |
| parent | b7346c11677f1592cf530ccb1190655a31998dd0 (diff) | |
| download | msitools-7971b1728a5ff9acd4afa3736627ebddea28d90c.tar.gz msitools-7971b1728a5ff9acd4afa3736627ebddea28d90c.tar.xz msitools-7971b1728a5ff9acd4afa3736627ebddea28d90c.zip | |
build-sys: use a static libcommon.a to workaround automake
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 756332c..33279fb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,6 +60,18 @@ msiextract_LDADD = $(wixl_LDADD) # Wixl +noinst_LIBRARIES = libcommon.a +libcommon_a_SOURCES = \ + tools/wixl/util.vala \ + $(NULL) +libcommon_a_VALAFLAGS = \ + --enable-experimental \ + --pkg gio-2.0 \ + --pkg posix \ + -H libcommon.h --library common \ + $(NULL) +libcommon_a_CFLAGS = -w + bin_PROGRAMS += wixl wixl_CFLAGS = -w @@ -76,6 +88,7 @@ wixl_VALAFLAGS = \ --pkg libgcab-1.0 \ --pkg libxml-2.0 \ --pkg posix \ + --pkg common \ $(NULL) wixl_SOURCES = \ @@ -83,7 +96,6 @@ wixl_SOURCES = \ tools/wixl/msi-default.vala \ tools/wixl/msi.vala \ tools/wixl/preprocessor.vala \ - tools/wixl/util.vala \ tools/wixl/wix.vala \ tools/wixl/wixl.vala \ $(NULL) @@ -102,6 +114,7 @@ wixl_CPPFLAGS = \ wixl_LDADD = \ $(WIXL_LIBS) \ libmsi/libmsi.la \ + libcommon.a \ $(NULL) wixl_DEPENDENCIES = libmsi/libmsi.la @@ -117,12 +130,12 @@ wixl_heat_VALAFLAGS = \ --pkg config \ --pkg gio-2.0 \ --pkg posix \ + --pkg common \ --enable-experimental \ $(NULL) wixl_heat_SOURCES = \ tools/wixl/wixl-heat.vala \ - tools/wixl/util.vala \ $(NULL) wixl_heat_CPPFLAGS = $(wixl_CPPFLAGS) |