10l, do not use ctx before being set, fix segv

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index b13474685f38f2925ba58b2288a43a5c7137405c..a820d5f360cad380a08604cb202090da2452398d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,3 @@
-#
-# Main ffmpeg Makefile
-# (c) 2000-2004 Fabrice Bellard
-#
 include config.mak
 
 SRC_DIR = $(SRC_PATH_BARE)
@@ -14,7 +10,7 @@ PROGS-$(CONFIG_FFSERVER) += ffserver
 
 PROGS       = $(addsuffix   $(EXESUF), $(PROGS-yes))
 PROGS_G     = $(addsuffix _g$(EXESUF), $(PROGS-yes))
-PROGS_SRCS  = $(addsuffix .c,          $(PROGS-yes)) cmdutils.c
+OBJS        = $(addsuffix .o,          $(PROGS-yes)) cmdutils.o
 MANPAGES    = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes)))
 
 BASENAMES   = ffmpeg ffplay ffserver
@@ -32,9 +28,7 @@ include common.mak
 
 FF_LDFLAGS   := $(FFLDFLAGS)
 FF_EXTRALIBS := $(FFEXTRALIBS)
-
-S := $(BUILD_SHARED:yes=S)
-DEP_LIBS := $(foreach L,$(FFLIBS),lib$(L)/$($(S)LIBPREF)$(L)$($(S)LIBSUF))
+FF_DEP_LIBS  := $(DEP_LIBS)
 
 ALL_TARGETS-$(CONFIG_VHOOK) += videohook
 ALL_TARGETS-$(BUILD_DOC)    += documentation
@@ -46,15 +40,13 @@ INSTALL_TARGETS-$(BUILD_DOC)    += install-man
 endif
 INSTALL_PROGS_TARGETS-$(BUILD_SHARED) = install-libs
 
-all: $(DEP_LIBS) $(PROGS) $(ALL_TARGETS-yes)
+all: $(FF_DEP_LIBS) $(PROGS) $(ALL_TARGETS-yes)
 
 $(PROGS): %$(EXESUF): %_g$(EXESUF)
        cp -p $< $@
        $(STRIP) $@
 
-.depend: version.h $(PROGS_SRCS)
-
-SUBDIR_VARS := OBJS ASM_OBJS CPP_OBJS FFLIBS CLEANFILES
+SUBDIR_VARS := OBJS ASM_OBJS CPP_OBJS FFLIBS CLEANFILES DIRS TESTS
 
 define RESET
 $(1) :=
@@ -69,6 +61,20 @@ endef
 
 $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
 
+ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
+ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
+
+%_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
+       $(CC) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
+
+output_example$(EXESUF): output_example.o $(FF_DEP_LIBS)
+       $(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
+
+tools/%$(EXESUF): tools/%.c
+       $(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
+
+ffplay.o ffplay.d: CFLAGS += $(SDL_CFLAGS)
+
 VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
 
 BASEHOOKS = fish null watermark
@@ -89,38 +95,18 @@ LIBS_drawtext$(SLIBSUF)        = `freetype-config --libs`
 
 VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
 
-vhook/%.o: CFLAGS:=$(VHOOKCFLAGS)
-
-ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
-ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
-
-%_g$(EXESUF): %.o cmdutils.o $(DEP_LIBS)
-       $(CC) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
-
-SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries
-ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES))
-version.h: $(SVN_ENTRIES)
-endif
-
-version.h:
-       $(SRC_PATH)/version.sh $(SRC_PATH)
-
-output_example$(EXESUF): output_example.o $(DEP_LIBS)
-       $(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
-
-tools/%$(EXESUF): tools/%.c
-       $(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
-
-ffplay.o .depend: CFLAGS += $(SDL_CFLAGS)
-
-ffmpeg.o ffplay.o ffserver.o: version.h
+vhook/%.o vhook/%.d: CFLAGS:=$(VHOOKCFLAGS)
 
 # vhooks compile fine without libav*, but need them nonetheless.
-videohook: $(DEP_LIBS) $(HOOKS)
+videohook: $(FF_DEP_LIBS) $(HOOKS)
 
+$(eval VHOOKSHFLAGS=$(VHOOKSHFLAGS))
 vhook/%$(SLIBSUF): vhook/%.o
        $(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F))
 
+VHOOK_DEPS = $(HOOKS:$(SLIBSUF)=.d)
+depend dep: $(VHOOK_DEPS)
+
 documentation: $(addprefix doc/, ffmpeg-doc.html faq.html ffserver-doc.html \
                                  ffplay-doc.html general.html hooks.html \
                                  $(ALLMANPAGES))
@@ -161,14 +147,8 @@ uninstall-vhook:
        rm -f $(addprefix "$(SHLIBDIR)/",$(ALLHOOKS_SRCS:.c=$(SLIBSUF)))
        -rmdir "$(SHLIBDIR)/vhook/"
 
-depend dep: .vhookdep
-
-.vhookdep: $(ALLHOOKS_SRCS) version.h
-       $(VHOOK_DEPEND_CMD) > $@
-
 clean::
-       rm -f gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \
-          output_example$(EXESUF)
+       rm -f $(ALLPROGS) $(ALLPROGS_G) output_example$(EXESUF)
        rm -f doc/*.html doc/*.pod doc/*.1
        rm -rf tests/vsynth1 tests/vsynth2 tests/data tests/asynth1.sw tests/*~
        rm -f $(addprefix tests/,$(addsuffix $(EXESUF),audiogen videogen rotozoom seek_test tiny_psnr))
@@ -176,7 +156,7 @@ clean::
        rm -f vhook/*.o vhook/*~ vhook/*.so vhook/*.dylib vhook/*.dll
 
 distclean::
-       rm -f .vhookdep version.h config.* *.pc
+       rm -f version.h config.* vhook/*.d
 
 # regression tests
 
@@ -314,7 +294,7 @@ $(LAVF_TESTS):
 seektest: codectest libavtest tests/seek_test$(EXESUF)
        $(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE)
 
-test-server: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
+servertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
        @echo
        @echo "Unfortunately ffserver is broken and therefore its regression"
        @echo "test fails randomly. Treat the results accordingly."
@@ -322,7 +302,7 @@ test-server: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
        $(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf
 
 ifeq ($(CONFIG_SWSCALE),yes)
-test-server codectest $(CODEC_TESTS) libavtest: swscale_error
+servertest codectest $(CODEC_TESTS) libavtest: swscale_error
 swscale_error:
        @echo
        @echo "This regression test is incompatible with --enable-swscale."
@@ -344,12 +324,10 @@ tests/asynth1.sw: tests/audiogen$(EXESUF)
 %$(EXESUF): %.c
        $(CC) $(FF_LDFLAGS) $(CFLAGS) -o $@ $<
 
-tests/seek_test$(EXESUF): tests/seek_test.c $(DEP_LIBS)
+tests/seek_test$(EXESUF): tests/seek_test.c $(FF_DEP_LIBS)
        $(CC) $(FF_LDFLAGS) $(CFLAGS) -o $@ $< $(FF_EXTRALIBS)
 
 
-.PHONY: lib videohook documentation TAGS
-.PHONY: codectest libavtest seektest test-server fulltest test
-.PHONY: $(CODEC_TESTS) $(LAVF_TESTS) regtest-ref swscale-error
+.PHONY: lib videohook documentation *test regtest-* swscale-error
 
--include .vhookdep
+-include $(VHOOK_DEPS)