Clean up Makefile "warning" clutter when makeopts doesn't exist.
Review: https://reviewboard.asterisk.org/r/2304 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@384989 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
a5df2542c3
commit
5bf283d406
25
Makefile
25
Makefile
|
@ -81,6 +81,8 @@ export STATIC_BUILD # Additional cflags, set to -static
|
||||||
# should go directly to ASTLDFLAGS
|
# should go directly to ASTLDFLAGS
|
||||||
|
|
||||||
#--- paths to various commands
|
#--- paths to various commands
|
||||||
|
# The makeopts include below tries to set these if they're found during
|
||||||
|
# configure.
|
||||||
export CC
|
export CC
|
||||||
export CXX
|
export CXX
|
||||||
export AR
|
export AR
|
||||||
|
@ -221,10 +223,13 @@ ifeq ($(OSARCH),SunOS)
|
||||||
_ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2 -D__EXTENSIONS__
|
_ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2 -D__EXTENSIONS__
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) GIT=$(GIT) build_tools/make_version .)
|
ifneq ($(GREP),)
|
||||||
|
ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) GIT=$(GIT) build_tools/make_version .)
|
||||||
ifneq ($(wildcard .version),)
|
endif
|
||||||
ASTERISKVERSIONNUM:=$(shell $(AWK) -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
|
ifneq ($(AWK),)
|
||||||
|
ifneq ($(wildcard .version),)
|
||||||
|
ASTERISKVERSIONNUM:=$(shell $(AWK) -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(wildcard .svn),)
|
ifneq ($(wildcard .svn),)
|
||||||
|
@ -450,7 +455,11 @@ datafiles: _all doc/core-en_US.xml
|
||||||
done
|
done
|
||||||
$(MAKE) -C sounds install
|
$(MAKE) -C sounds install
|
||||||
|
|
||||||
doc/core-en_US.xml: makeopts cleantest $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
|
ifneq ($(GREP),)
|
||||||
|
XML_core_en_US = $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
|
||||||
|
endif
|
||||||
|
|
||||||
|
doc/core-en_US.xml: makeopts cleantest $(XML_core_en_US)
|
||||||
@printf "Building Documentation For: "
|
@printf "Building Documentation For: "
|
||||||
@echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@
|
@echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@
|
||||||
@echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@
|
@echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@
|
||||||
|
@ -464,7 +473,11 @@ doc/core-en_US.xml: makeopts cleantest $(foreach dir,$(MOD_SUBDIRS),$(shell $(GR
|
||||||
@echo
|
@echo
|
||||||
@echo "</docs>" >> $@
|
@echo "</docs>" >> $@
|
||||||
|
|
||||||
doc/full-en_US.xml: makeopts cleantest $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
|
ifneq ($(GREP),)
|
||||||
|
XMX_full_en_US = $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
|
||||||
|
endif
|
||||||
|
|
||||||
|
doc/full-en_US.xml: makeopts cleantest $(XML_full_en_US)
|
||||||
ifeq ($(PYTHON),:)
|
ifeq ($(PYTHON),:)
|
||||||
@echo "--------------------------------------------------------------------------"
|
@echo "--------------------------------------------------------------------------"
|
||||||
@echo "--- Please install python to build full documentation ---"
|
@echo "--- Please install python to build full documentation ---"
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
GREP=${GREP:-grep}
|
||||||
|
MD5=${MD5:-md5sum}
|
||||||
|
|
||||||
cat << END
|
cat << END
|
||||||
/*
|
/*
|
||||||
* buildopts.h
|
* buildopts.h
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
AWK=${AWK:-awk}
|
||||||
|
|
||||||
test -f ${1}.exports.in && ${AWK} "{sub(\"LINKER_SYMBOL_PREFIX\", \"${2}\"); print;}" ${1}.exports.in > ${1}.exports && exit 0
|
test -f ${1}.exports.in && ${AWK} "{sub(\"LINKER_SYMBOL_PREFIX\", \"${2}\"); print;}" ${1}.exports.in > ${1}.exports && exit 0
|
||||||
test -f ${1}.exports.in || rm -f ${1}.exports && cp ${3}/default.exports ${1}.exports && exit 0
|
test -f ${1}.exports.in || rm -f ${1}.exports && cp ${3}/default.exports ${1}.exports && exit 0
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
AWK=${AWK:-awk}
|
||||||
|
GIT=${GIT:-git}
|
||||||
|
GREP=${GREP:-grep}
|
||||||
|
|
||||||
if [ -f ${1}/.version ]; then
|
if [ -f ${1}/.version ]; then
|
||||||
cat ${1}/.version
|
cat ${1}/.version
|
||||||
elif [ -d ${1}/.svn ]; then
|
elif [ -d ${1}/.svn ]; then
|
||||||
|
@ -92,7 +96,7 @@ elif [ -d ${1}/.git ]; then
|
||||||
# If the first log commit messages indicates that this is checked into
|
# If the first log commit messages indicates that this is checked into
|
||||||
# subversion, we'll just use the SVN- form of the revision.
|
# subversion, we'll just use the SVN- form of the revision.
|
||||||
MODIFIED=""
|
MODIFIED=""
|
||||||
SVN_REV=`${GIT} log --pretty=full -1 | grep -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"`
|
SVN_REV=`${GIT} log --pretty=full -1 | ${GREP} -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"`
|
||||||
if [ -z "$SVN_REV" ]; then
|
if [ -z "$SVN_REV" ]; then
|
||||||
VERSION=GIT-`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
|
VERSION=GIT-`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
|
@ -105,7 +109,7 @@ elif [ -d ${1}/.git ]; then
|
||||||
fi
|
fi
|
||||||
echo ${VERSION}
|
echo ${VERSION}
|
||||||
else
|
else
|
||||||
PARTS=`LANG=C ${GIT} log --pretty=full | grep -F "git-svn-id:" | head -1 | awk '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | sed -e 's/@.*$//g'`
|
PARTS=`LANG=C ${GIT} log --pretty=full | ${GREP} -F "git-svn-id:" | head -1 | ${AWK} '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | sed -e 's/@.*$//g'`
|
||||||
BRANCH=0
|
BRANCH=0
|
||||||
TEAM=0
|
TEAM=0
|
||||||
TAG=0
|
TAG=0
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
PPATH="$1"
|
PPATH="$1"
|
||||||
|
GREP=${GREP:-grep}
|
||||||
## Make sure we were called from Makefile
|
## Make sure we were called from Makefile
|
||||||
|
|
||||||
if [ "x$ASTERISKVERSIONNUM" = "x" ]; then
|
if [ "x$ASTERISKVERSIONNUM" = "x" ]; then
|
||||||
|
|
Loading…
Reference in New Issue