]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
Merge SDL_CFLAGS handling for files that need it.
authordiego <diego@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Mon, 10 Mar 2008 20:01:50 +0000 (20:01 +0000)
committerdiego <diego@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Mon, 10 Mar 2008 20:01:50 +0000 (20:01 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12412 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

Makefile

index 1732042740596fc83f90e85dedad2f3ccd93e509..07ba3d107c8d2fa5158d1d424c840da12467f29c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,7 @@ output_example$(EXESUF): output_example.o .libs
 tools/%$(EXESUF): tools/%.c
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(EXTRALIBS)
 
-ffplay.o: CFLAGS += $(SDL_CFLAGS)
+ffplay.o .depend: CFLAGS += $(SDL_CFLAGS)
 
 ffmpeg.o ffplay.o ffserver.o: version.h
 
@@ -227,7 +227,7 @@ depend dep: .depend .vhookdep
        $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter depend
 
 .depend: $(SRCS) version.h
-       $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
+       $(CC) -MM $(CFLAGS) $(filter-out %.h,$^) 1>.depend
 
 # gcc stupidly only outputs the basename of targets with -MM
 .vhookdep: $(ALLHOOKS_SRCS) version.h