From 82e8566a02d1f69de792e4937662c15ceaafc735 Mon Sep 17 00:00:00 2001 From: Måns Rullgård Date: Thu, 3 Apr 2008 22:47:01 +0000 Subject: simplify vhook/*.o rule Originally committed as revision 12682 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7bfcfb7bf7..4caa076d58 100644 --- a/Makefile +++ b/Makefile @@ -49,9 +49,6 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF) cp -p $< $@ $(STRIP) $@ -vhook/%.o: vhook/%.c - $(CC) $(VHOOKCFLAGS) -c -o $@ $< - .depend: version.h $(PROGS_SRCS) # bandaid to disable triggering shared library installation routines @@ -79,6 +76,8 @@ LIBS_drawtext$(SLIBSUF) = `freetype-config --libs` VHOOKCFLAGS += $(VHOOKCFLAGS-yes) +vhook/%.o: CFLAGS:=$(VHOOKCFLAGS) + LDFLAGS-$(CONFIG_SWSCALE) += -L$(BUILD_ROOT)/libswscale LDFLAGS-$(CONFIG_AVFILTER) += -L$(BUILD_ROOT)/libavfilter LDFLAGS := $(LDFLAGS-yes) -L$(BUILD_ROOT)/libavdevice -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil -g $(LDFLAGS) -- cgit v1.2.3