diff options
| author | wm4 <wm4@nowhere> | 2012-11-14 13:06:00 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-11-14 13:06:00 +0100 |
| commit | b60483a144e50177a99a1b34cf4e84a6787b6166 (patch) | |
| tree | 2268682f9473f5b9046ffcaa54f89ee81f3d07c0 | |
| parent | e5f7976000af0fb8da5fd0c3a01cfd44e6e64516 (diff) | |
| download | mpv-b60483a144e50177a99a1b34cf4e84a6787b6166.tar.bz2 mpv-b60483a144e50177a99a1b34cf4e84a6787b6166.tar.xz | |
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.
| -rw-r--r-- | Makefile | 21 | ||||
| -rwxr-xr-x | configure | 5 |
2 files changed, 13 insertions, 13 deletions
@@ -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 @@ -1126,10 +1126,6 @@ echocheck "assembler support of -pipe option" cflag_check -pipe -I. && _pipe="-pipe" && echores "yes" || echores "no" # Checking for CFLAGS -_install_strip="-s" -if test "$_profile" != "" || test "$_debug" != "" ; then - _install_strip= -fi if test -z "$CFLAGS" ; then if test "$cc_vendor" = "intel" ; then CFLAGS="$_opt $_debug $_profile $_march $_mcpu $_pipe -fomit-frame-pointer" @@ -3240,7 +3236,6 @@ LOCALEDIR = \$(DESTDIR)$_localedir CC = $_cc CXX = $_cc INSTALL = $_install -INSTALLSTRIP = $_install_strip WINDRES = $_windres CFLAGS = $WARNFLAGS $ERRORFLAGS $WARN_CFLAGS $CFLAGS $extra_cflags |