prevent bitstream reader to be overriden

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index 24ccaedb8236eb4ee113316de0353d9c84cd3628..0961c1740f665408423a1e89f455066d3b419fd5 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -2,23 +2,9 @@
 # common bits used by all libraries
 #
 
-SRC_DIR = $(SRC_PATH)/$(SUBDIR)
+SRC_DIR = $(SRC_PATH)/lib$(NAME)
 VPATH = $(SRC_DIR)
 
-#FIXME: This should be in configure/config.mak
-ifeq ($(CONFIG_WIN32),yes)
-LDFLAGS = -Wl,--output-def,$(@:.dll=.def),--out-implib,lib$(SLIBNAME:$(SLIBSUF)=.dll.a)
-endif
-
-ifeq ($(TARGET_GPROF),yes)
-CFLAGS+=-p
-LDFLAGS+=-p
-endif
-
-ifeq ($(TARGET_ARCH_SPARC64),yes)
-CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
-endif
-
 SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
 OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
 STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
@@ -31,11 +17,12 @@ $(LIB): $(STATIC_OBJS)
        $(AR) rc $@ $^ $(EXTRAOBJS)
        $(RANLIB) $@
 
-$(SLIBNAME): $(SHARED_OBJS)
+$(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
+       ln -sf $^ $@
+
+$(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
        $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
-ifeq ($(CONFIG_WIN32),yes)
-       -lib /machine:i386 /def:$(@:.dll=.def)
-endif
+       $(SLIB_EXTRA_CMD)
 
 %.o: %.c
        $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
@@ -53,7 +40,7 @@ depend: $(SRCS)
 dep:   depend
 
 clean::
-       rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll \
+       rm -f *.o *.d *~ *.a *.lib *.so *.so.* *.dylib *.dll \
              *.lib *.def *.dll.a *.exp
 
 distclean: clean
@@ -71,21 +58,18 @@ install: install-libs install-headers
 install-libs: $(INSTLIBTARGETS)
 
 install-lib-shared: $(SLIBNAME)
-       install -d "$(libdir)"
-ifeq ($(CONFIG_WIN32),yes)
-       install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
-else
+       install -d "$(shlibdir)"
        install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-               $(libdir)/$(SLIBNAME_WITH_VERSION)
-       ln -sf $(SLIBNAME_WITH_VERSION) \
-               $(libdir)/$(SLIBNAME_WITH_MAJOR)
-       ln -sf $(SLIBNAME_WITH_VERSION) \
-               $(libdir)/$(SLIBNAME)
-endif
+               "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
+       cd "$(shlibdir)" && \
+               ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
+       cd "$(shlibdir)" && \
+               ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
 
 install-lib-static: $(LIB)
        install -d "$(libdir)"
        install -m 644 $(LIB) "$(libdir)"
+       $(LIB_INSTALL_EXTRA_CMD)
 
 install-headers:
        install -d "$(incdir)"
@@ -93,6 +77,18 @@ install-headers:
        install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(incdir)"
        install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig"
 
+uninstall: uninstall-libs uninstall-headers
+
+uninstall-libs:
+       -rm -f "$(shlibdir)/$(SLIBNAME_WITH_MAJOR)" \
+              "$(shlibdir)/$(SLIBNAME)"            \
+              "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
+       -rm -f "$(libdir)/$(LIB)"
+
+uninstall-headers:
+       rm -f "$(addprefix $(incdir)/,$(HEADERS))"
+       rm -f "$(libdir)/pkgconfig/lib$(NAME).pc"
+
 #
 # include dependency files if they exist
 #