diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-03-28 03:13:21 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-03-28 03:13:21 +0000 |
| commit | 9bcc2883ac3b3d1f5938db12cba64211b57a7c21 (patch) | |
| tree | 32c06a51be5ea9a2b023511b2c2b4e174aa3df50 | |
| parent | dfd10838317ae32d0536346d6f7ec34c0d9cc3d0 (diff) | |
| download | ffmpeg-9bcc2883ac3b3d1f5938db12cba64211b57a7c21.tar.gz | |
bandaid fix for broken shared library installation
Originally committed as revision 12617 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | common.mak | 8 |
2 files changed, 7 insertions, 4 deletions
@@ -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)) diff --git a/common.mak b/common.mak index 750edbf782..2dc181bcb1 100644 --- a/common.mak +++ b/common.mak @@ -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)" |