mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2024-12-15 06:49:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix libltdl to always have all generated files up to date.

Browse Source 
* Makefile.am (all-local): Depend on all generated files in
libltdl, namely...
(libltdl/aclocal.m4, libltdl/configure, libltdl/config-h.in):
...these.  List explicitly, including dependencies and
rebuilding rules, using...
(sub_aclocal_m4_deps, sub_configure_deps): ...these new
variables.
Report by Dan Lacher <Dan.Lacher@Sun.Com>.
This commit is contained in:
Ralf Wildenhues 2006-06-10 07:36:25 +00:00
parent c17fac0153
commit b785acfbef
2 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2006-06-10 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Fix libltdl to always have all generated files up to date.
* Makefile.am (all-local): Depend on all generated files in
libltdl, namely...
(libltdl/aclocal.m4, libltdl/configure, libltdl/config-h.in):
...these. List explicitly, including dependencies and
rebuilding rules, using...
(sub_aclocal_m4_deps, sub_configure_deps): ...these new
variables.
Report by Dan Lacher <Dan.Lacher@Sun.Com>.
2006-06-09 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.am (install-data-local): Do not use $(INSTALL_DATA)

39
Makefile.am
View File

@ -219,6 +219,16 @@ $(srcdir)/libltdl/Makefile.am: $(srcdir)/libltdl/Makefile.inc
-e 's,\$$(libltdl_,$$(,' >> $$out;
chmod a-w $(srcdir)/libltdl/Makefile.am
## Unfortunately, all this bogeyness means that we have to manually
## keep the generated files in libltdl up to date.
all-local: $(srcdir)/libltdl/aclocal.m4 \
$(srcdir)/libltdl/stamp-mk \
$(srcdir)/libltdl/configure \
$(srcdir)/libltdl/config-h.in
EXTRA_DIST += $(srcdir)/libltdl/stamp-mk $(m4dir)/lt~obsolete.m4
$(srcdir)/libltdl/Makefile.in: $(srcdir)/libltdl/Makefile.am \
$(srcdir)/libltdl/aclocal.m4
cd $(srcdir)/libltdl && $(AUTOMAKE) Makefile
@ -231,20 +241,27 @@ $(srcdir)/libltdl/stamp-mk: $(srcdir)/libltdl/Makefile.in
mv -f Makefile.inT Makefile.in
echo stamp > $@
EXTRA_DIST += $(srcdir)/libltdl/stamp-mk $(m4dir)/lt~obsolete.m4
sub_aclocal_m4_deps = \
$(srcdir)/libltdl/configure.ac \
$(m4dir)/libtool.m4 \
$(m4dir)/ltoptions.m4 \
$(m4dir)/ltdl.m4 \
$(srcdir)/$(m4dir)/ltversion.m4 \
$(m4dir)/ltsugar.m4 \
$(m4dir)/argz.m4 \
$(m4dir)/lt~obsolete.m4
$(srcdir)/libltdl/aclocal.m4: \
$(m4dir)/libtool.m4 \
$(m4dir)/ltoptions.m4 \
$(m4dir)/ltdl.m4 \
$(srcdir)/$(m4dir)/ltversion.m4 \
$(m4dir)/ltsugar.m4 \
$(m4dir)/argz.m4 \
$(m4dir)/lt~obsolete.m4
sub_configure_deps = $(sub_aclocal_m4_deps) $(srcdir)/libltdl/aclocal.m4
$(srcdir)/libltdl/aclocal.m4: $(sub_aclocal_m4_deps)
cd $(srcdir)/libltdl && $(ACLOCAL) -I m4
# We want the libltdl files to be up to date as much as possible.
all-local: $(srcdir)/libltdl/stamp-mk
$(srcdir)/libltdl/configure: $(sub_configure_deps)
cd $(srcdir)/libltdl && $(AUTOCONF)
$(srcdir)/libltdl/config-h.in: $(sub_configure_deps)
cd $(srcdir)/libltdl && $(AUTOHEADER)
touch $@
## -------- ##