* Makefile.am, Makefile.maint: Use path for dependencies built

in the source tree, to cater for BSD make.
This commit is contained in:
Patrick Welche 2004-10-29 08:25:25 +00:00 committed by Ralf Wildenhues
parent 4d01904ca5
commit 1174721b33
3 changed files with 17 additions and 9 deletions

View File

@ -1,3 +1,9 @@
2004-10-28 Patrick Welche <prlw1@newn.cam.ac.uk>,
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.am, Makefile.maint: Use path for dependencies built
in the source tree, to cater for BSD make.
2004-10-24 Noah Misch <noah@cs.caltech.edu>
* config/ltmain.m4sh (func_lalib_p, func_ltwrapper_p): New

View File

@ -100,7 +100,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; \
@ -120,7 +120,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; \
@ -136,7 +137,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"; \
@ -156,8 +157,8 @@ $(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/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 @@ $(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
@ -223,7 +225,7 @@ $(top_srcdir)/tests/package.m4: configure.ac
echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
} | $(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 @@ tests/atconfig: config.status
./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.

View File

@ -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; \