added suport for 'make distcheck' target using no GNU make extentions at all

diff --git a/Makefile.am b/Makefile.am
index ea1a3c9..bef6995 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 ## This file is part of Metaproxy
 ## Copyright (C) 2005-2006, Index Data ApS
-## $Id: Makefile.am,v 1.18 2006-10-10 15:10:16 marc Exp $
+## $Id: Makefile.am,v 1.19 2006-10-11 13:21:51 marc Exp $
 
-SUBDIRS = src xml doc etc
+SUBDIRS = etc doc src xml 
 
 ACLOCAL_AMFLAGS = -I m4
 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 05fbf57..c94b058 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.28 2006-09-08 14:12:28 marc Exp $
+## $Id: Makefile.am,v 1.29 2006-10-11 13:21:51 marc Exp $
 docdir=$(datadir)/doc/@PACKAGE@
 
 SUBDIRS = common
@@ -23,14 +23,17 @@ MANFILES = auth_simple.3mp backend_test.3mp  bounce.3mp \
 
 HTMLFILES = index.html
 
+# testing if this does the job of collecting up the unnamed '*.html' files 
+#UNLISTEDHTML = $(wildcard *.html)
+
 PNGFILES = multi.png
 
 doc_DATA = $(HTMLFILES) $(PNGFILES)
 man_MANS = $(MANFILES)
 
-EXTRA_DIST = $(XMLFILES) $(XMLMAN) $(doc_DATA) $(man_MANS) multi.svg
+EXTRA_DIST = $(XMLFILES) $(XMLMAN) $(doc_DATA) $(man_MANS) multi.svg 
 
-$(HTMLFILES): $(XMLFILES) multi.png
+$(HTMLFILES): $(XMLFILES) $(PNGFILES)
        rm -f *.html
        $(HTML_COMPILE) $(MAINXML)
 
@@ -66,9 +69,10 @@ multi.png: multi.svg
 multi.eps: multi.svg
        inkscape --export-eps=$@ --export-bbox-page $?
 
-%.pdf: %.eps
+.eps.pdf:
        epstopdf -hires $?
 
+
 clean-data-hook:
        rm -f [0-9]* *.bak
 
@@ -83,3 +87,7 @@ install-data-hook:
        for p in $$d/*.html; do \
                $(docDATA_INSTALL) $$p $(DESTDIR)/$(docdir); \
        done
+
+uninstall-hook:
+       rm -r $(DESTDIR)/$(docdir)
+

diff --git a/etc/Makefile.am b/etc/Makefile.am
index fc3dfc0..ea834d2 100644 (file)
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,29 +1,29 @@
-# $Id: Makefile.am,v 1.5 2006-10-10 15:41:51 marc Exp $
+# $Id: Makefile.am,v 1.6 2006-10-11 13:21:51 marc Exp $
 
 # This doesn't actually build anything, it just tests whether the
 # configuration files here correspond with the schema.
 
 etcdatadir = $(pkgdatadir)/etc
 
-xmlconfig = config-bytarget.xml \
-    config-local.xml \
-    config-record-transform.xml \
-    config-shared1.xml \
-    config-simple-multi.xml \
-    config-sru-to-z3950.xml \
-    config-zurg.xml \
-    config0.xml \
-    config1.xml \
-    config2.xml \
-    config3.xml \
-    config4.xml \
-    config5.xml
+xmlconfig = $(srcdir)/config-bytarget.xml \
+    $(srcdir)/config-local.xml \
+    $(srcdir)/config-record-transform.xml \
+    $(srcdir)/config-shared1.xml \
+    $(srcdir)/config-simple-multi.xml \
+    $(srcdir)/config-sru-to-z3950.xml \
+    $(srcdir)/config-zurg.xml \
+    $(srcdir)/config0.xml \
+    $(srcdir)/config1.xml \
+    $(srcdir)/config2.xml \
+    $(srcdir)/config3.xml \
+    $(srcdir)/config4.xml \
+    $(srcdir)/config5.xml
 
 config = example.simple-auth example.target-auth pqf2pqf.xsl
 
 
-rng = ../xml/schema/metaproxy.rng
-xsd = ../xml/schema/metaproxy.xsd
+rng = $(srcdir)/../xml/schema/metaproxy.rng
+xsd = $(srcdir)/../xml/schema/metaproxy.xsd
 
 etcdata_DATA = $(xmlconfig) $(config)
 

diff --git a/xml/schema/Makefile.am b/xml/schema/Makefile.am
index 4a2971f..24bb805 100644 (file)
--- a/xml/schema/Makefile.am
+++ b/xml/schema/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2006-10-10 15:10:18 marc Exp $
+# $Id: Makefile.am,v 1.2 2006-10-11 13:21:52 marc Exp $
 
 xmlschemadatadir = $(pkgdatadir)/xml/schema
 
@@ -11,10 +11,10 @@ EXTRA_DIST = $(xmlschemadata_DATA)
 
 
 # pattern compile RelaxNG Compact to RelaxNG XML
-%.rng : %.rnc
+.rnc.rng:
        trang $< $@  
 
 # pattern compile RelaxNG Compact to XML Schema
-%.xsd : %.rnc 
+.rnc.xsd:
        trang $< $@