Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

* 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 2526fd3cb34e331f79eb34256d0c7a5d725306cc..7381b7ab1b8dd5da37cb7ff546b0ca33c5a439b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-18  Alexandre Duret-Lutz  <adl@gnu.org>,
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+       * 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  <Ralf.Wildenhues@gmx.de>
 
        * ltdl.c (memcpy, memmove): Fix pre-ANSI replacement functions

diff --git a/demo/Makefile.am b/demo/Makefile.am
index 45a760ec86ebb84866c1b80e8a9f89b2040d8f64..78b52b6370c7d96867214d2090abef04cd0fcd19 100644 (file)
--- 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 2d7deccc1e3a7ebd5f61556b4f4d6c58afebafa5..c3abee5be26c1651f63b7b2a6ad575ec0505ea54 100644 (file)
--- 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