From 4f587a12b411e03f335e43a924125ff5c99a41d5 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Thu, 10 Dec 2020 02:34:55 +0300 Subject: Fix automake warnings Apparently, commit 2f02e81510946a4c8e9157ad0b72d92894b9acd7 that removed $(EXEEXT) suffix from shared libraries was incomplete: it missed the fact that some libraries were included into noinst_PROGRAMS, resulting to the following automake warnings: libasm/Makefile.am:66: warning: deprecated feature: target 'libasm.so' overrides 'libasm.so$(EXEEXT)' libdw/Makefile.am:114: warning: deprecated feature: target 'libdw.so' overrides 'libdw.so$(EXEEXT)' libelf/Makefile.am:116: warning: deprecated feature: target 'libelf.so' overrides 'libelf.so$(EXEEXT)' Fix this by renaming noinst_PROGRAMS to noinst_DATA and removing no longer needed lib{asm,dw,elf}_so_SOURCES variables and add lib{asm,dw,elf).so to CLEANFILES. Fixes: 2f02e8151094 ("Drop $(EXEEXT) suffix from shared libraries") Signed-off-by: Dmitry V. Levin Signed-off-by: Mark Wielaard --- libasm/ChangeLog | 6 ++++++ libasm/Makefile.am | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'libasm') diff --git a/libasm/ChangeLog b/libasm/ChangeLog index 29c23bad..1684688b 100644 --- a/libasm/ChangeLog +++ b/libasm/ChangeLog @@ -1,3 +1,9 @@ +2020-12-09 Dmitry V. Levin + + * Makefile.am (noinst_PROGRAMS): Rename to noinst_DATA. + (libasm_so_SOURCES): Remove. + (CLEANFILES): Add libasm.so. + 2020-11-30 Dmitry V. Levin * Makefile.am (libasm.so$(EXEEXT)): Drop $(EXEEXT) suffix. diff --git a/libasm/Makefile.am b/libasm/Makefile.am index 4b55d530..7eba81f9 100644 --- a/libasm/Makefile.am +++ b/libasm/Makefile.am @@ -35,7 +35,7 @@ VERSION = 1 lib_LIBRARIES = libasm.a noinst_LIBRARIES = libasm_pic.a -noinst_PROGRAMS = $(noinst_LIBRARIES:_pic.a=.so) +noinst_DATA = $(noinst_LIBRARIES:_pic.a=.so) pkginclude_HEADERS = libasm.h libasm_a_SOURCES = asm_begin.c asm_abort.c asm_end.c asm_error.c \ @@ -62,7 +62,6 @@ libasm_so_LDLIBS += -lpthread endif libasm_so_LIBS = libasm_pic.a -libasm_so_SOURCES = libasm.so: $(srcdir)/libasm.map $(libasm_so_LIBS) $(libasm_so_DEPS) $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \ -Wl,--soname,$@.$(VERSION) \ @@ -87,4 +86,4 @@ uninstall: uninstall-am noinst_HEADERS = libasmP.h symbolhash.h EXTRA_DIST = libasm.map -CLEANFILES += $(am_libasm_pic_a_OBJECTS) libasm.so.$(VERSION) +CLEANFILES += $(am_libasm_pic_a_OBJECTS) libasm.so libasm.so.$(VERSION) -- cgit v1.2.3