diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-12 03:26:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-12 04:30:19 +0200 |
| commit | d127d26997ff046a9f112643eebd1007590b4fa2 (patch) | |
| tree | bdfe95a65bb300bd240e6c897ec43ce68cd0f30a /Makefile | |
| parent | 2291e18e4891066bbcbcd1a4e468a59a40e9cb5c (diff) | |
| parent | 151c5841881591552be685b7fd50b488f128ba5b (diff) | |
| download | ffmpeg-streaming-d127d26997ff046a9f112643eebd1007590b4fa2.zip ffmpeg-streaming-d127d26997ff046a9f112643eebd1007590b4fa2.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: fix "make install" with documentation disabled
build: simplify some conditional targets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 22 |
1 files changed, 12 insertions, 10 deletions
@@ -43,15 +43,9 @@ FF_LDFLAGS := $(FFLDFLAGS) FF_EXTRALIBS := $(FFEXTRALIBS) FF_DEP_LIBS := $(DEP_LIBS) -ALL_TARGETS-$(CONFIG_DOC) += documentation +all-$(CONFIG_DOC): documentation -ifdef 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) +all: $(FF_DEP_LIBS) $(PROGS) $(PROGS): %$(EXESUF): %_g$(EXESUF) $(CP) $< $@ @@ -133,11 +127,19 @@ doc/%.1: TAG = MAN doc/%.1: doc/%.pod $(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-progs: $(PROGS) $(INSTALL_PROGS_TARGETS-yes) +install-progs-yes: +install-progs-$(CONFIG_DOC): install-man +install-progs-$(CONFIG_SHARED): install-libs + +install-progs: install-progs-yes $(PROGS) $(Q)mkdir -p "$(BINDIR)" $(INSTALL) -c -m 755 $(PROGS) "$(BINDIR)" |
