small cleanup
authorKevin P. Fleming <kpfleming@digium.com>
Fri, 7 Jul 2006 02:33:24 +0000 (02:33 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Fri, 7 Jul 2006 02:33:24 +0000 (02:33 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37280 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile
build_tools/prep_moduledeps

index 6b1522d..300a1fb 100644 (file)
--- 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)
index 3111f57..76388d5 100755 (executable)
@@ -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}