From d7a72d250b0deeaed68798f23476be30b28af064 Mon Sep 17 00:00:00 2001
From: Mans Rullgard <mans@mansr.com>
Date: Sun, 5 Jun 2011 21:52:32 +0100
Subject: [PATCH] build: move all (un)install* target aliases to toplevel
 Makefile

Signed-off-by: Mans Rullgard <mans@mansr.com>
---
 Makefile   | 6 ++++--
 common.mak | 5 -----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index f626332482d..0fb217a3aba 100644
--- 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
index 5195c9911d7..d50d8234e9f 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,
-- 
GitLab