Build process: libpostproc patch by (Franti?ek Dvo?ák <valtri at users dot sourceforg...

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

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index df77990..83d7079 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -102,7 +102,7 @@ endif
 
 ifeq ($(CONFIG_PP),yes)
 ifeq ($(SHARED_PP),yes)
-EXTRALIBS += -lpostproc
+EXTRALIBS += -L$(VPATH)/libpostproc -lpostproc
 else
 # LIBS += libpostproc/libpostproc.a ... should be fixed
 OBJS += libpostproc/postprocess.o
@@ -207,6 +207,9 @@ $(LIB): $(OBJS) $(AMRLIBS)
        $(RANLIB) $@
 
 $(SLIB): $(OBJS)
+ifeq ($(CONFIG_PP),yes)
+       $(MAKE) -C $(VPATH)/libpostproc
+endif
 ifeq ($(CONFIG_WIN32),yes)
        $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
        -lib /machine:i386 /def:$(@:.dll=.def)
@@ -287,6 +290,9 @@ else
        ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
        ldconfig || true
 endif
+ifeq ($(CONFIG_PP),yes)
+       $(MAKE) -C $(VPATH)/libpostproc $@
+endif
 else
 install:
 endif

diff --git a/libavcodec/libpostproc/Makefile b/libavcodec/libpostproc/Makefile
index d7e1b21..e690122 100644 (file)
--- a/libavcodec/libpostproc/Makefile
+++ b/libavcodec/libpostproc/Makefile
@@ -2,10 +2,10 @@
 include ../../config.mak
 
 ifeq ($(SHARED_PP),yes)
-SPPLIB = libpostproc.so
+SPPLIB = $(SLIBPREF)postproc$(SLIBSUF)
 SPPVERSION = 0.0.1
 endif
-PPLIB = libpostproc.a
+PPLIB = $(LIBPREF)postproc$(LIBSUF)
 
 PPOBJS=postprocess.o
 SPPOBJS=postprocess_pic.o
@@ -23,7 +23,7 @@ CFLAGS  = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
 all:    $(SWSLIB) $(PPLIB) $(SPPLIB)
 
 clean:
-       rm -f *.o *.a *~ *.so
+       rm -f *.o *.a *~ *.so $(PPLIB) $(SPPLIB)
 
 distclean:
        rm -f Makefile.bak *.o *.a *~ *.so .depend
@@ -49,11 +49,15 @@ $(PPLIB): $(PPOBJS)
 
 install: all
 ifeq ($(SHARED_PP),yes)
+ifeq ($(CONFIG_WIN32),yes)
+       install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)"
+else
        install -d $(prefix)/lib
        install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)
        ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
        ldconfig || true
 endif
+endif
        mkdir -p $(prefix)/include/postproc
        install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h