[SCM] libav/experimental: Fix building of tools/*

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


The following commit has been merged in the experimental branch:
commit 2dfa305438bdfd80ec4db46248338189351f5eaa
Author: Måns Rullgård <mans at mansr.com>
Date:   Wed Jul 22 16:14:59 2009 +0000

    Fix building of tools/*
    
    Fixes issue 1282
    
    Originally committed as revision 19486 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index 8a0ad1e..514db66 100644
--- a/Makefile
+++ b/Makefile
@@ -67,8 +67,11 @@ ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
 %_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
 	$(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
 
-tools/%$(EXESUF): tools/%.c
-	$(LD) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
+tools/%$(EXESUF): tools/%.o
+	$(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
+
+tools/%.o: tools.%.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(CC_O) $<
 
 ffplay.o ffplay.d: CFLAGS += $(SDL_CFLAGS)
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list