summaryrefslogtreecommitdiff
path: root/libavcodec/Makefile
diff options
context:
space:
mode:
authorFrantisek Dvorak <valtri@users.sourceforge.net>2004-10-05 17:43:10 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-10-05 17:43:10 +0000
commit91378af4b21ca42d64476feee7576de8b515ea5e (patch)
treefb6fd7fe5c59fcbd999e780a551a1c9a75fcd0d5 /libavcodec/Makefile
parent0bc42caddf454a075fad76053c2e9bc2a5a4563a (diff)
Build process: libpostproc patch by (Franti?ek Dvo?ák <valtri at users dot sourceforge dot net>)
Originally committed as revision 3559 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r--libavcodec/Makefile8
1 files changed, 7 insertions, 1 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