Remove unnecessary CFLAGS variable from output_example link command.

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 52401514d93f0ca1ec531d7f1fa937d0448d11eb..81b4af8d119399173eef661c82b30b5ba6aaf346 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,8 @@ FFLIBS := avdevice avformat avcodec avutil swscale
 
 DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset)
 
+EXAMPLES = output_example$(EXESUF)
+
 include common.mak
 
 FF_LDFLAGS   := $(FFLDFLAGS)
@@ -45,7 +47,8 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
        cp -p $< $@
        $(STRIP) $@
 
-SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTS
+SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES \
+               ALTIVEC-OBJS MMX-OBJS YASM-OBJS-FFT YASM-OBJS
 
 define RESET
 $(1) :=
@@ -67,7 +70,7 @@ ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
        $(CC) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
 
 output_example$(EXESUF): output_example.o $(FF_DEP_LIBS)
-       $(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
+       $(CC) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
 
 tools/%$(EXESUF): tools/%.c
        $(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
@@ -120,7 +123,7 @@ testclean:
        rm -rf tests/vsynth1 tests/vsynth2 tests/data tests/asynth1.sw tests/*~
 
 clean:: testclean
-       rm -f $(ALLPROGS) $(ALLPROGS_G) output_example$(EXESUF)
+       rm -f $(ALLPROGS) $(ALLPROGS_G)
        rm -f doc/*.html doc/*.pod doc/*.1
        rm -f tests/seek_test$(EXESUF)
        rm -f $(addprefix tests/,$(addsuffix $(HOSTEXESUF),audiogen videogen rotozoom tiny_psnr))
@@ -224,6 +227,7 @@ LAVF_TESTS = $(addprefix regtest-,              \
         voc                                     \
         ogg                                     \
         pixfmt                                  \
+        pcx                                     \
     )
 
 REGFILES = $(addprefix tests/data/,$(addsuffix .$(1),$(2:regtest-%=%)))
@@ -303,4 +307,4 @@ tests/seek_test$(EXESUF): tests/seek_test.c $(FF_DEP_LIBS)
        $(CC) $(FF_LDFLAGS) $(CFLAGS) -o $@ $< $(FF_EXTRALIBS)
 
 
-.PHONY: lib documentation *test regtest-* swscale-error zlib-error alltools check
+.PHONY: documentation *test regtest-* zlib-error alltools check