diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-03-01 16:57:34 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-04-28 13:32:51 +0000 |
| commit | 2136e330bef96512d45b8a85b245b9ea95cf5106 (patch) | |
| tree | 1067994fd72604ba14698ab1238dcff516a7e920 /libasm | |
| parent | 1acc27c76f9721d9647d4bbeaac98eb6dd7b2f05 (diff) | |
Generalize library names
On windows library names end with ".dll" and the prefix "lib" us usually
omitted. Take this into account and also drop the $(EXEEXT) workaround.
We don't need to use noinst_PROGRAMS as there is also noinst_DATA.
Change-Id: I7e4ba2432811d5ad85051ea0c9d5674eabf79b3c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'libasm')
| -rw-r--r-- | libasm/ChangeLog | 5 | ||||
| -rw-r--r-- | libasm/Makefile.am | 28 |
2 files changed, 18 insertions, 15 deletions
diff --git a/libasm/ChangeLog b/libasm/ChangeLog index 971492a8..53212139 100644 --- a/libasm/ChangeLog +++ b/libasm/ChangeLog @@ -1,3 +1,8 @@ +2017-02-28 Ulf Hermann <ulf.hermann@qt.io> + + * Makefile.am: Use the predefined common library names rather than + hardcoding to libasm.so and friends. + 2017-02-27 Ulf Hermann <ulf.hermann@qt.io> * Makefile.am: Use dso_LDFLAGS. diff --git a/libasm/Makefile.am b/libasm/Makefile.am index 30f7fa93..c6038aa6 100644 --- a/libasm/Makefile.am +++ b/libasm/Makefile.am @@ -31,11 +31,10 @@ include $(top_srcdir)/config/eu.am AM_CPPFLAGS += -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw -I$(top_srcdir)/libdwelf GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) -VERSION = 1 lib_LIBRARIES = libasm.a noinst_LIBRARIES = libasm_pic.a -noinst_PROGRAMS = $(noinst_LIBRARIES:_pic.a=.so) +noinst_DATA = $(libasm_BARE) pkginclude_HEADERS = libasm.h libasm_a_SOURCES = asm_begin.c asm_abort.c asm_end.c asm_error.c \ @@ -63,29 +62,28 @@ if USE_GNULIB libasm_so_LDLIBS += ../libgnu/libgnu.a endif -libasm_so_SOURCES = -libasm.so$(EXEEXT): libasm_pic.a libasm.map +$(libasm_BARE): libasm_pic.a libasm.map $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ -Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \ - -Wl,--soname,$@.$(VERSION) \ - ../libebl/libebl.a ../libelf/libelf.so ../libdw/libdw.so \ + -Wl,--soname,$(libasm_SONAME) \ + ../libebl/libebl.a ../libelf/$(libelf_BARE) ../libdw/$(libdw_BARE) \ $(libasm_so_LDLIBS) @$(textrel_check) - $(AM_V_at)ln -fs $@ $@.$(VERSION) + $(AM_V_at)ln -fs $@ $(libasm_SONAME) -install: install-am libasm.so +install: install-am $(libasm_BARE) $(mkinstalldirs) $(DESTDIR)$(libdir) - $(INSTALL_PROGRAM) libasm.so $(DESTDIR)$(libdir)/libasm-$(PACKAGE_VERSION).so - ln -fs libasm-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir)/libasm.so.$(VERSION) - ln -fs libasm.so.$(VERSION) $(DESTDIR)$(libdir)/libasm.so + $(INSTALL_PROGRAM) $(libasm_BARE) $(DESTDIR)$(libdir)/$(libasm_VERSIONED) + ln -fs $(libasm_VERSIONED) $(DESTDIR)$(libdir)/$(libasm_SONAME) + ln -fs $(libasm_SONAME) $(DESTDIR)$(libdir)/$(libasm_BARE) uninstall: uninstall-am - rm -f $(DESTDIR)$(libdir)/libasm-$(PACKAGE_VERSION).so - rm -f $(DESTDIR)$(libdir)/libasm.so.$(VERSION) - rm -f $(DESTDIR)$(libdir)/libasm.so + rm -f $(DESTDIR)$(libdir)/$(libasm_VERSIONED) + rm -f $(DESTDIR)$(libdir)/$(libasm_SONAME) + rm -f $(DESTDIR)$(libdir)/$(libasm_BARE) rmdir --ignore-fail-on-non-empty $(DESTDIR)$(includedir)/elfutils 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_SONAME) $(libasm_BARE) |