Commit 623ffe8c authored by Mans Rullgard's avatar Mans Rullgard

build: simplify some conditional targets

Use intermediate targets instead of variables for conditional
parts of "all" and "install" targets.
Signed-off-by: 's avatarMans Rullgard <mans@mansr.com>
parent 19d824e4
...@@ -41,15 +41,9 @@ FF_LDFLAGS := $(FFLDFLAGS) ...@@ -41,15 +41,9 @@ FF_LDFLAGS := $(FFLDFLAGS)
FF_EXTRALIBS := $(FFEXTRALIBS) FF_EXTRALIBS := $(FFEXTRALIBS)
FF_DEP_LIBS := $(DEP_LIBS) FF_DEP_LIBS := $(DEP_LIBS)
ALL_TARGETS-$(CONFIG_DOC) += documentation all-$(CONFIG_DOC): documentation
ifdef PROGS all: $(FF_DEP_LIBS) $(PROGS)
INSTALL_TARGETS-yes += install-progs install-data
INSTALL_TARGETS-$(CONFIG_DOC) += install-man
endif
INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs
all: $(FF_DEP_LIBS) $(PROGS) $(ALL_TARGETS-yes)
config.h: .config config.h: .config
.config: $(wildcard $(FFLIBS:%=$(SRC_DIR)/lib%/all*.c)) .config: $(wildcard $(FFLIBS:%=$(SRC_DIR)/lib%/all*.c))
...@@ -127,11 +121,18 @@ doc/%.1: TAG = MAN ...@@ -127,11 +121,18 @@ doc/%.1: TAG = MAN
doc/%.1: doc/%.pod doc/%.1: doc/%.pod
$(M)pod2man --section=1 --center=" " --release=" " $< > $@ $(M)pod2man --section=1 --center=" " --release=" " $< > $@
install: install-libs install-headers $(INSTALL_TARGETS-yes) ifdef PROGS
install: install-progs install-data
endif
install: install-libs install-headers
install-libs: install-libs-yes install-libs: install-libs-yes
install-progs: $(PROGS) $(INSTALL_PROGS_TARGETS-yes) install-progs-$(CONFIG_DOC): install-man
install-progs-$(CONFIG_SHARED): install-libs
install-progs: install-progs-yes $(PROGS)
$(Q)mkdir -p "$(BINDIR)" $(Q)mkdir -p "$(BINDIR)"
$(INSTALL) -c -m 755 $(PROGS) "$(BINDIR)" $(INSTALL) -c -m 755 $(PROGS) "$(BINDIR)"
......
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