From b60483a144e50177a99a1b34cf4e84a6787b6166 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 14 Nov 2012 13:06:00 +0100
Subject: Makefile: don't strip by default, add install-strip targets

Now "make install" will never strip the binary. "make install-strip"
always will.

The behavior of --enable-debug is unchanged, other than having no
influence anymore on the install targets.
---
 Makefile | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6e89491224..ec2389c26d 100644
--- a/Makefile
+++ b/Makefile
@@ -284,12 +284,13 @@ DEP_FILES = $(patsubst %.S,%.d,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SOURCES
 
 ALL_TARGETS     += mpv$(EXESUF)
 
-INSTALL_NO_MAN_TARGETS += install-mpv
-INSTALL_TARGETS = $(INSTALL_NO_MAN_TARGETS)
+INSTALL_BIN     += install-mpv
+INSTALL_BIN_STRIP += install-mpv-strip
+INSTALL_MAN      =
 
 ifeq ($(BUILD_MAN),yes)
-    INSTALL_TARGETS += install-mpv-man
-    ALL_TARGETS     += DOCS/man/en/mpv.1
+    INSTALL_MAN += install-mpv-man
+    ALL_TARGETS += DOCS/man/en/mpv.1
 endif
 
 DIRS =  . \
@@ -409,15 +410,19 @@ DOCS/man/en/mpv.1: DOCS/man/en/af.rst \
 
 ###### installation / clean / generic rules #######
 
-install: $(INSTALL_TARGETS)
-
-install-no-man: $(INSTALL_NO_MAN_TARGETS)
+install:               $(INSTALL_BIN)       $(INSTALL_MAN)
+install-no-man:        $(INSTALL_BIN)
+install-strip:         $(INSTALL_BIN_STRIP) $(INSTALL_MAN)
+install-strip-no-man:  $(INSTALL_BIN_STRIP)
 
 install-dirs:
 	if test ! -d $(BINDIR) ; then $(INSTALL) -d $(BINDIR) ; fi
 
 install-%: %$(EXESUF) install-dirs
-	$(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR)
+	$(INSTALL) -m 755 $< $(BINDIR)
+
+install-%-strip: %$(EXESUF) install-dirs
+	$(INSTALL) -m 755 -s $< $(BINDIR)
 
 install-mpv-man:  install-mpv-man-en
 
-- 
cgit v1.2.3