Makefile: Unify building of shared libpci library

Move Darwin and Linux/ELF platform link switches to new PCILIB_LDFLAGS
variable.

diff --git a/lib/Makefile b/lib/Makefile
index b29a48fb8f9ca69b6e2d9f1753ddb07b261319c0..8a694817397bc8f692e663ff7e66faeb4aeff5f7 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -69,11 +69,7 @@ $(PCILIB): $(addsuffix .o,$(OBJS))
 else
 CFLAGS += -fPIC -fvisibility=hidden
 $(PCILIB): $(addsuffix .o,$(OBJS))
- ifdef PCI_HAVE_PM_DARWIN_DEVICE
-       $(CC) -shared $(LDFLAGS) $(SONAME) -Wl,-install_name,$(LIBDIR)/$(PCILIB) -o $@ $^ $(LIB_LDLIBS)
- else
-       $(CC) -shared $(LDFLAGS) $(SONAME) -Wl,--version-script=libpci.ver -o $@ $^ $(LIB_LDLIBS)
- endif
+       $(CC) -shared $(CFLAGS) $(LDFLAGS) $(PCILIB_LDFLAGS) -o $@ $^ $(LIB_LDLIBS)
 endif
 
 $(PCILIBPC): libpci.pc.in

diff --git a/lib/configure b/lib/configure
index 45a416a7620e0763216d323ade801bdf90f6073e..f89b06957a917d43264878484778846bbf1e3956 100755 (executable)
--- a/lib/configure
+++ b/lib/configure
@@ -297,8 +297,11 @@ else
        echo >>$m 'LDLIBS='
        echo >>$m 'LIB_LDLIBS=$(WITH_LIBS)'
        echo >>$c '#define PCI_SHARED_LIB'
-       if [ "$SHARED" = yes -a "$LIBEXT" = so ]; then
-               echo >>$m 'SONAME=-Wl,-soname,$(LIBNAME).$(LIBEXT)$(ABI_VERSION)'
+       if [ "$LIBEXT" = so ]; then
+               echo >>$m 'PCILIB_LDFLAGS+=-Wl,-soname,$(LIBNAME).$(LIBEXT).$(ABI_VERSION)'
+               echo >>$m 'PCILIB_LDFLAGS+=-Wl,--version-script=libpci.ver'
+       elif [ "$LIBEXT" = dylib ]; then
+               echo >>$m 'PCILIB_LDFLAGS+=-Wl,-install_name,$(LIBDIR)/$(PCILIB)'
        fi
 fi
 echo >>$m 'PCILIBPC=$(LIBNAME).pc'