[FFmpeg-soc] [soc]: r1852 - libavfilter/diffs/00_build.diff

[benoit]

Author: benoit
Date: Wed Jan 30 16:40:06 2008
New Revision: 1852

Log:
Update build diff file.


Modified:
   libavfilter/diffs/00_build.diff

Modified: libavfilter/diffs/00_build.diff
==============================================================================
--- libavfilter/diffs/00_build.diff	(original)
+++ libavfilter/diffs/00_build.diff	Wed Jan 30 16:40:06 2008
@@ -1,6 +1,6 @@
 Index: configure
 ===================================================================
---- configure	(revision 11629)
+--- configure	(revision 11668)
 +++ configure	(working copy)
 @@ -72,6 +72,7 @@
    echo "                           and ffmpeg will be unredistributable [default=no]"
@@ -53,7 +53,7 @@ Index: configure
 +fi
 Index: Makefile
 ===================================================================
---- Makefile	(revision 11629)
+--- Makefile	(revision 11668)
 +++ Makefile	(working copy)
 @@ -8,7 +8,7 @@
  
@@ -73,30 +73,34 @@ Index: Makefile
 +EXTRALIBS := -lavfilter$(BUILDSUF) $(EXTRALIBS)
 +endif
 +
- all: lib $(PROGS) $(ALL_TARGETS-yes)
+ MAKE-yes = $(MAKE)
+ MAKE-    = : $(MAKE)
  
- lib:
-@@ -82,6 +87,9 @@
- ifeq ($(CONFIG_SWSCALER),yes)
- 	$(MAKE) -C libswscale  all
- endif
-+ifeq ($(CONFIG_AVFILTER),yes)
-+	$(MAKE) -C libavfilter all
-+endif
+@@ -81,6 +86,7 @@
+ 	$(MAKE)                    -C libavdevice all
+ 	$(MAKE-$(CONFIG_PP))       -C libpostproc all
+ 	$(MAKE-$(CONFIG_SWSCALER)) -C libswscale  all
++	$(MAKE-$(CONFIG_AVFILTER)) -C libavfilter all
  
  ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
  	$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
-@@ -185,6 +193,9 @@
- 	$(MAKE) -C libpostproc install-headers
+@@ -166,6 +172,7 @@
+ 	$(MAKE)                    -C libavdevice install-libs
+ 	$(MAKE-$(CONFIG_PP))       -C libpostproc install-libs
+ 	$(MAKE-$(CONFIG_SWSCALER)) -C libswscale  install-libs
++	$(MAKE-$(CONFIG_AVFILTER)) -C libavfilter install-libs
+ ifeq ($(BUILD_SHARED),yes)
+ 	-$(LDCONFIG)
  endif
- 	$(MAKE) -C libswscale  install-headers
-+ifeq ($(CONFIG_AVFILTER),yes)
-+	$(MAKE) -C libavfilter install-headers
-+endif
+@@ -177,6 +184,7 @@
+ 	$(MAKE)              -C libavdevice install-headers
+ 	$(MAKE-$(CONFIG_PP)) -C libpostproc install-headers
+ 	$(MAKE)              -C libswscale  install-headers
++	$(MAKE-$(CONFIG_AVFILTER)) -C libavfilter install-headers
  
  uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
  
-@@ -205,6 +216,7 @@
+@@ -197,6 +205,7 @@
  	$(MAKE) -C libavdevice uninstall-libs
  	$(MAKE) -C libpostproc uninstall-libs
  	$(MAKE) -C libswscale  uninstall-libs
@@ -104,7 +108,7 @@ Index: Makefile
  
  uninstall-headers:
  	$(MAKE) -C libavutil   uninstall-headers
-@@ -213,6 +225,7 @@
+@@ -205,6 +214,7 @@
  	$(MAKE) -C libavdevice uninstall-headers
  	$(MAKE) -C libpostproc uninstall-headers
  	$(MAKE) -C libswscale  uninstall-headers
@@ -112,17 +116,15 @@ Index: Makefile
  	-rmdir "$(INCDIR)"
  
  depend dep: .depend .vhookdep
-@@ -226,6 +239,9 @@
- ifeq ($(CONFIG_SWSCALER),yes)
- 	$(MAKE) -C libswscale  depend
- endif
-+ifeq ($(CONFIG_AVFILTER),yes)
-+	$(MAKE) -C libavfilter depend
-+endif
+@@ -214,6 +224,7 @@
+ 	$(MAKE)                    -C libavdevice depend
+ 	$(MAKE-$(CONFIG_PP))       -C libpostproc depend
+ 	$(MAKE-$(CONFIG_SWSCALER)) -C libswscale  depend
++	$(MAKE-$(CONFIG_AVFILTER)) -C libavfilter depend
  
  .depend: $(SRCS) version.h
  	$(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
-@@ -246,6 +262,7 @@
+@@ -234,6 +245,7 @@
  	$(MAKE) -C libavdevice clean
  	$(MAKE) -C libpostproc clean
  	$(MAKE) -C libswscale  clean
@@ -130,7 +132,7 @@ Index: Makefile
  	rm -f *.o *~ .libs gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \
  	   output_example$(EXESUF)
  	rm -f doc/*.html doc/*.pod doc/*.1
-@@ -261,6 +278,7 @@
+@@ -249,6 +261,7 @@
  	$(MAKE) -C libavdevice distclean
  	$(MAKE) -C libpostproc distclean
  	$(MAKE) -C libswscale  distclean