From ea4966b6b920d0e792379532c86a0d6285074ea3 Mon Sep 17 00:00:00 2001 From: Patrick Welche Date: Fri, 29 Oct 2004 08:28:59 +0000 Subject: [PATCH] * Makefile.am, Makefile.maint, tests/Makefile.am: Use path for dependencies built in the source tree, to cater for BSD make. --- ChangeLog | 6 ++++++ Makefile.am | 12 +++++++----- Makefile.maint | 2 +- tests/Makefile.am | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8305c9533..f0a9fd8ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-10-28 Patrick Welche , + Ralf Wildenhues + + * 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 * HACKING: Fix a typo in the gpg --verify instructions. diff --git a/Makefile.am b/Makefile.am index 96b0d55c3..7f1024cf3 100644 --- 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 9f51543d3..b07f07b14 100644 --- 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 101cda286..345938741 100644 --- 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: -- 2.47.2