[asterisk-commits] trunk r37276 - in /trunk: Makefile build_tools/prep_moduledeps

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu Jul  6 18:51:15 2006
New Revision: 37276

URL: http://svn.digium.com/view/asterisk?rev=37276&view=rev
Log:
dirty hack of a fix to deal with the fact that chan_vpb changed to chan_vpb.cc

Modified:
    trunk/Makefile
    trunk/build_tools/prep_moduledeps

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=37276&r1=37275&r2=37276&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Jul  6 18:51:15 2006
@@ -900,6 +900,6 @@
 
 makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml sounds/sounds.xml
 	@echo "Generating list of available modules ..."
-	@build_tools/prep_moduledeps > $@
+	@build_tools/prep_moduledeps 2>/dev/null > $@
 
 .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)

Modified: trunk/build_tools/prep_moduledeps
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/prep_moduledeps?rev=37276&r1=37275&r2=37276&view=diff
==============================================================================
--- trunk/build_tools/prep_moduledeps (original)
+++ trunk/build_tools/prep_moduledeps Thu Jul  6 18:51:15 2006
@@ -33,12 +33,13 @@
 	displayname=${4}
 
 	echo -e "\t<category name=\"MENUSELECT_${catsuffix}\" displayname=\"${displayname}\">"
-	for file in ${dir}/${prefix}*.c
+	for file in `ls ${dir}/${prefix}*.c ${dir}/${prefix}*.cc | sort`
 	do
 		fname=`basename ${file} .c`
+		fname=`basename ${fname} .cc`
 		get_description ${file}
 		desc=${TDESC}
-		echo -e "\t\t<member name=\"${fname}\" displayname=\"${desc}\" remove_on_change=\"${dir}/${fname}.o ${dir}/${fname}.so\">"
+		echo -e "\t\t<member name=\"${fname}\" displayname=\"${desc}\" remove_on_change=\"${dir}/${fname}.o ${dir}/${fname}.oo ${dir}/${fname}.so\">"
 		awk -f build_tools/get_moduleinfo ${file}
 		echo -e "\t\t</member>"
 	done