[SCM] libav/experimental: work into the ffmpeg build system

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:14:10 UTC 2013


The following commit has been merged in the experimental branch:
commit 782e83e21b4c942137667c515a9c48b172dc06b9
Author: Vitor Sessak <vitor1001 at gmail.com>
Date:   Fri Feb 15 19:21:42 2008 +0000

    work into the ffmpeg build system
    
    Commited in SoC by Bobby Bingham on 2007-07-24 17:59:16
    
    Originally committed as revision 11946 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index a94472c..d3f1931 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -1,24 +1,36 @@
-CC = gcc
-CFLAGS = -g -I../libavcodec -I../libavutil
-LIBS = ../libavcodec/libavcodec.a ../libavutil/libavutil.a -lm -lSDL
-
-OBJECTS = avfilter.o          \
-          avfiltergraph.o     \
-          vsrc_dummy.o        \
-		  vsrc_ppm.o          \
-		  vo_sdl.o            \
-		  vf_crop.o           \
-		  vf_passthrough.o    \
-		  vf_rgb2bgr.o        \
-		  vf_slicify.o        \
-
-all: filter_test
-
-clean:
-	rm -f filter_test $(OBJECTS)
-
-filter_test: $(OBJECTS) filter_test.c
-	$(CC) $(CFLAGS) $^ -o $@ $(LIBS)
-
-$(OBJECTS): %.o: %.c
-	$(CC) $(CFLAGS) -c $<
+include ../config.mak
+
+CFLAGS+=-I$(SRC_PATH)/libavcodec
+
+OBJS = avfilter.o \
+       avfiltergraph.o \
+
+# TODO: real conditional compilation
+OBJS-yes = vsrc_dummy.o \
+           vsrc_ppm.o \
+           vo_sdl.o \
+           vf_crop.o \
+           vf_passthrough.o \
+           vf_rgb2bgr.o \
+           vf_slicify.o \
+
+HEADERS = avfilter.h
+
+EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
+
+NAME=avfilter
+LIBVERSION=$(LAVFILTERVERSION)
+LIBMAJOR=$(LAVFILTERMAJOR)
+
+include ../common.mak
+
+clean::
+	rm -f \
+	   filter_test $(TESTS)
+
+tests: filter_test
+
+filter_test: filter_test.o $(LIB)
+	$(CC) $(CFLAGS) $< -o $@ $(LIB) -lm -lSDL
+
+.PHONY: tests

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list