* Makefile.am, Makefile.maint, tests/Makefile.am: Use path for

dependencies built in the source tree, to cater for BSD make.

diff --git a/ChangeLog b/ChangeLog
index 8305c9533af773f2b6a2533ca565e0b44548dfd1..f0a9fd8caeffc4e239d7e16d91df6d322118f6aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-28  Patrick Welche <prlw1@newn.cam.ac.uk>,
+           Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.am, Makefile.maint, tests/Makefile.am: Use path for
+       dependencies built in the source tree, to cater for BSD make.
+
 2004-10-24  Gary V. Vaughan  <gary@gnu.org>
 
        * HACKING: Fix a typo in the gpg --verify instructions.

diff --git a/Makefile.am b/Makefile.am
index 96b0d55c38348cc06c2d14ddb4e150410b057566..7f1024cf306151bb5c8ff29b992d1b24fd5455fd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,7 +95,7 @@ clean-ltmain-sh:
 # Use `$(top_srcdir)/m4' for the benefit of non-GNU makes: this is
 # how ltversion.m4 appears in our dependencies.
 EXTRA_DIST += m4/ltversion.in m4/ltversion.m4
-$(top_srcdir)/m4/ltversion.m4: m4/ltversion.in configure.ac stamp-vcl
+$(top_srcdir)/m4/ltversion.m4: m4/ltversion.in configure.ac $(top_srcdir)/stamp-vcl
        set -- `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; \
        cd $(top_srcdir); \
        rm -f m4/ltversion.tmp; \
@@ -115,7 +115,8 @@ $(top_srcdir)/m4/ltversion.m4: m4/ltversion.in configure.ac stamp-vcl
 ##          distcheck (at least) by rebuilding ltmain.sh in the source
 ##          tree whenever config.status regenerates the Makefile.
 EXTRA_DIST += config/ltmain.sh
-$(top_srcdir)/config/ltmain.sh: $(sh_files) config/ltmain.m4sh configure.ac stamp-vcl
+$(top_srcdir)/config/ltmain.sh: $(sh_files) config/ltmain.m4sh configure.ac \
+                               $(top_srcdir)/stamp-vcl
        $(timestamp); \
        cd $(top_srcdir); \
        rm -f config/ltmain.in config/ltmain.tmp config/ltmain.sh; \
@@ -131,7 +132,7 @@ $(top_srcdir)/config/ltmain.sh: $(sh_files) config/ltmain.m4sh configure.ac stam
 # The libtool distributor and the standalone libtool script.
 bin_SCRIPTS = libtoolize libtool
 
-libtoolize: libtoolize.in
+libtoolize: $(top_srcdir)/libtoolize.in
        rm -f libtoolize.tmp libtoolize
        $(timestamp); \
        input="libtoolize.m4sh"; \
@@ -152,7 +153,7 @@ $(top_srcdir)/libtoolize.in: $(sh_files) libtoolize.m4sh Makefile.am
 # The defs script shouldn't be recreated whenever the Makefile is
 # regenerated since the source tree can be read-only.
 check-recursive: tests/defs
-tests/defs: tests/defs.in
+tests/defs: $(top_srcdir)/tests/defs.in
        rm -f tests/defs.tmp tests/defs; \
        input="defs.m4sh"; \
        $(edit) $(top_srcdir)/tests/defs.in > tests/defs.tmp; \
@@ -168,7 +169,8 @@ $(top_srcdir)/tests/defs.in: tests/defs.m4sh Makefile.am
 
 # Automake doesn't want us to generate distributed files from config.status,
 # but the alternative (see libtool-1.4.3) was even uglier!
-libtool: $(top_builddir)/config.status config/ltmain.sh stamp-vcl
+libtool: $(top_builddir)/config.status $(top_srcdir)/config/ltmain.sh \
+        $(top_srcdir)/stamp-vcl
        cd $(top_builddir) && $(SHELL) ./config.status $@
 
 .PHONY: configure-subdirs

diff --git a/Makefile.maint b/Makefile.maint
index 9f51543d332d86e22e2bd6762cbb8c1abef750d4..b07f07b141eb1c7c9508d6bd15b9f3d0929c7a73 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -31,7 +31,7 @@ Makefile:
 
 TEXI2HTML = texi2html
 
-$(top_srcdir)/commit: config/mailnotify clcommit.m4sh
+$(top_srcdir)/commit: $(top_srcdir)/config/mailnotify clcommit.m4sh
        $(timestamp); \
        cd $(top_srcdir); \
        rm -f commit commit.in commit.tmp; \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 101cda286f02ae5cace6e6ac155df7b841e59215..3459387415898408b67cd10e0152f304202b7b2c 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -137,7 +137,7 @@ TESTSUITE = testsuite
 
 #EXTRA_DIST = $(TESTSUITE_AT) local.at atlocal.in package.m4
 
-#check-local: atconfig $(TESTSUITE)
+#check-local: atconfig $(srcdir)/$(TESTSUITE)
 #      $(SHELL) $(srcdir)/$(TESTSUITE)
 
 #clean-local: