diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-06-05 21:52:32 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-06-06 16:56:53 +0100 |
| commit | d7a72d250b0deeaed68798f23476be30b28af064 (patch) | |
| tree | 9b025502f19c34a1ebdf63bd624a6f28d559f4bc | |
| parent | 0e28e9ca8f0025c34c3c6df8bf699a9a2db43abe (diff) | |
| download | ffmpeg-d7a72d250b0deeaed68798f23476be30b28af064.tar.gz | |
build: move all (un)install* target aliases to toplevel Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | common.mak | 5 |
2 files changed, 4 insertions, 7 deletions
@@ -128,7 +128,9 @@ doc/%.1: TAG = MAN doc/%.1: doc/%.pod $(M)pod2man --section=1 --center=" " --release=" " $< > $@ -install: $(INSTALL_TARGETS-yes) +install: install-libs install-headers $(INSTALL_TARGETS-yes) + +install-libs: install-libs-yes install-progs: $(PROGS) $(INSTALL_PROGS_TARGETS-yes) $(Q)mkdir -p "$(BINDIR)" @@ -142,7 +144,7 @@ install-man: $(MANPAGES) $(Q)mkdir -p "$(MANDIR)/man1" $(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1" -uninstall: uninstall-progs uninstall-data uninstall-man +uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data uninstall-man uninstall-progs: $(RM) $(addprefix "$(BINDIR)/", $(ALLPROGS)) diff --git a/common.mak b/common.mak index 5195c9911d..d50d8234e9 100644 --- a/common.mak +++ b/common.mak @@ -54,11 +54,6 @@ HOSTCFLAGS += $(IFLAGS) %.h: @: -install: install-libs install-headers -install-libs: install-libs-yes - -uninstall: uninstall-libs uninstall-headers - .PHONY: all depend dep *clean install* uninstall* examples testprogs # Disable suffix rules. Most of the builtin rules are suffix rules, |