diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | libmsi/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/testsuite.at | 1 |
6 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index b632dc7..d4335b9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -100,7 +100,7 @@ endif # Autotest support -dist_noinst_DATA = tests/testsuite.at tests/package.m4 tests/testsuite +dist_noinst_DATA = tests/testsuite.at tests/wixl.at tests/package.m4 tests/testsuite DISTCLEANFILES = atconfig atlocal CLEANFILES = testsuite.log diff --git a/configure.ac b/configure.ac index b202290..89cd339 100644 --- a/configure.ac +++ b/configure.ac @@ -76,6 +76,7 @@ AC_CONFIG_FILES([ libmsi/Makefile libmsi/libmsi-1.0.pc tests/Makefile + tests/data/Makefile ]) AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am index 24e466b..fe0535a 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,7 +2,7 @@ NULL = wixdir = $(datadir)/wixl-0.1/include -wix_DATA = \ +dist_wix_DATA = \ wixl/atk.wxi \ wixl/cairo.wxi \ wixl/celt051.wxi \ diff --git a/libmsi/Makefile.am b/libmsi/Makefile.am index d470344..023ac73 100644 --- a/libmsi/Makefile.am +++ b/libmsi/Makefile.am @@ -20,6 +20,7 @@ libmsi_la_SOURCES = \ drop.c \ insert.c \ libmsi-database.c \ + libmsi-istream.h \ libmsi-istream.c \ libmsi-query.c \ libmsi-record.c \ diff --git a/tests/Makefile.am b/tests/Makefile.am index cced9d6..830eef8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = data + AM_CPPFLAGS = -I$(top_srcdir)/include -I$(srcdir) -I. \ $(GLIB_CFLAGS) $(GOBJECT_CFLAGS) diff --git a/tests/testsuite.at b/tests/testsuite.at index c48c5d1..bd3cc11 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -191,6 +191,7 @@ cp icon.txt expout AT_CHECK_MSIINFO([streams out.msi | grep -v SummaryInformation], [0], [Icon.firefox.16.0.2.0.ico.exe ]) +rm -f expout cp Icon/firefox.16.0.2.0.ico.exe expout AT_CHECK_MSIINFO([extract out.msi Icon.firefox.16.0.2.0.ico.exe > stdout], [0]) AT_CHECK([cmp stdout expout]) |