[Ffmpeg-cvslog] CVS: ffmpeg Makefile,1.95,1.96

[Diego Biurrun CVS]

Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv16620

Modified Files:
	Makefile 
Log Message:
Move libpostproc compilation to the top-level Makefile.


Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/Makefile,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- Makefile	11 Feb 2006 19:30:54 -0000	1.95
+++ Makefile	11 Feb 2006 21:42:11 -0000	1.96
@@ -67,6 +67,9 @@
 	$(MAKE) -C libavutil all
 	$(MAKE) -C libavcodec all
 	$(MAKE) -C libavformat all
+ifeq ($(CONFIG_PP),yes)
+	$(MAKE) -C libavcodec/libpostproc all
+endif
 
 ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
 	$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
@@ -140,12 +143,18 @@
 	$(MAKE) -C libavutil   install-lib-shared
 	$(MAKE) -C libavcodec  install-lib-shared
 	$(MAKE) -C libavformat install-lib-shared
+ifeq ($(CONFIG_PP),yes)
+	$(MAKE) -C libavcodec/libpostproc install-lib-shared
+endif
 	$(LDCONFIG) || true
 endif
 ifeq ($(BUILD_STATIC),yes)
 	$(MAKE) -C libavutil   install-lib-static
 	$(MAKE) -C libavcodec  install-lib-static
 	$(MAKE) -C libavformat install-lib-static
+ifeq ($(CONFIG_PP),yes)
+	$(MAKE) -C libavcodec/libpostproc install-lib-static
+endif
 endif
 
 install-headers:
@@ -154,6 +163,9 @@
 	$(MAKE) -C libavutil   install-headers
 	$(MAKE) -C libavcodec  install-headers
 	$(MAKE) -C libavformat install-headers
+ifeq ($(CONFIG_PP),yes)
+	$(MAKE) -C libavcodec/libpostproc install-headers
+endif
 
 dep:	depend
 
@@ -175,6 +187,7 @@
 	$(MAKE) -C libavutil clean
 	$(MAKE) -C libavcodec clean
 	$(MAKE) -C libavformat clean
+	$(MAKE) -C libavcodec/libpostproc clean
 	$(MAKE) -C tests clean
 	$(MAKE) -C vhook clean
 	rm -f *.o *.d *~ .libs gmon.out TAGS \
@@ -185,6 +198,7 @@
 	$(MAKE) -C libavutil   distclean
 	$(MAKE) -C libavcodec  distclean
 	$(MAKE) -C libavformat distclean
+	$(MAKE) -C libavcodec/libpostproc distclean
 	$(MAKE) -C tests       distclean
 	$(MAKE) -C vhook       distclean
 	rm -f .depend config.mak config.h *.pc