simplify conditional targets

Originally committed as revision 8153 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2007-02-27 22:51:30 +00:00
parent 0cb8579af2
commit 4c9b0af57b

View File

@ -31,13 +31,13 @@ DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(L
endif endif
ifeq ($(CONFIG_VHOOK),yes) ifeq ($(CONFIG_VHOOK),yes)
VHOOK=videohook all: videohook
INSTALLVHOOK=install-vhook install: install-vhook
endif endif
ifeq ($(BUILD_DOC),yes) ifeq ($(BUILD_DOC),yes)
DOC=documentation all: documentation
INSTALLMAN=install-man install: install-man
endif endif
OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
@ -50,7 +50,7 @@ LDFLAGS+=-L./libswscale
EXTRALIBS+=-lswscale$(BUILDSUF) EXTRALIBS+=-lswscale$(BUILDSUF)
endif endif
all: lib $(PROGS) $(VHOOK) $(DOC) all: lib $(PROGS)
lib: lib:
$(MAKE) -C libavutil all $(MAKE) -C libavutil all
@ -107,7 +107,7 @@ videohook: .libs
documentation: documentation:
$(MAKE) -C doc all $(MAKE) -C doc all
install: install-progs install-libs install-headers $(INSTALLMAN) $(INSTALLVHOOK) install: install-progs install-libs install-headers
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
install-progs: $(PROGS) install-libs install-progs: $(PROGS) install-libs