har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bandaid fix for broken shared library installation

Browse Source 
Originally committed as revision 12617 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2008-03-28 03:13:21 +00:00
parent dfd1083831
commit 9bcc2883ac
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -51,6 +51,9 @@ vhook/%.o: vhook/%.c
.depend: version.h $(PROGS_SRCS) .depend: version.h $(PROGS_SRCS)
# bandaid to disable triggering shared library installation routines
DISABLE=yes
include common.mak include common.mak
VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS)) VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))

8
common.mak
View File

@ -31,12 +31,12 @@ OBJS := $(OBJS) $(ASM_OBJS) $(CPP_OBJS)
all: $(LIBNAME) $(SLIBNAME) all: $(LIBNAME) $(SLIBNAME)
$(LIBNAME): $(OBJS) $(LIBNAME)$(DISABLE): $(OBJS)
rm -f $@ rm -f $@
$(AR) rc $@ $^ $(EXTRAOBJS) $(AR) rc $@ $^ $(EXTRAOBJS)
$(RANLIB) $@ $(RANLIB) $@
$(SLIBNAME): $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)$(DISABLE): $(SLIBNAME_WITH_MAJOR)
$(LN_S) $^ $@ $(LN_S) $^ $@
$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SLIBNAME_WITH_MAJOR): $(OBJS)
@ -76,7 +76,7 @@ INSTALL_LIB_TARGETS-$(BUILD_STATIC) += install-lib-static
install: install-libs install-headers install: install-libs install-headers
install-libs: $(INSTALL_LIB_TARGETS-yes) install-libs$(DISABLE): $(INSTALL_LIB_TARGETS-yes)
install-lib-shared: $(SLIBNAME) install-lib-shared: $(SLIBNAME)
install -d "$(SHLIBDIR)" install -d "$(SHLIBDIR)"
@ -95,7 +95,7 @@ install-lib-static: $(LIBNAME)
INCINSTDIR = $(INCDIR)/lib$(NAME) INCINSTDIR = $(INCDIR)/lib$(NAME)
install-headers:: install-headers$(DISABLE)::
install -d "$(INCINSTDIR)" install -d "$(INCINSTDIR)"
install -d "$(LIBDIR)/pkgconfig" install -d "$(LIBDIR)/pkgconfig"
install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)" install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"