[FFmpeg-cvslog] r12617 - in trunk: Makefile common.mak

[diego]

Author: diego
Date: Fri Mar 28 04:13:21 2008
New Revision: 12617

Log:
bandaid fix for broken shared library installation


Modified:
   trunk/Makefile
   trunk/common.mak

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Fri Mar 28 04:13:21 2008
@@ -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))

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Fri Mar 28 04:13:21 2008
@@ -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) += i
 
 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)"