X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=d918f6bff4c6f54a5be466f96788a6c21badeae4;hb=40ff57416ecfa4a04ae62f315d62d7fd743d4320;hp=329947ee024acb12fbb7e5fb19db15dac0028cd2;hpb=7318c9fca82a1ffbd8a5253125906d2c8447bf5e;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/Makefile.am b/Makefile.am
index 329947e..d918f6b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,22 @@
 AUTOMAKE_OPTIONS = foreign
-
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I m4
 
 include doxygen.am
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
+DISTCLEANFILES = \
+	@PACKAGE_NAME@.pc \
+	@PACKAGE_NAME@.pc.in \
+	@PACKAGE_NAME@-uninstalled.pc \
+	@PACKAGE_NAME@-uninstalled.sh
+
 dist-hook:
-	rm -rf `find $(distdir)/@PACKAGE_NAME@test/data -name .svn`
+	rm -rf `find $(distdir)/xmltoolingtest/data -name .svn`
 	rm -rf `find $(distdir)/doc/api -name .svn`
 
 
-SUBDIRS = doc schemas @PACKAGE_NAME@ @PACKAGE_NAME@test
+SUBDIRS = doc schemas @PACKAGE_NAME@ xmltoolingtest
 
 if DX_COND_doc
 all-local: doxygen-doc
@@ -22,18 +27,10 @@ endif
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = @PACKAGE_NAME@.pc
 
-GENFILES = @PACKAGE_NAME@.spec @PACKAGE_NAME@.pc pkginfo Portfile
+GENFILES = @PACKAGE_NAME@.spec
 
 EXTRA_DIST = $(DX_CONFIG) \
         cpp-@PACKAGE_NAME@.sln \
-        acx_pthread.m4 \
-        acinclude.m4 \
-        ax_create_pkgconfig_info.m4 \
-        libtool.m4 \
-        doxygen.m4 \
-        depcomp \
         config_win32.h \
         $(GENFILES) \
-        $(GENFILES:%=%.in) \
-        depend \
-        postinstall
+        $(GENFILES:%=%.in)