Since we link statically when using gcov don't compile the .os files

with the options.

diff --git a/libasm/ChangeLog b/libasm/ChangeLog
index c9a26b9ac1a7be54bf435f4cab9d1934abb9c186..d4c063487b3d625afba0a5062bf8edf2a1315b56 100644 (file)
--- a/libasm/ChangeLog
+++ b/libasm/ChangeLog
@@ -1,6 +1,8 @@
 2005-08-28  Ulrich Drepper  <drepper@redhat.com>
 
        * Makefile.am: Use $(LINK) not $(CC) when creating DSO.
+       (%.os): Use COMPILE.os.
+       (COMPILE.os): Filter out gconv options.
 
 2005-08-02  Ulrich Drepper  <drepper@redhat.com>
 

diff --git a/libasm/Makefile.am b/libasm/Makefile.am
index 172143c31fc71f62928937b0d72a37f4df241d10..e9b993975a838645fbae8ea3f08b6420444d74a4 100644 (file)
--- a/libasm/Makefile.am
+++ b/libasm/Makefile.am
@@ -24,6 +24,9 @@ INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \
 GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
 VERSION = 1
 
+COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \
+                                                      $(COMPILE)))
+
 lib_LIBRARIES = libasm.a
 if !MUDFLAP
 noinst_LIBRARIES = libasm_pic.a
@@ -60,7 +63,7 @@ libasm.so: libasm_pic.a libasm.map
 
 
 %.os: %.c %.o
-       if $(COMPILE) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \
+       if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \
          -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \
        then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \
             rm -f "$(DEPDIR)/$*.Tpo"; \

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 14a0ce6b33eec1f7d82f8bcfe686b20e27b16b90..a6bd278473c7c2bff730d3faf75671cff11ccb2f 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,6 +1,8 @@
 2005-08-28  Ulrich Drepper  <drepper@redhat.com>
 
        * Makefile.am: Use $(LINK) not $(CC) when creating DSO.
+       (%.os): Use COMPILE.os.
+       (COMPILE.os): Filter out gconv options.
 
 2005-08-23  Roland McGrath  <roland@redhat.com>
 

diff --git a/libdw/Makefile.am b/libdw/Makefile.am
index 1f659702e1c9b834ecc8ca86097366ba5fd2b519..ee4eccf5a7c871def5ebaa22ce60536c8e5335dc 100644 (file)
--- a/libdw/Makefile.am
+++ b/libdw/Makefile.am
@@ -22,6 +22,9 @@ AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
 VERSION = 1
 
+COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \
+                                                      $(COMPILE)))
+
 lib_LIBRARIES = libdw.a
 if !MUDFLAP
 noinst_LIBRARIES = libdw_pic.a
@@ -84,7 +87,7 @@ libdw.so: $(srcdir)/libdw.map libdw_pic.a \
        ln -fs $@ $@.$(VERSION)
 
 %.os: %.c %.o
-       if $(COMPILE) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \
+       if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \
           -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \
        then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \
             rm -f "$(DEPDIR)/$*.Tpo"; \

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 139ab47b28d75b2a63bfbd4f05de5cce90214611..aedc6da7998bd3d08eb3530e2b85b3406ce466d6 100644 (file)
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-28  Ulrich Drepper  <drepper@redhat.com>
+
+       * Makefile.am (%.os): Use COMPILE.os.
+       (COMPILE.os): Filter out gconv options.
+
 2005-08-24  Roland McGrath  <roland@redhat.com>
 
        * argp-std.c [_MUDFLAP] (__libdwfl_argp_mudflap_options): New function,

diff --git a/libdwfl/Makefile.am b/libdwfl/Makefile.am
index a0735ff0b385d7e2fba6efc8d519c8192b756916..510e7599fee99d714120178a55fb124148b8c628 100644 (file)
--- a/libdwfl/Makefile.am
+++ b/libdwfl/Makefile.am
@@ -25,6 +25,9 @@ INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
           -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib
 VERSION = 1
 
+COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \
+                                                      $(COMPILE)))
+
 noinst_LIBRARIES = libdwfl.a
 if !MUDFLAP
 noinst_LIBRARIES += libdwfl_pic.a
@@ -71,7 +74,7 @@ libdwfl_pic_a_SOURCES =
 am_libdwfl_pic_a_OBJECTS = $(libdwfl_a_SOURCES:.c=.os)
 
 %.os: %.c %.o
-       if $(COMPILE) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \
+       if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \
           -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \
        then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \
             rm -f "$(DEPDIR)/$*.Tpo"; \

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index 17b7136e7b69b6a4d2f394365fa919a33b004a68..4146968e76af4fafd49950800c5533f059f29bce 100644 (file)
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,6 +1,8 @@
 2005-08-28  Ulrich Drepper  <drepper@redhat.com>
 
        * Makefile.am: Use $(LINK) not $(CC) when creating DSO.
+       (%.os): Use COMPILE.os.
+       (COMPILE.os): Filter out gconv options.
 
 2005-08-27  Ulrich Drepper  <drepper@redhat.com>
 

diff --git a/libelf/Makefile.am b/libelf/Makefile.am
index 17851fc5a99e0556be107626bec79ed9821ff05f..37683d857cc3ebad5091c2c8510681425d0d60c4 100644 (file)
--- a/libelf/Makefile.am
+++ b/libelf/Makefile.am
@@ -31,6 +31,9 @@ GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
 VERSION = 1
 PACKAGE_VERSION = @PACKAGE_VERSION@
 
+COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \
+                                                      $(COMPILE)))
+
 lib_LIBRARIES = libelf.a
 if !MUDFLAP
 noinst_LIBRARIES = libelf_pic.a
@@ -99,7 +102,7 @@ libelf.so: libelf_pic.a libelf.map
        ln -fs $@ $@.$(VERSION)
 
 %.os: %.c %.o
-       if $(COMPILE) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \
+       if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \
          -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \
        then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \
             rm -f "$(DEPDIR)/$*.Tpo"; \