From 91378af4b21ca42d64476feee7576de8b515ea5e Mon Sep 17 00:00:00 2001
From: Frantisek Dvorak <valtri@users.sourceforge.net>
Date: Tue, 5 Oct 2004 17:43:10 +0000
Subject: [PATCH] =?UTF-8?q?Build=20process:=20libpostproc=20patch=20by=20(?=
 =?UTF-8?q?Franti=3Fek=20Dvo=3F=C3=A1k=20<valtri=20at=20users=20dot=20sour?=
 =?UTF-8?q?ceforge=20dot=20net>)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Originally committed as revision 3559 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/Makefile             |  8 +++++++-
 libavcodec/libpostproc/Makefile | 10 +++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index df77990932..83d7079cd7 100644
--- 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 d7e1b21d2f..e690122aa4 100644
--- 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,10 +49,14 @@ $(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