fix shared libpostproc build

Originally committed as revision 4272 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 2dde323..ee36c03 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -267,7 +267,7 @@ endif
 
 ifeq ($(CONFIG_PP),yes)
 ifeq ($(SHARED_PP),yes)
-EXTRALIBS += -L$(VPATH)/libpostproc -lpostproc$(BUILDSUF)
+EXTRALIBS += -Llibpostproc -lpostproc$(BUILDSUF)
 else
 # LIBS += libpostproc/libpostproc.a ... should be fixed
 OBJS += libpostproc/postprocess.o

diff --git a/libavcodec/libpostproc/Makefile b/libavcodec/libpostproc/Makefile
index bf074d7..958be44 100644 (file)
--- a/libavcodec/libpostproc/Makefile
+++ b/libavcodec/libpostproc/Makefile
@@ -5,7 +5,8 @@ VPATH=$(SRC_PATH)/libavcodec/libpostproc
 
 ifeq ($(SHARED_PP),yes)
 SPPLIB = $(SLIBPREF)postproc$(SLIBSUF)
-SPPVERSION = 0.0.1
+SPPMAJOR = 0
+SPPVERSION = $(SPPMAJOR).0.1
 endif
 PPLIB = $(LIBPREF)postproc$(LIBSUF)
 
@@ -40,7 +41,7 @@ postprocess_pic.o: postprocess.c
        $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
 
 $(SPPLIB): $(SPPOBJS)
-       $(CC) -shared -Wl,-soname,$(SPPLIB).0 \
+       $(CC) -shared -Wl,-soname,$(SPPLIB).$(SPPMAJOR) \
        -o $(SPPLIB) $(SPPOBJS)
 endif
 
@@ -57,11 +58,12 @@ else
        install -d $(libdir)
        install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION)
        ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB)
+       ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB).$(SPPMAJOR)
        ldconfig || true
 endif
 endif
        mkdir -p $(prefix)/include/postproc
-       install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h
+       install -m 644 $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(prefix)/include/postproc/postprocess.h
 
 
 #