unused

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index e58768b5ee7a372111ee6a2d1dd643dc0485bae3..83f313582a5971c5a28c060012c5832c3544ee10 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,10 +30,11 @@ else
 DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
 endif
 
-ifeq ($(CONFIG_VHOOK),yes)
-all: videohook
-install: install-vhook
-endif
+ALL_TARGETS-$(CONFIG_VHOOK) += videohook
+ALL_TARGETS-$(BUILD_DOC)    += documentation
+
+INSTALL_TARGETS-$(CONFIG_VHOOK) += install-vhook
+INSTALL_TARGETS-$(BUILD_DOC)    += install-man
 
 VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
 
@@ -48,18 +49,13 @@ HOOKS-$(HAVE_FREETYPE2) += drawtext
 HOOKS = $(addprefix vhook/, $(addsuffix $(SLIBSUF), $(BASEHOOKS) $(HOOKS-yes)))
 
 VHOOKCFLAGS-$(HAVE_IMLIB2) += `imlib2-config --cflags`
-LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs`
+LIBS_imlib2$(SLIBSUF)       = `imlib2-config --libs`
 
 VHOOKCFLAGS-$(HAVE_FREETYPE2) += `freetype-config --cflags`
-LIBS_drawtext$(SLIBSUF) = `freetype-config --libs`
+LIBS_drawtext$(SLIBSUF)        = `freetype-config --libs`
 
 VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
 
-ifeq ($(BUILD_DOC),yes)
-all: documentation
-install: install-man
-endif
-
 SRCS = $(addsuffix .c, $(PROGS-yes)) cmdutils.c
 LDFLAGS := -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
 EXTRALIBS := -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
@@ -69,7 +65,7 @@ LDFLAGS+=-L$(BUILD_ROOT)/libswscale
 EXTRALIBS+=-lswscale$(BUILDSUF)
 endif
 
-all: lib $(PROGS)
+all: lib $(PROGS) $(ALL_TARGETS-yes)
 
 lib:
        $(MAKE) -C libavutil   all
@@ -85,8 +81,8 @@ endif
 ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
        $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
 
-ffserver$(EXESUF): ffserver.o .libs
-       $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(EXTRALIBS)
+ffserver$(EXESUF): ffserver.o cmdutils.o .libs
+       $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o cmdutils.o $(EXTRALIBS)
 
 ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
        $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(EXTRALIBS) $(SDL_LIBS)
@@ -106,10 +102,10 @@ version.h:
 output_example$(EXESUF): output_example.o .libs
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(EXTRALIBS)
 
-qt-faststart$(EXESUF): qt-faststart.c
+tools/qt-faststart$(EXESUF): tools/qt-faststart.c
        $(CC) $(CFLAGS) $< -o $@
 
-cws2fws$(EXESUF): cws2fws.c
+tools/cws2fws$(EXESUF): tools/cws2fws.c
        $(CC) $(CFLAGS) $< -o $@ -lz
 
 ffplay.o: CFLAGS += $(SDL_CFLAGS)
@@ -128,7 +124,8 @@ vhook/%.o: vhook/%.c
        $(CC) $(CFLAGS) -c -o $@ $<
 
 documentation: $(addprefix doc/, ffmpeg-doc.html faq.html ffserver-doc.html \
-                                 ffplay-doc.html hooks.html $(ALLMANPAGES))
+                                 ffplay-doc.html general.html hooks.html \
+                                 $(ALLMANPAGES))
 
 doc/%.html: doc/%.texi
        texi2html -monolithic -number $<
@@ -140,27 +137,27 @@ doc/%.pod: doc/%-doc.texi
 doc/%.1: doc/%.pod
        pod2man --section=1 --center=" " --release=" " $< > $@
 
-install: install-progs install-libs install-headers
+install: install-progs install-libs install-headers $(INSTALL_TARGETS-yes)
 
 ifeq ($(BUILD_SHARED),yes)
 install-progs: $(PROGS) install-libs
 else
 install-progs: $(PROGS)
 endif
-       install -d "$(bindir)"
-       install -c -m 755 $(PROGS) "$(bindir)"
+       install -d "$(BINDIR)"
+       install -c -m 755 $(PROGS) "$(BINDIR)"
 
 # Create the Windows installer.
 wininstaller: all install
        makensis ffinstall.nsi
 
 install-man:
-       install -d "$(mandir)/man1"
-       install -m 644 $(MANPAGES) "$(mandir)/man1"
+       install -d "$(MANDIR)/man1"
+       install -m 644 $(MANPAGES) "$(MANDIR)/man1"
 
 install-vhook: videohook
-       install -d "$(shlibdir)/vhook"
-       install -m 755 $(HOOKS) "$(shlibdir)/vhook"
+       install -d "$(SHLIBDIR)/vhook"
+       install -m 755 $(HOOKS) "$(SHLIBDIR)/vhook"
 
 install-libs:
        $(MAKE) -C libavutil   install-libs
@@ -189,14 +186,14 @@ endif
 uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
 
 uninstall-progs:
-       rm -f $(addprefix $(bindir)/, $(ALLPROGS))
+       rm -f $(addprefix $(BINDIR)/, $(ALLPROGS))
 
 uninstall-man:
-       rm -f $(addprefix $(mandir)/man1/,$(ALLMANPAGES))
+       rm -f $(addprefix $(MANDIR)/man1/,$(ALLMANPAGES))
 
 uninstall-vhook:
-       rm -f $(addprefix $(shlibdir)/vhook/,$(ALLHOOKS))
-       -rmdir "$(shlibdir)/vhook/"
+       rm -f $(addprefix $(SHLIBDIR)/vhook/,$(ALLHOOKS))
+       -rmdir "$(SHLIBDIR)/vhook/"
 
 uninstall-libs:
        $(MAKE) -C libavutil   uninstall-libs
@@ -209,7 +206,7 @@ uninstall-headers:
        $(MAKE) -C libavcodec  uninstall-headers
        $(MAKE) -C libavformat uninstall-headers
        $(MAKE) -C libpostproc uninstall-headers
-       -rmdir "$(incdir)"
+       -rmdir "$(INCDIR)"
 
 depend dep: .depend .vhookdep
        $(MAKE) -C libavutil   depend
@@ -279,18 +276,11 @@ codectest mpeg4 mpeg ac3 snow snowll: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests
        $(SRC_PATH)/tests/regression.sh $@ $(FFMPEG_REFFILE)   tests/vsynth1
        $(SRC_PATH)/tests/regression.sh $@ $(ROTOZOOM_REFFILE) tests/vsynth2
 
-ifeq ($(CONFIG_GPL),yes)
 libavtest: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
        $(SRC_PATH)/tests/regression.sh $@ $(LIBAV_REFFILE) tests/vsynth1
+
 seektest: tests/seek_test$(EXESUF)
        $(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE)
-else
-libavtest seektest:
-       @echo
-       @echo "This test requires FFmpeg to be compiled with --enable-gpl."
-       @echo
-       @exit 1
-endif
 
 ifeq ($(CONFIG_SWSCALER),yes)
 test-server codectest mpeg4 mpeg ac3 snow snowll libavtest: swscale_error
@@ -315,7 +305,7 @@ tests/asynth1.sw: tests/audiogen$(EXESUF)
 %$(EXESUF): %.c
        $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
 
-tests/seek_test$(EXESUF): tests/seek_test.c
+tests/seek_test$(EXESUF): tests/seek_test.c .libs
        $(CC) $(LDFLAGS) $(CFLAGS) -DHAVE_AV_CONFIG_H -o $@ $< $(EXTRALIBS)