From: Måns Rullgård <mans@mansr.com>
Date: Tue, 27 Feb 2007 22:51:30 +0000 (+0000)
Subject: simplify conditional targets
X-Git-Tag: v0.5~9898
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4c9b0af57b01cbe8dbabe849bcaa05ca9acb975a;p=coroid%2Flibav_saccubus.git

simplify conditional targets

Originally committed as revision 8153 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

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