summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2007-07-09 20:42:00 +0000
committerMåns Rullgård <mans@mansr.com>2007-07-09 20:42:00 +0000
commit7d6ac9a319087573f4f58ae475546d99bb8f6f1b (patch)
treee7c562e583190c427ef80d3987600ad5eb504448 /Makefile
parentcbefadbd257e135d78f197cf2ae1e791801d5b71 (diff)
prettify conditional targets
Originally committed as revision 9566 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 7 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index c654364ce2..e90d0fcb8c 100644
--- 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))
@@ -55,11 +56,6 @@ 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
@@ -140,7 +136,7 @@ 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