summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-07-07 02:33:24 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-07-07 02:33:24 +0000
commitb601ff0a3e0de7b16a893e94ac4875ffdd30aa1e (patch)
treea28c60e09941b4a8ec6281936090eb8420a0957e
parent13ba816edd4423421eef061f69fb83e574a318e9 (diff)
small cleanup
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37280 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--Makefile2
-rwxr-xr-xbuild_tools/prep_moduledeps5
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 6b1522d61..300a1fb13 100644
--- a/Makefile
+++ b/Makefile
@@ -900,6 +900,6 @@ mxml/libmxml.a:
makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml
@echo "Generating list of available modules ..."
- @build_tools/prep_moduledeps 2>/dev/null > $@
+ @build_tools/prep_moduledeps > $@
.PHONY: menuselect sounds clean clean-depend dist-clean distclean all _all depend cleantest uninstall _uninstall uninstall-all dont-optimize valgrind $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_CLEAN_DEPEND) $(SUBDIRS_DEPEND) $(SUBDIRS_UNINSTALL) $(SUBDIRS)
diff --git a/build_tools/prep_moduledeps b/build_tools/prep_moduledeps
index 3111f5742..76388d50e 100755
--- a/build_tools/prep_moduledeps
+++ b/build_tools/prep_moduledeps
@@ -33,8 +33,11 @@ process_dir() {
displayname=${4}
echo -e "\t<category name=\"MENUSELECT_${catsuffix}\" displayname=\"${displayname}\">"
- for file in `ls ${dir}/${prefix}*.c ${dir}/${prefix}*.cc | sort`
+ for file in `ls ${dir}/${prefix}*.c ${dir}/${prefix}*.cc 2> /dev/null | sort`
do
+ if [ ! -f ${file} ]; then
+ continue
+ fi
fname=`basename ${file} .c`
fname=`basename ${fname} .cc`
get_description ${file}