build: move all (un)install* target aliases to toplevel Makefile

Signed-off-by: Mans Rullgard <mans@mansr.com>
Tjoppen · Jun 6, 2011 · d7a72d2 · d7a72d2
1 parent 0e28e9c
commit d7a72d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -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
@@ -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,