$OpenBSD: patch-Makefile_in,v 1.1 2009/03/14 03:48:07 jakemsr Exp $ --- Makefile.in.orig Mon Dec 1 03:48:41 2008 +++ Makefile.in Fri Mar 13 19:39:36 2009 @@ -75,15 +75,15 @@ INSTALL_SDK_LIBS := $(INSTALL_PREFIX)/lib INSTALL_PLUGINS := $(INSTALL_PREFIX)/lib/vamp INSTALL_BINARIES := $(INSTALL_PREFIX)/bin -INSTALL_SDK_LIBNAME := libvamp-sdk.so.2.0.0 -INSTALL_SDK_LINK_ABI := libvamp-sdk.so.2 -INSTALL_SDK_LINK_DEV := libvamp-sdk.so +INSTALL_SDK_LIBNAME := libvamp-sdk.so.${LIBvamp-sdk_VERSION} +INSTALL_SDK_LINK_ABI := ${INSTALL_SDK_LIBNAME} +INSTALL_SDK_LINK_DEV := ${INSTALL_SDK_LIBNAME} INSTALL_SDK_STATIC := libvamp-sdk.a INSTALL_SDK_LA := libvamp-sdk.la -INSTALL_HOSTSDK_LIBNAME := libvamp-hostsdk.so.3.0.0 -INSTALL_HOSTSDK_LINK_ABI := libvamp-hostsdk.so.3 -INSTALL_HOSTSDK_LINK_DEV := libvamp-hostsdk.so +INSTALL_HOSTSDK_LIBNAME := libvamp-hostsdk.so.${LIBvamp-hostsdk_VERSION} +INSTALL_HOSTSDK_LINK_ABI := ${INSTALL_HOSTSDK_LIBNAME} +INSTALL_HOSTSDK_LINK_DEV := ${INSTALL_HOSTSDK_LIBNAME} INSTALL_HOSTSDK_STATIC := libvamp-hostsdk.a INSTALL_HOSTSDK_LA := libvamp-hostsdk.la @@ -91,7 +91,7 @@ INSTALL_PKGCONFIG := $(INSTALL_PREFIX)/lib/pkgconfig # Flags required to tell the compiler to create a dynamically loadable object # -DYNAMIC_LDFLAGS = -static-libgcc -shared -Wl,-Bsymbolic +DYNAMIC_LDFLAGS = -shared -fPIC SDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,-soname=$(INSTALL_SDK_LINK_ABI) HOSTSDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,-soname=$(INSTALL_HOSTSDK_LINK_ABI) @@ -157,10 +157,10 @@ HOSTSDK_STATIC = \ $(SRCDIR)/libvamp-hostsdk.a SDK_DYNAMIC = \ - $(SRCDIR)/libvamp-sdk$(PLUGIN_EXT) + $(SRCDIR)/$(INSTALL_SDK_LIBNAME) HOSTSDK_DYNAMIC = \ - $(SRCDIR)/libvamp-hostsdk$(PLUGIN_EXT) + $(SRCDIR)/$(INSTALL_HOSTSDK_LIBNAME) SDK_LA = \ $(LADIR)/libvamp-sdk.la @@ -218,7 +218,7 @@ host: $(HOST_TARGET) rdfgen: $(RDFGEN_TARGET) -all: sdk plugins host rdfgen test +all: sdk plugins rdfgen $(SDK_STATIC): $(SDK_OBJECTS) $(API_HEADERS) $(SDK_HEADERS) $(AR) r $@ $(SDK_OBJECTS) @@ -242,7 +242,7 @@ $(RDFGEN_TARGET): $(RDFGEN_OBJECTS) $(HOSTSDK_STATIC) $(CXX) $(LDFLAGS) $(RDFGEN_LDFLAGS) -o $@ $(RDFGEN_OBJECTS) $(RDFGEN_LIBS) test: plugins host - VAMP_PATH=$(EXAMPLEDIR) $(HOST_TARGET) -l + LD_LIBRARY_PATH="./vamp-sdk" VAMP_PATH=$(EXAMPLEDIR) $(HOST_TARGET) -l clean: rm -f $(SDK_OBJECTS) $(HOSTSDK_OBJECTS) $(PLUGIN_OBJECTS) $(HOST_OBJECTS) $(RDFGEN_OBJECTS) @@ -250,15 +250,15 @@ clean: distclean: clean rm -f $(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET) $(RDFGEN_TARGET) *~ */*~ -install: $(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET) $(RDFGEN_TARGET) +install: $(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(RDFGEN_TARGET) mkdir -p $(DESTDIR)$(INSTALL_API_HEADERS) mkdir -p $(DESTDIR)$(INSTALL_SDK_HEADERS) mkdir -p $(DESTDIR)$(INSTALL_HOSTSDK_HEADERS) mkdir -p $(DESTDIR)$(INSTALL_SDK_LIBS) + mkdir -p $(DESTDIR)$(INSTALL_SDK_LIBS)/vamp mkdir -p $(DESTDIR)$(INSTALL_PKGCONFIG) mkdir -p $(DESTDIR)$(INSTALL_BINARIES) mkdir -p $(DESTDIR)$(INSTALL_PLUGINS) - cp $(HOST_TARGET) $(DESTDIR)$(INSTALL_BINARIES) cp $(RDFGEN_TARGET) $(DESTDIR)$(INSTALL_BINARIES) cp $(PLUGIN_TARGET) $(DESTDIR)$(INSTALL_PLUGINS) cp $(PLUGIN_CAT) $(DESTDIR)$(INSTALL_PLUGINS) @@ -268,15 +268,8 @@ install: $(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC cp $(SDK_STATIC) $(DESTDIR)$(INSTALL_SDK_LIBS) cp $(HOSTSDK_STATIC) $(DESTDIR)$(INSTALL_SDK_LIBS) cp $(SDK_DYNAMIC) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LIBNAME) + cp $(PLUGIN_TARGET) $(DESTDIR)$(INSTALL_SDK_LIBS)/vamp/vamp-example-plugins$(PLUGIN_EXT) cp $(HOSTSDK_DYNAMIC) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LIBNAME) - rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_ABI) - ln -s $(INSTALL_SDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_ABI) - rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_ABI) - ln -s $(INSTALL_HOSTSDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_ABI) - rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_DEV) - ln -s $(INSTALL_SDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_DEV) - rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_DEV) - ln -s $(INSTALL_HOSTSDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_DEV) sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(PCDIR)/vamp.pc.in \ > $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp.pc sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(PCDIR)/vamp-sdk.pc.in \