RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
wm4 2012-11-14 13:06:00 +01:00
parent e5f7976000
commit b60483a144
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@ -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

5
configure vendored
View File

@ -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