[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: BSD make depfix
From: |
Ralf Wildenhues |
Subject: |
FYI: BSD make depfix |
Date: |
Fri, 29 Oct 2004 10:29:36 +0200 |
User-agent: |
Mutt/1.4.1i |
Applied to branch-2-0.
2004-10-28 Patrick Welche <address@hidden>,
Ralf Wildenhues <address@hidden>
* Makefile.am, Makefile.maint, tests/Makefile.am: 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.130.2.1
diff -u -r1.130.2.1 Makefile.am
--- Makefile.am 4 Oct 2004 08:59:34 -0000 1.130.2.1
+++ Makefile.am 29 Oct 2004 08:18:24 -0000
@@ -95,7 +95,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; \
@@ -115,7 +115,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; \
@@ -131,7 +132,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"; \
@@ -152,7 +153,7 @@
# 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 @@
# 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
Index: Makefile.maint
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.maint,v
retrieving revision 1.5.2.3
diff -u -r1.5.2.3 Makefile.maint
--- Makefile.maint 24 Oct 2004 14:19:25 -0000 1.5.2.3
+++ Makefile.maint 29 Oct 2004 08:18:24 -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; \
Index: tests/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/Makefile.am,v
retrieving revision 1.41.2.3
diff -u -r1.41.2.3 Makefile.am
--- tests/Makefile.am 13 Oct 2004 15:34:09 -0000 1.41.2.3
+++ tests/Makefile.am 29 Oct 2004 08:18:24 -0000
@@ -137,7 +137,7 @@
#EXTRA_DIST = $(TESTSUITE_AT) local.at atlocal.in package.m4
-#check-local: atconfig $(TESTSUITE)
+#check-local: atconfig $(srcdir)/$(TESTSUITE)
# $(SHELL) $(srcdir)/$(TESTSUITE)
#clean-local: