1 files changed, 42 insertions, 34 deletions
diff --git a/Makefile.am b/Makefile.am
index 2bba7a5..623c479 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,43 +1,51 @@
-NULL =
-CLEANFILES =
 ACLOCAL_AMFLAGS = -I m4
-AM_MAKEFLAGS = --no-print-directory
-
-SUBDIRS =					\
-	src					\
-	po					\
-	$(NULL)
-
-EXTRA_DIST =					\
-	intltool-extract.in			\
-	intltool-merge.in			\
-	intltool-update.in			\
-	vapi/libxml-2.0.vapi			\
-	$(NULL)
-
-DISTCLEANFILES =				\
-	intltool-extract			\
-	intltool-merge				\
-	intltool-update				\
-	$(NULL)
+SUBDIRS = libmsi tests .
+
+if WIXL
+SUBDIRS += po wixl
+endif
+
+dist_include_HEADERS = \
+	include/libmsi.h \
+	include/libmsi-database.h \
+	include/libmsi-query.h \
+	include/libmsi-record.h \
+	include/libmsi-summary-info.h \
+	include/libmsi-types.h
+
+AM_CPPFLAGS = -Iinclude -I$(srcdir)/include $(GLIB_CFLAGS) $(GSF_CFLAGS) $(UUID_CFLAGS)
+
+AM_LDFLAGS = -Llibmsi
+
+bin_PROGRAMS = msibuild msiinfo
+
+msibuild_SOURCES = tools/msibuild.c tools/sqldelim.c tools/sqldelim.h
+msibuild_LDADD = -lmsi $(GLIB_LIBS) $(GSF_LIBS) $(UUID_LIBS)
+msibuild_DEPENDENCIES = libmsi/libmsi.la
+
+msiinfo_SOURCES = tools/msiinfo.c
+msiinfo_LDADD = -lmsi $(GLIB_LIBS) $(GSF_LIBS)
+msiinfo_DEPENDENCIES = libmsi/libmsi.la
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libmsi-1.0.pc
 
 # Autotest support
 
-TESTSUITE = $(srcdir)/tests/testsuite
-EXTRA_DIST += tests/testsuite.at $(srcdir)/tests/package.m4 $(TESTSUITE)
-DISTCLEANFILES += atconfig
-CLEANFILES += testsuite.log
+dist_noinst_DATA = tests/testsuite.at tests/package.m4 tests/testsuite
+DISTCLEANFILES = atconfig atlocal
+CLEANFILES = testsuite.log
 
-check-local: $(TESTSUITE) atconfig
-	builddir=`pwd` && \
-		$(SHELL) $(TESTSUITE) AUTOTEST_PATH=$$builddir/src $(TESTSUITEFLAGS)
+check-local: $(srcdir)/tests/testsuite atconfig atlocal
+	$(SHELL) $(srcdir)/tests/testsuite AUTOTEST_PATH=.:wixl $(TESTSUITEFLAGS)
 
-installcheck-local: $(TESTSUITE) atconfig
-	$(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(bindir) $(TESTSUITEFLAGS)
+installcheck-local: $(srcdir)/tests/testsuite atconfig atlocal
+	$(SHELL) $(srcdir)/tests/testsuite AUTOTEST_PATH=$(bindir) $(TESTSUITEFLAGS)
 
 clean-local:
-	-$(SHELL) $(TESTSUITE) --clean
+	-$(SHELL) $(srcdir)/tests/testsuite --clean
 
-$(TESTSUITE): tests/testsuite.at tests/package.m4
-	$(AUTOM4TE) --language=autotest -I$(builddir)/tests -o $@.tmp $@.at
-	mv $@.tmp $@
+$(srcdir)/tests/testsuite: tests/testsuite.at tests/package.m4
+	cd $(srcdir)/tests && \
+		$(AUTOM4TE) --language=autotest -o testsuite.tmp testsuite.at && \
+		mv testsuite.tmp testsuite