bandaid fix for broken shared library installation
authorDiego Biurrun <diego@biurrun.de>
Fri, 28 Mar 2008 03:13:21 +0000 (03:13 +0000)
committerDiego Biurrun <diego@biurrun.de>
Fri, 28 Mar 2008 03:13:21 +0000 (03:13 +0000)
Originally committed as revision 12617 to svn://svn.ffmpeg.org/ffmpeg/trunk

Makefile
common.mak

index cd4acc2..e7f3487 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -51,6 +51,9 @@ vhook/%.o: vhook/%.c
 
 .depend: version.h $(PROGS_SRCS)
 
+# bandaid to disable triggering shared library installation routines
+DISABLE=yes
+
 include common.mak
 
 VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
index 750edbf..2dc181b 100644 (file)
@@ -31,12 +31,12 @@ OBJS := $(OBJS) $(ASM_OBJS) $(CPP_OBJS)
 
 all: $(LIBNAME) $(SLIBNAME)
 
-$(LIBNAME): $(OBJS)
+$(LIBNAME)$(DISABLE): $(OBJS)
        rm -f $@
        $(AR) rc $@ $^ $(EXTRAOBJS)
        $(RANLIB) $@
 
-$(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
+$(SLIBNAME)$(DISABLE): $(SLIBNAME_WITH_MAJOR)
        $(LN_S) $^ $@
 
 $(SLIBNAME_WITH_MAJOR): $(OBJS)
@@ -76,7 +76,7 @@ INSTALL_LIB_TARGETS-$(BUILD_STATIC) += install-lib-static
 
 install: install-libs install-headers
 
-install-libs: $(INSTALL_LIB_TARGETS-yes)
+install-libs$(DISABLE): $(INSTALL_LIB_TARGETS-yes)
 
 install-lib-shared: $(SLIBNAME)
        install -d "$(SHLIBDIR)"
@@ -95,7 +95,7 @@ install-lib-static: $(LIBNAME)
 
 INCINSTDIR = $(INCDIR)/lib$(NAME)
 
-install-headers::
+install-headers$(DISABLE)::
        install -d "$(INCINSTDIR)"
        install -d "$(LIBDIR)/pkgconfig"
        install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"