diff options
| author | Mark Wielaard <mjw@redhat.com> | 2014-04-13 17:39:57 +0200 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2014-04-18 11:46:51 +0200 |
| commit | 3232479483cad695d1872b879128a23da3953a7d (patch) | |
| tree | 775fd4f2dc1620baa75c96e7d1e73fb882b57671 /libasm | |
| parent | f7cdc74ed34adc539186385342d99b357c3dbb6b (diff) | |
| download | elfutils-3232479483cad695d1872b879128a23da3953a7d.tar.gz | |
Remove mudflap build option.
The --enable-mudflap configure build has been broken for 2 years without
anybody apparently noticing. GCC 4.9 removed mudflap support. Before
release we now run make distcheck with valgrind support. Removal of the
mudflap configure option simplifies the build a little.
Signed-off-by: Mark Wielaard <mjw@redhat.com>
Diffstat (limited to 'libasm')
| -rw-r--r-- | libasm/ChangeLog | 4 | ||||
| -rw-r--r-- | libasm/Makefile.am | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libasm/ChangeLog b/libasm/ChangeLog index 1afc3421..2613610f 100644 --- a/libasm/ChangeLog +++ b/libasm/ChangeLog @@ -1,3 +1,7 @@ +2014-04-13 Mark Wielaard <mjw@redhat.com> + + * Makefile.am: Remove !MUDFLAP conditions. + 2013-04-24 Mark Wielaard <mjw@redhat.com> * Makefile.am: Use AM_CPPFLAGS instead of INCLUDES. diff --git a/libasm/Makefile.am b/libasm/Makefile.am index 4d81536b..3d6a2e58 100644 --- a/libasm/Makefile.am +++ b/libasm/Makefile.am @@ -34,10 +34,8 @@ GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) VERSION = 1 lib_LIBRARIES = libasm.a -if !MUDFLAP noinst_LIBRARIES = libasm_pic.a noinst_PROGRAMS = $(noinst_LIBRARIES:_pic.a=.so) -endif pkginclude_HEADERS = libasm.h libasm_a_SOURCES = asm_begin.c asm_abort.c asm_end.c asm_error.c \ @@ -54,7 +52,6 @@ libasm_a_SOURCES = asm_begin.c asm_abort.c asm_end.c asm_error.c \ disasm_begin.c disasm_cb.c disasm_end.c disasm_str.c \ symbolhash.c -if !MUDFLAP libasm_pic_a_SOURCES = am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os) @@ -64,7 +61,7 @@ libasm_so_LDLIBS += -lpthread endif libasm_so_SOURCES = -libasm.so: libasm_pic.a libasm.map +libasm.so$(EXEEXT): libasm_pic.a libasm.map $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ -Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \ -Wl,--soname,$@.$(VERSION) \ @@ -83,7 +80,6 @@ uninstall: uninstall-am rm -f $(DESTDIR)$(libdir)/libasm.so.$(VERSION) rm -f $(DESTDIR)$(libdir)/libasm.so rmdir --ignore-fail-on-non-empty $(DESTDIR)$(includedir)/elfutils -endif noinst_HEADERS = libasmP.h symbolhash.h EXTRA_DIST = libasm.map |