Skip to content

F
ffmpeg.wasm-core
Commit 4c9b0af5 authored by Måns Rullgård's avatar Måns Rullgård
Browse files
Options

simplify conditional targets 

Originally committed as revision 8153 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 0cb8579a
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
Makefile
View file @ 4c9b0af5
...@@ -31,13 +31,13 @@ DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(L ...@@ -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 ...@@ -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 ...@@ -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
......
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