Browse Source

bandaid fix for broken shared library installation

Originally committed as revision 12617 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Diego Biurrun 17 years ago
parent
commit
9bcc2883ac
2 changed files with 7 additions and 4 deletions
  1. +3
    -0
      Makefile
  2. +4
    -4
      common.mak

+ 3
- 0
Makefile View File

@@ -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))


+ 4
- 4
common.mak View 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)"


Loading…
Cancel
Save