mirror of https://github.com/mpv-player/mpv
Simplify strip parameter for install handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22364 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
8fd6fab6a4
commit
6f1e593089
5
Makefile
5
Makefile
|
@ -14,11 +14,6 @@ CFLAGS += $(CFLAGS-yes)
|
||||||
|
|
||||||
#CFLAGS += -Wall
|
#CFLAGS += -Wall
|
||||||
|
|
||||||
# Do not strip the binaries at installation
|
|
||||||
ifeq ($(STRIPBINARIES),yes)
|
|
||||||
INSTALLSTRIP = -s
|
|
||||||
endif
|
|
||||||
|
|
||||||
SRCS_COMMON = asxparser.c \
|
SRCS_COMMON = asxparser.c \
|
||||||
codec-cfg.c \
|
codec-cfg.c \
|
||||||
cpudetect.c \
|
cpudetect.c \
|
||||||
|
|
|
@ -2193,13 +2193,13 @@ echores $_named_asm_args
|
||||||
|
|
||||||
|
|
||||||
# Checking for CFLAGS
|
# Checking for CFLAGS
|
||||||
_stripbinaries=yes
|
_install_strip="-s"
|
||||||
if test "$_profile" != "" || test "$_debug" != "" ; then
|
if test "$_profile" != "" || test "$_debug" != "" ; then
|
||||||
CFLAGS="-W -Wall -O2 $_march $_mcpu $_debug $_profile"
|
CFLAGS="-W -Wall -O2 $_march $_mcpu $_debug $_profile"
|
||||||
if test "$_cc_major" -ge "3" ; then
|
if test "$_cc_major" -ge "3" ; then
|
||||||
CFLAGS=`echo "$CFLAGS" | sed -e 's/\(-Wall\)/\1 -Wno-unused-parameter/'`
|
CFLAGS=`echo "$CFLAGS" | sed -e 's/\(-Wall\)/\1 -Wno-unused-parameter/'`
|
||||||
fi
|
fi
|
||||||
_stripbinaries=no
|
_install_strip=
|
||||||
elif test -z "$CFLAGS" ; then
|
elif test -z "$CFLAGS" ; then
|
||||||
if test "$cc_vendor" = "intel" ; then
|
if test "$cc_vendor" = "intel" ; then
|
||||||
CFLAGS="-O2 $_march $_mcpu $_pipe -fomit-frame-pointer"
|
CFLAGS="-O2 $_march $_mcpu $_pipe -fomit-frame-pointer"
|
||||||
|
@ -7448,7 +7448,7 @@ LDCONFIG = $_ldconfig
|
||||||
INSTALL = $_install
|
INSTALL = $_install
|
||||||
EXTRA_INC = $_inc_extra
|
EXTRA_INC = $_inc_extra
|
||||||
OPTFLAGS = $CFLAGS \$(EXTRA_INC)
|
OPTFLAGS = $CFLAGS \$(EXTRA_INC)
|
||||||
STRIPBINARIES = $_stripbinaries
|
INSTALLSTRIP = $_install_strip
|
||||||
CHARSET = $_charset
|
CHARSET = $_charset
|
||||||
HELP_FILE = $_mp_help
|
HELP_FILE = $_mp_help
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue