]> git.sesse.net Git - ffmpeg/blobdiff - Makefile
Fix trivial mixed declarations and code warning caused by a double semicolon.
[ffmpeg] / Makefile
index 0ce1e50e99350f9e7ce16ca3c62896f1e9b4fb31..56cca08849be13e9433ecc524c34fb7ea969def5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,15 +30,31 @@ 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
 
-ifeq ($(BUILD_DOC),yes)
-all: documentation
-install: install-man
-endif
+INSTALL_TARGETS-$(CONFIG_VHOOK) += install-vhook
+INSTALL_TARGETS-$(BUILD_DOC)    += install-man
+
+VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
+
+BASEHOOKS = fish null watermark
+ALLHOOKS = $(BASEHOOKS) drawtext imlib2 ppm
+ALLHOOKS_SRCS = $(addprefix vhook/, $(addsuffix .c, $(ALLHOOKS)))
+
+HOOKS-$(HAVE_FORK)      += ppm
+HOOKS-$(HAVE_IMLIB2)    += imlib2
+HOOKS-$(HAVE_FREETYPE2) += drawtext
+
+HOOKS = $(addprefix vhook/, $(addsuffix $(SLIBSUF), $(BASEHOOKS) $(HOOKS-yes)))
+
+VHOOKCFLAGS-$(HAVE_IMLIB2) += `imlib2-config --cflags`
+LIBS_imlib2$(SLIBSUF)       = `imlib2-config --libs`
+
+VHOOKCFLAGS-$(HAVE_FREETYPE2) += `freetype-config --cflags`
+LIBS_drawtext$(SLIBSUF)        = `freetype-config --libs`
+
+VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
 
 SRCS = $(addsuffix .c, $(PROGS-yes)) cmdutils.c
 LDFLAGS := -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
@@ -49,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
@@ -65,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)
@@ -86,22 +102,27 @@ 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)
 
 ffmpeg.o ffplay.o ffserver.o: version.h
 
+videohook: .libs $(HOOKS)
+
+vhook/%$(SLIBSUF): vhook/%.o
+       $(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F))
+
+vhook/%.o: vhook/%.c
+       $(CC) $(VHOOKCFLAGS) -c -o $@ $<
+
 %.o: %.c
        $(CC) $(CFLAGS) -c -o $@ $<
 
-videohook: .libs
-       $(MAKE) -C vhook all
-
 documentation: $(addprefix doc/, ffmpeg-doc.html faq.html ffserver-doc.html \
                                  ffplay-doc.html hooks.html $(ALLMANPAGES))
 
@@ -115,26 +136,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:
-       $(MAKE) -C vhook install
+install-vhook: videohook
+       install -d "$(SHLIBDIR)/vhook"
+       install -m 755 $(HOOKS) "$(SHLIBDIR)/vhook"
 
 install-libs:
        $(MAKE) -C libavutil   install-libs
@@ -163,13 +185,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:
-       $(MAKE) -C vhook uninstall
+       rm -f $(addprefix $(SHLIBDIR)/vhook/,$(ALLHOOKS))
+       -rmdir "$(SHLIBDIR)/vhook/"
 
 uninstall-libs:
        $(MAKE) -C libavutil   uninstall-libs
@@ -182,9 +205,9 @@ uninstall-headers:
        $(MAKE) -C libavcodec  uninstall-headers
        $(MAKE) -C libavformat uninstall-headers
        $(MAKE) -C libpostproc uninstall-headers
-       -rmdir "$(incdir)"
+       -rmdir "$(INCDIR)"
 
-depend dep: .depend
+depend dep: .depend .vhookdep
        $(MAKE) -C libavutil   depend
        $(MAKE) -C libavcodec  depend
        $(MAKE) -C libavformat depend
@@ -194,13 +217,14 @@ endif
 ifeq ($(CONFIG_SWSCALER),yes)
        $(MAKE) -C libswscale  depend
 endif
-ifeq ($(CONFIG_VHOOK),yes)
-       $(MAKE) -C vhook       depend
-endif
 
 .depend: $(SRCS) version.h
        $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
 
+# gcc stupidly only outputs the basename of targets
+.vhookdep: $(ALLHOOKS_SRCS)
+       $(CC) $(VHOOKCFLAGS) -MM $^ | sed 's,^\([a-z]\),vhook/\1,' > $@
+
 $(DEP_LIBS): lib
 
 .libs: $(DEP_LIBS)
@@ -212,12 +236,12 @@ clean:
        $(MAKE) -C libavformat clean
        $(MAKE) -C libpostproc clean
        $(MAKE) -C libswscale  clean
-       $(MAKE) -C vhook       clean
-       rm -f *.o *.d *~ .libs gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \
+       rm -f *.o *~ .libs gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \
           output_example$(EXESUF) qt-faststart$(EXESUF) cws2fws$(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))
+       rm -f vhook/*.o vhook/*~ vhook/*.so vhook/*.dylib vhook/*.dll
 
 distclean: clean
        $(MAKE) -C libavutil   distclean
@@ -225,7 +249,6 @@ distclean: clean
        $(MAKE) -C libavformat distclean
        $(MAKE) -C libpostproc distclean
        $(MAKE) -C libswscale  distclean
-       $(MAKE) -C vhook       distclean
        rm -f .depend version.h config.* *.pc
 
 TAGS:
@@ -252,18 +275,10 @@ 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
@@ -298,3 +313,4 @@ tests/seek_test$(EXESUF): tests/seek_test.c
 .PHONY: mpeg4 mpeg ac3 snow snowll swscale-error
 
 -include .depend
+-include .vhookdep