From: Gary V. Vaughan Date: Mon, 29 Mar 2004 09:41:37 +0000 (+0000) Subject: * libltdl/Makefile.am (AM_CPPFLAGS): Also check $top_builddir for X-Git-Tag: release-1-9b~116 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a839f1fac98360052862dfc3ca5407402646f1d;p=thirdparty%2Flibtool.git * libltdl/Makefile.am (AM_CPPFLAGS): Also check $top_builddir for config.h. (ltdl.o): config.h is in $top_builddir. --- diff --git a/ChangeLog b/ChangeLog index 1b5a0cb71..add6cb51f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-03-30 Gary V. Vaughan + + * libltdl/Makefile.am (AM_CPPFLAGS): Also check $top_builddir for + config.h. + (ltdl.o): config.h is in $top_builddir. + 2004-03-24 Scott James Remnant * NEWS: Explain more fully why we no longer load libraries @@ -35,7 +41,7 @@ The Sun C++ compiler bundles -Qoption arguments so convenience libraries are linked with defaultextract otherwise. - * tagdemo/Makefile.am, tagdemo/main.cpp, tagdemo/conv.h, + * tagdemo/Makefile.am, tagdemo/main.cpp, tagdemo/conv.h, tagdemo/conv.cpp: Augment tagdemo test to link a convenience library with a libtool library. diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am index 9c36a010a..03089232a 100644 --- a/libltdl/Makefile.am +++ b/libltdl/Makefile.am @@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = no-dependencies foreign ACLOCAL_AMFLAGS = -I ../m4 -AM_CPPFLAGS = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) DEFS = -DHAVE_CONFIG_H="<$(CONFIG_H)>" if INSTALL_LTDL @@ -45,7 +45,7 @@ libltdlc_la_SOURCES = ltdl.c ltdl.h libltdlc_la_LIBADD = $(LIBADD_DL) ## Because we do not have automatic dependency tracking: -ltdl.lo: ltdl.h $(top_srcdir)/$(CONFIG_H) +ltdl.lo: ltdl.h $(top_builddir)/$(CONFIG_H) ## These are installed as a subdirectory of pkgdatadir so that