Skip to content

Commit

Permalink
Clean up Makefile "warning" clutter when makeopts doesn't exist.
Browse files Browse the repository at this point in the history
  • Loading branch information
wdoekes committed Apr 8, 2013
1 parent a5df254 commit 5bf283d
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 9 deletions.
25 changes: 19 additions & 6 deletions Makefile
Expand Up @@ -81,6 +81,8 @@ export STATIC_BUILD # Additional cflags, set to -static
# should go directly to ASTLDFLAGS

#--- paths to various commands
# The makeopts include below tries to set these if they're found during
# configure.
export CC
export CXX
export AR
Expand Down Expand Up @@ -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__
endif

ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) GIT=$(GIT) build_tools/make_version .)

ifneq ($(wildcard .version),)
ASTERISKVERSIONNUM:=$(shell $(AWK) -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
ifneq ($(GREP),)
ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) GIT=$(GIT) build_tools/make_version .)
endif
ifneq ($(AWK),)
ifneq ($(wildcard .version),)
ASTERISKVERSIONNUM:=$(shell $(AWK) -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
endif
endif

ifneq ($(wildcard .svn),)
Expand Down Expand Up @@ -450,7 +455,11 @@ datafiles: _all doc/core-en_US.xml
done
$(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: "
@echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@
@echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@
Expand All @@ -464,7 +473,11 @@ doc/core-en_US.xml: makeopts cleantest $(foreach dir,$(MOD_SUBDIRS),$(shell $(GR
@echo
@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),:)
@echo "--------------------------------------------------------------------------"
@echo "--- Please install python to build full documentation ---"
Expand Down
3 changes: 3 additions & 0 deletions build_tools/make_buildopts_h
@@ -1,5 +1,8 @@
#!/bin/sh

GREP=${GREP:-grep}
MD5=${MD5:-md5sum}

cat << END
/*
* buildopts.h
Expand Down
3 changes: 2 additions & 1 deletion build_tools/make_linker_version_script
@@ -1,5 +1,6 @@
#!/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 || rm -f ${1}.exports && cp ${3}/default.exports ${1}.exports && exit 0

8 changes: 6 additions & 2 deletions build_tools/make_version
@@ -1,5 +1,9 @@
#!/bin/sh

AWK=${AWK:-awk}
GIT=${GIT:-git}
GREP=${GREP:-grep}

if [ -f ${1}/.version ]; then
cat ${1}/.version
elif [ -d ${1}/.svn ]; then
Expand Down Expand Up @@ -92,7 +96,7 @@ elif [ -d ${1}/.git ]; then
# If the first log commit messages indicates that this is checked into
# subversion, we'll just use the SVN- form of the revision.
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
VERSION=GIT-`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
if [ $? -ne 0 ]; then
Expand All @@ -105,7 +109,7 @@ elif [ -d ${1}/.git ]; then
fi
echo ${VERSION}
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
TEAM=0
TAG=0
Expand Down
1 change: 1 addition & 0 deletions build_tools/mkpkgconfig
@@ -1,5 +1,6 @@
#!/bin/sh
PPATH="$1"
GREP=${GREP:-grep}
## Make sure we were called from Makefile

if [ "x$ASTERISKVERSIONNUM" = "x" ]; then
Expand Down

0 comments on commit 5bf283d

Please sign in to comment.