Avoid use of newer iterator methods

[shibboleth/cpp-xmltooling.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 24d6d03..d918f6b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,32 +1,36 @@
-AUTOMAKE_OPTIONS = foreign\r
-\r
-ACLOCAL_AMFLAGS = -I .\r
-\r
-EXTRA_DIST =\r
-       schemas \\r
-       cpp-xmltooling.sln \\r
-       libtool.m4 \\r
-       acx_pthread.m4 \\r
-       depcomp \\r
-       config_win32.h\r
-\r
-dist-hook:\r
-       rm -rf `find $(distdir)/schemas -name Makefile`\r
-\r
-SUBDIRS = schemas xmltooling\r
-\r
-#all-local: opensaml.spec pkginfo\r
-#\r
-#opensaml.spec: opensaml.spec.in Makefile\r
-#      rm -f $@.tmp\r
-#      sed < $< > $@.tmp \\r
-#          -e 's:@-VERSION-@:${VERSION}:'\r
-#      mv $@.tmp $@\r
-#\r
-#pkginfo: pkginfo.in Makefile\r
-#      rm -f $@.tmp\r
-#      sed < $< > $@.tmp \\r
-#          -e 's:@-VERSION-@:${VERSION}:'\r
-#      mv $@.tmp $@\r
-#\r
-#DISTCLEANFILES = opensaml.spec pkginfo\r
+AUTOMAKE_OPTIONS = foreign
+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)/xmltoolingtest/data -name .svn`
+       rm -rf `find $(distdir)/doc/api -name .svn`
+
+
+SUBDIRS = doc schemas @PACKAGE_NAME@ xmltoolingtest
+
+if DX_COND_doc
+all-local: doxygen-doc
+else
+all-local:
+endif
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = @PACKAGE_NAME@.pc
+
+GENFILES = @PACKAGE_NAME@.spec
+
+EXTRA_DIST = $(DX_CONFIG) \
+        cpp-@PACKAGE_NAME@.sln \
+        config_win32.h \
+        $(GENFILES) \
+        $(GENFILES:%=%.in)