diff options
author | Måns Rullgård <mans@mansr.com> | 2008-04-03 22:47:01 +0000 |
---|---|---|
committer | Måns Rullgård <mans@mansr.com> | 2008-04-03 22:47:01 +0000 |
commit | 82e8566a02d1f69de792e4937662c15ceaafc735 (patch) | |
tree | 9ffb9440b125e69315b6ecea881b7881434d72fc /Makefile | |
parent | 43527e3edde76850a26d16666fead8ea9cf9ce93 (diff) | |
download | ffmpeg-82e8566a02d1f69de792e4937662c15ceaafc735.tar.gz |
simplify vhook/*.o rule
Originally committed as revision 12682 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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) |