diff options
| -rw-r--r-- | libasm/ChangeLog | 2 | ||||
| -rw-r--r-- | libasm/Makefile.am | 5 | ||||
| -rw-r--r-- | libdw/ChangeLog | 2 | ||||
| -rw-r--r-- | libdw/Makefile.am | 5 | ||||
| -rw-r--r-- | libdwfl/ChangeLog | 5 | ||||
| -rw-r--r-- | libdwfl/Makefile.am | 5 | ||||
| -rw-r--r-- | libelf/ChangeLog | 2 | ||||
| -rw-r--r-- | libelf/Makefile.am | 5 |
8 files changed, 27 insertions, 4 deletions
diff --git a/libasm/ChangeLog b/libasm/ChangeLog index c9a26b9a..d4c06348 100644 --- a/libasm/ChangeLog +++ b/libasm/ChangeLog @@ -1,6 +1,8 @@ 2005-08-28 Ulrich Drepper <[email protected]> * Makefile.am: Use $(LINK) not $(CC) when creating DSO. + (%.os): Use COMPILE.os. + (COMPILE.os): Filter out gconv options. 2005-08-02 Ulrich Drepper <[email protected]> diff --git a/libasm/Makefile.am b/libasm/Makefile.am index 172143c3..e9b99397 100644 --- 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 14a0ce6b..a6bd2784 100644 --- a/libdw/ChangeLog +++ b/libdw/ChangeLog @@ -1,6 +1,8 @@ 2005-08-28 Ulrich Drepper <[email protected]> * Makefile.am: Use $(LINK) not $(CC) when creating DSO. + (%.os): Use COMPILE.os. + (COMPILE.os): Filter out gconv options. 2005-08-23 Roland McGrath <[email protected]> diff --git a/libdw/Makefile.am b/libdw/Makefile.am index 1f659702..ee4eccf5 100644 --- 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 139ab47b..aedc6da7 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,8 @@ +2005-08-28 Ulrich Drepper <[email protected]> + + * Makefile.am (%.os): Use COMPILE.os. + (COMPILE.os): Filter out gconv options. + 2005-08-24 Roland McGrath <[email protected]> * argp-std.c [_MUDFLAP] (__libdwfl_argp_mudflap_options): New function, diff --git a/libdwfl/Makefile.am b/libdwfl/Makefile.am index a0735ff0..510e7599 100644 --- 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 17b7136e..4146968e 100644 --- a/libelf/ChangeLog +++ b/libelf/ChangeLog @@ -1,6 +1,8 @@ 2005-08-28 Ulrich Drepper <[email protected]> * Makefile.am: Use $(LINK) not $(CC) when creating DSO. + (%.os): Use COMPILE.os. + (COMPILE.os): Filter out gconv options. 2005-08-27 Ulrich Drepper <[email protected]> diff --git a/libelf/Makefile.am b/libelf/Makefile.am index 17851fc5..37683d85 100644 --- 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"; \ |