X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=0c5a5087d20c2038d754d4136f36df8562b7e5fa;hb=b713fde8a8ddce88cf2ff03ef8ef2a5ea037d3b4;hp=7f4b6937fd3004029f90163cb7ba80b09b773345;hpb=2623f4fb43f1077171ba62eb4f06c6b963a002e3;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/Makefile.am b/Makefile.am
index 7f4b693..0c5a508 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
-
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I m4
 
 include doxygen.am
 
@@ -8,46 +7,29 @@ MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
 dist-hook:
 	rm -rf `find $(distdir)/xmltoolingtest/data -name .svn`
+	rm -rf `find $(distdir)/doc/api -name .svn`
 
 
-SUBDIRS = doc schemas xmltooling xmltoolingtest
+SUBDIRS = doc schemas @PACKAGE_NAME@ xmltoolingtest
 
 if DX_COND_doc
-all-local: doxygen-doc xmltooling.spec pkginfo
-APIDOCS = doc/api
+all-local: doxygen-doc
 else
-all-local: xmltooling.spec pkginfo
+all-local:
 endif
 
-install-data-hook:
-	rm -rf $(DESTDIR)/$(prefix)/doc/@PACKAGE@/api
-	cp -r doc/api $(DESTDIR)/$(prefix)/doc/@PACKAGE@
-
-xmltooling.spec: xmltooling.spec.in Makefile
-	rm -f $@.tmp
-	sed < $< > $@.tmp \
-	    -e 's:@-VERSION-@:${VERSION}:'
-	mv $@.tmp $@
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = @PACKAGE_NAME@.pc
 
-pkginfo: pkginfo.in Makefile
-	rm -f $@.tmp
-	sed < $< > $@.tmp \
-	    -e 's:@-VERSION-@:${VERSION}:'
-	mv $@.tmp $@
+GENFILES = @PACKAGE_NAME@.spec pkginfo Portfile
 
 EXTRA_DIST = $(DX_CONFIG) \
-        $(APIDOCS) \
-        cpp-xmltooling.sln \
-        acx_pthread.m4 \
-        acinclude.m4 \
-        libtool.m4 \
-        doxygen.m4 \
-        depcomp \
+        cpp-@PACKAGE_NAME@.sln \
+        m4/acx_pthread.m4 \
+        m4/acinclude.m4 \
+        m4/ax_create_pkgconfig_info.m4 \
+        m4/doxygen.m4 \
         config_win32.h \
-        xmltooling.spec.in \
-        xmltooling.spec \
-        pkginfo.in \
-        pkginfo \
-        checkinstall
-
-DISTCLEANFILES = xmltooling.spec pkginfo
+        $(GENFILES) \
+        $(GENFILES:%=%.in) \
+        postinstall