summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-03-10 20:01:50 +0000
committerDiego Biurrun <diego@biurrun.de>2008-03-10 20:01:50 +0000
commit3c889b5cf7e5c177fc3c7f2dda2c7fdd03b62375 (patch)
tree5cb02af59f444426a0b72042f5e346d55346fd51 /Makefile
parent5acef35f57fb1ec896de0ed572eafa1bf064506a (diff)
Merge SDL_CFLAGS handling for files that need it.
Originally committed as revision 12412 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1732042740..07ba3d107c 100644
--- 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