Commit 7d6ac9a3 authored by Måns Rullgård's avatar Måns Rullgård

prettify conditional targets

Originally committed as revision 9566 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent cbefadbd
...@@ -30,10 +30,11 @@ else ...@@ -30,10 +30,11 @@ else
DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
endif endif
ifeq ($(CONFIG_VHOOK),yes) ALL_TARGETS-$(CONFIG_VHOOK) += videohook
all: videohook ALL_TARGETS-$(BUILD_DOC) += documentation
install: install-vhook
endif INSTALL_TARGETS-$(CONFIG_VHOOK) += install-vhook
INSTALL_TARGETS-$(BUILD_DOC) += install-man
VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS)) VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
...@@ -55,11 +56,6 @@ LIBS_drawtext$(SLIBSUF) = `freetype-config --libs` ...@@ -55,11 +56,6 @@ LIBS_drawtext$(SLIBSUF) = `freetype-config --libs`
VHOOKCFLAGS += $(VHOOKCFLAGS-yes) VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
ifeq ($(BUILD_DOC),yes)
all: documentation
install: install-man
endif
SRCS = $(addsuffix .c, $(PROGS-yes)) cmdutils.c SRCS = $(addsuffix .c, $(PROGS-yes)) cmdutils.c
LDFLAGS := -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS) LDFLAGS := -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
EXTRALIBS := -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS) EXTRALIBS := -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
...@@ -69,7 +65,7 @@ LDFLAGS+=-L$(BUILD_ROOT)/libswscale ...@@ -69,7 +65,7 @@ LDFLAGS+=-L$(BUILD_ROOT)/libswscale
EXTRALIBS+=-lswscale$(BUILDSUF) EXTRALIBS+=-lswscale$(BUILDSUF)
endif endif
all: lib $(PROGS) all: lib $(PROGS) $(ALL_TARGETS-yes)
lib: lib:
$(MAKE) -C libavutil all $(MAKE) -C libavutil all
...@@ -140,7 +136,7 @@ doc/%.pod: doc/%-doc.texi ...@@ -140,7 +136,7 @@ doc/%.pod: doc/%-doc.texi
doc/%.1: doc/%.pod doc/%.1: doc/%.pod
pod2man --section=1 --center=" " --release=" " $< > $@ 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) ifeq ($(BUILD_SHARED),yes)
install-progs: $(PROGS) install-libs install-progs: $(PROGS) install-libs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment