Browse Source

simplify conditional targets

Originally committed as revision 8153 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Måns Rullgård 18 years ago
parent
commit
4c9b0af57b
1 changed files with 6 additions and 6 deletions
  1. +6
    -6
      Makefile

+ 6
- 6
Makefile 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
INSTALLVHOOK=install-vhook
all: videohook
install: install-vhook
endif endif


ifeq ($(BUILD_DOC),yes) ifeq ($(BUILD_DOC),yes)
DOC=documentation
INSTALLMAN=install-man
all: documentation
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


Loading…
Cancel
Save