- rm -rf `find $(distdir)/schemas -name Makefile`
-
-SUBDIRS = schemas xmltooling xmltoolingtest
-
-#all-local: opensaml.spec pkginfo
-#
-#opensaml.spec: opensaml.spec.in Makefile
-# rm -f $@.tmp
-# sed < $< > $@.tmp \
-# -e 's:@-VERSION-@:${VERSION}:'
-# mv $@.tmp $@
-#
-#pkginfo: pkginfo.in Makefile
-# rm -f $@.tmp
-# sed < $< > $@.tmp \
-# -e 's:@-VERSION-@:${VERSION}:'
-# mv $@.tmp $@
-#
-#DISTCLEANFILES = opensaml.spec pkginfo
+ 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)