Re: [patch] 1.5.6: libhell0.a automake 1.7 compatibility

[Peter O'Gorman]

Maciej W. Rozycki wrote:

> Hello,
>
>  Since at least automake 1.7, running `automake' in demo/ to regenerate 
> Makefile.in fails with the following errors:

Hi,
I just applied this to branch-1-5.

Thanks,
Peter
--
Peter O'Gorman - http://www.pogma.com

Index: ChangeLog
from  Maciej W. Rozycki  <address@hidden>

        * demo/Makefile.am: Stop automake warning by defining
        libhell0_a_CFLAGS.
        * pdemo/Makefile.am: Ditto.

Index: demo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/demo/Attic/Makefile.am,v
retrieving revision 1.29
diff -u -3 -p -u -r1.29 Makefile.am
--- demo/Makefile.am 19 Nov 2002 09:42:39 -0000 1.29
+++ demo/Makefile.am 12 Aug 2004 14:26:27 -0000
@@ -123,6 +123,7 @@ hc-minusL: $(hell_OBJECTS) $(hell_DEPEND
 # 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
Index: pdemo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/pdemo/Attic/Makefile.am,v
retrieving revision 1.6
diff -u -3 -p -u -r1.6 Makefile.am
--- pdemo/Makefile.am 19 Nov 2002 09:42:39 -0000 1.6
+++ pdemo/Makefile.am 12 Aug 2004 14:26:27 -0000
@@ -123,6 +123,7 @@ hc-minusL: $(hell_OBJECTS) $(hell_DEPEND
 # 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