summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2007-02-27 22:51:30 +0000
committerMåns Rullgård <mans@mansr.com>2007-02-27 22:51:30 +0000
commit4c9b0af57b01cbe8dbabe849bcaa05ca9acb975a (patch)
tree36cc134495168586eac0540fbed517e40440a18b /Makefile
parent0cb8579af281b85065eec84e6c2eb3fb9acc9144 (diff)
simplify conditional targets
Originally committed as revision 8153 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 3763403a5d..50fb3bedf1 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