Benjamin expressed the wish to be DCA maintainer too

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index d3e0c7d6ff319fc3a806104b4bc46a107262ada0..73c564244d7ecf7b0b0986bde35e5a3c89b1390f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ VPATH=$(SRC_PATH_BARE)
 
 CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
        -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale \
+       -I$(SRC_PATH)/libavdevice \
        -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE -DHAVE_AV_CONFIG_H
 LDFLAGS+= -g
 
@@ -25,16 +26,19 @@ ALLPROGS_G  = $(addsuffix _g$(EXESUF), $(BASENAMES))
 ALLMANPAGES = $(addsuffix .1, $(BASENAMES))
 
 ifeq ($(BUILD_SHARED),yes)
-DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
+DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavdevice/$(SLIBPREF)avdevice$(SLIBSUF)
 else
-DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
+DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavdevice/$(LIBPREF)avdevice$(LIBSUF)
 endif
 
 ALL_TARGETS-$(CONFIG_VHOOK) += videohook
 ALL_TARGETS-$(BUILD_DOC)    += documentation
 
 INSTALL_TARGETS-$(CONFIG_VHOOK) += install-vhook
+ifneq ($(PROGS),)
+INSTALL_TARGETS-yes             += install-progs
 INSTALL_TARGETS-$(BUILD_DOC)    += install-man
+endif
 
 VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
 
@@ -57,8 +61,8 @@ 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)
-EXTRALIBS := -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
+LDFLAGS := -L$(BUILD_ROOT)/libavdevice -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
+EXTRALIBS := -lavdevice$(BUILDSUF) -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
 
 ifeq ($(CONFIG_SWSCALER),yes)
 LDFLAGS+=-L$(BUILD_ROOT)/libswscale
@@ -71,6 +75,7 @@ lib:
        $(MAKE) -C libavutil   all
        $(MAKE) -C libavcodec  all
        $(MAKE) -C libavformat all
+       $(MAKE) -C libavdevice all
 ifeq ($(CONFIG_PP),yes)
        $(MAKE) -C libpostproc all
 endif
@@ -137,7 +142,7 @@ doc/%.pod: doc/%-doc.texi
 doc/%.1: doc/%.pod
        pod2man --section=1 --center=" " --release=" " $< > $@
 
-install: install-progs install-libs install-headers $(INSTALL_TARGETS-yes)
+install: install-libs install-headers $(INSTALL_TARGETS-yes)
 
 ifeq ($(BUILD_SHARED),yes)
 install-progs: install-libs
@@ -162,6 +167,7 @@ install-libs:
        $(MAKE) -C libavutil   install-libs
        $(MAKE) -C libavcodec  install-libs
        $(MAKE) -C libavformat install-libs
+       $(MAKE) -C libavdevice install-libs
 ifeq ($(CONFIG_PP),yes)
        $(MAKE) -C libpostproc install-libs
 endif
@@ -177,6 +183,7 @@ install-headers:
        $(MAKE) -C libavutil   install-headers
        $(MAKE) -C libavcodec  install-headers
        $(MAKE) -C libavformat install-headers
+       $(MAKE) -C libavdevice install-headers
 ifeq ($(CONFIG_PP),yes)
        $(MAKE) -C libpostproc install-headers
 endif
@@ -185,19 +192,20 @@ 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))
+       rm -f $(addprefix "$(SHLIBDIR)/",$(ALLHOOKS_SRCS:.c=$(SLIBSUF)))
        -rmdir "$(SHLIBDIR)/vhook/"
 
 uninstall-libs:
        $(MAKE) -C libavutil   uninstall-libs
        $(MAKE) -C libavcodec  uninstall-libs
        $(MAKE) -C libavformat uninstall-libs
+       $(MAKE) -C libavdevice uninstall-libs
        $(MAKE) -C libpostproc uninstall-libs
        $(MAKE) -C libswscale  uninstall-libs
 
@@ -205,6 +213,7 @@ uninstall-headers:
        $(MAKE) -C libavutil   uninstall-headers
        $(MAKE) -C libavcodec  uninstall-headers
        $(MAKE) -C libavformat uninstall-headers
+       $(MAKE) -C libavdevice uninstall-headers
        $(MAKE) -C libpostproc uninstall-headers
        $(MAKE) -C libswscale  uninstall-headers
        -rmdir "$(INCDIR)"
@@ -213,6 +222,7 @@ depend dep: .depend .vhookdep
        $(MAKE) -C libavutil   depend
        $(MAKE) -C libavcodec  depend
        $(MAKE) -C libavformat depend
+       $(MAKE) -C libavdevice depend
 ifeq ($(CONFIG_PP),yes)
        $(MAKE) -C libpostproc depend
 endif
@@ -223,7 +233,7 @@ endif
 .depend: $(SRCS) version.h
        $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
 
-# gcc stupidly only outputs the basename of targets
+# gcc stupidly only outputs the basename of targets with -MM
 .vhookdep: $(ALLHOOKS_SRCS)
        $(CC) $(VHOOKCFLAGS) -MM $^ | sed 's,^\([a-z]\),vhook/\1,' > $@
 
@@ -236,6 +246,7 @@ clean:
        $(MAKE) -C libavutil   clean
        $(MAKE) -C libavcodec  clean
        $(MAKE) -C libavformat clean
+       $(MAKE) -C libavdevice clean
        $(MAKE) -C libpostproc clean
        $(MAKE) -C libswscale  clean
        rm -f *.o *~ .libs gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \
@@ -249,6 +260,7 @@ distclean: clean
        $(MAKE) -C libavutil   distclean
        $(MAKE) -C libavcodec  distclean
        $(MAKE) -C libavformat distclean
+       $(MAKE) -C libavdevice distclean
        $(MAKE) -C libpostproc distclean
        $(MAKE) -C libswscale  distclean
        rm -f .depend .vhookdep version.h config.* *.pc
@@ -307,7 +319,7 @@ tests/asynth1.sw: tests/audiogen$(EXESUF)
        $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
 
 tests/seek_test$(EXESUF): tests/seek_test.c .libs
-       $(CC) $(LDFLAGS) $(CFLAGS) -DHAVE_AV_CONFIG_H -o $@ $< $(EXTRALIBS)
+       $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< $(EXTRALIBS)
 
 
 .PHONY: all lib videohook documentation install* wininstaller uninstall*