From: Alexandre Duret-Lutz Date: Sun, 19 Sep 2004 12:04:52 +0000 (+0000) Subject: Ralf Wildenhues X-Git-Tag: release-1-5-10~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f14b48cccf5e148af8259baf93d2eeef897d3217;p=thirdparty%2Flibtool.git Ralf Wildenhues * demo/Makefile.am, pdemo/Makefile.am: Use per-target CFLAGS only for the Libtool-built objects, so that automake won't complain about missing AM_PROG_CC_C_O but still compile Libtool- and non-Libtool objects into different names. --- diff --git a/ChangeLog b/ChangeLog index 2526fd3cb..7381b7ab1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-09-18 Alexandre Duret-Lutz , + Ralf Wildenhues + * demo/Makefile.am, pdemo/Makefile.am: Use per-target CFLAGS + only for the Libtool-built objects, so that automake won't + complain about missing AM_PROG_CC_C_O but still compile Libtool- + and non-Libtool objects into different names. + 2004-09-13 Ralf Wildenhues * ltdl.c (memcpy, memmove): Fix pre-ANSI replacement functions diff --git a/demo/Makefile.am b/demo/Makefile.am index 45a760ec8..78b52b637 100644 --- a/demo/Makefile.am +++ b/demo/Makefile.am @@ -7,6 +7,7 @@ EXTRA_DIST = acinclude.m4 # Build a libtool library, libhello.la for installation in libdir. lib_LTLIBRARIES = libhello.la libhello_la_SOURCES = hello.c foo.c +libhello_la_CFLAGS = $(AM_CFLAGS) libhello_la_LIBADD = $(LIBM) libhello_la_LDFLAGS = -no-undefined -version-info 3:12:1 @@ -123,7 +124,6 @@ hc-minusL: $(hell_OBJECTS) $(hell_DEPENDENCIES) # If this one passes with pass_all, it is likely that pass_all works EXTRA_LIBRARIES = libhell0.a libhell0_a_SOURCES = hello.c foo.c -libhell0_a_CFLAGS = $(AM_CFLAGS) EXTRA_LTLIBRARIES = libhell1.la libhell2.la libhell1_la_SOURCES = hell1.c libhell1_la_LIBADD = -L. -lhell0 diff --git a/pdemo/Makefile.am b/pdemo/Makefile.am index 2d7deccc1..c3abee5be 100644 --- a/pdemo/Makefile.am +++ b/pdemo/Makefile.am @@ -7,6 +7,7 @@ EXTRA_DIST = acinclude.m4 # Build a libtool library, libhello.la for installation in libdir. lib_LTLIBRARIES = libhello.la libhello_la_SOURCES = longer_file_name_hello.c longer_file_name_foo.c longer_file_name_foo2.c +libhello_la_CFLAGS = $(AM_CFLAGS) libhello_la_LIBADD = $(LIBM) libhello_la_LDFLAGS = -no-undefined -version-info 3:12:1 @@ -123,7 +124,6 @@ hc-minusL: $(hell_OBJECTS) $(hell_DEPENDENCIES) # If this one passes with pass_all, it is likely that pass_all works EXTRA_LIBRARIES = libhell0.a libhell0_a_SOURCES = longer_file_name_hello.c longer_file_name_foo.c -libhell0_a_CFLAGS = $(AM_CFLAGS) EXTRA_LTLIBRARIES = libhell1.la libhell2.la libhell1_la_SOURCES = longer_file_name_hell1.c libhell1_la_LIBADD = -L. -lhell0