FYI: BSD make depfix

[Ralf Wildenhues]

Applied to HEAD.

2004-10-28  Patrick Welche <address@hidden>,
            Ralf Wildenhues <address@hidden>

        * Makefile.am, Makefile.maint: Use path for dependencies built
        in the source tree, to cater for BSD make.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.132
diff -u -r1.132 Makefile.am
--- Makefile.am 16 Oct 2004 14:43:47 -0000      1.132
+++ Makefile.am 29 Oct 2004 08:19:19 -0000
@@ -100,7 +100,7 @@
 # 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; \
@@ -120,7 +120,8 @@
 ##          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; \
@@ -136,7 +137,7 @@
 # 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"; \
@@ -156,8 +157,8 @@
 
 # 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/testsuite
-tests/defs: tests/defs.in
+check-recursive: tests/defs $(top_srcdir)/tests/testsuite
+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; \
@@ -173,7 +174,8 @@
 
 # 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
@@ -223,7 +225,7 @@
          echo 'm4_define([AT_PACKAGE_BUGREPORT], address@hidden@])'; \
        } | $(edit) > tests/package.m4
 
-$(top_srcdir)/$(TESTSUITE): tests/package.m4 $(TESTSUITE_AT)
+$(top_srcdir)/$(TESTSUITE): $(top_srcdir)/tests/package.m4 $(TESTSUITE_AT)
        cd $(top_srcdir); \
        $(AUTOTEST) -I ./tests tests/testsuite.at -o $(TESTSUITE)
 
@@ -231,7 +233,7 @@
        ./config.status tests/atconfig
 
 # Hook the test suite into the check rule
-check-local: tests/atconfig $(TESTSUITE)
+check-local: tests/atconfig $(top_srcdir)/$(TESTSUITE)
        $(TESTS_ENVIRONMENT) $(SHELL) $(srcdir)/$(TESTSUITE) $(TESTSUITE_FLAGS)
 
 # Run the test suite on the *installed* tree.
Index: Makefile.maint
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.maint,v
retrieving revision 1.8
diff -u -r1.8 Makefile.maint
--- Makefile.maint      24 Oct 2004 15:08:53 -0000      1.8
+++ Makefile.maint      29 Oct 2004 08:19:19 -0000
@@ -31,7 +31,7 @@
 
 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; \