From 0b91c08045f1ae6ee38515d47d9f0394d9d55ecb Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 6 Jul 2006 23:51:15 +0000
Subject: [PATCH] dirty hack of a fix to deal with the fact that chan_vpb
changed to chan_vpb.cc
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37276 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
Makefile | 2 +-
build_tools/prep_moduledeps | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index cf65e0494a..0305d249b6 100644
--- a/Makefile
+++ b/Makefile
@@ -900,6 +900,6 @@ mxml/libmxml.a:
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)
diff --git a/build_tools/prep_moduledeps b/build_tools/prep_moduledeps
index 8454ef9333..3111f57421 100755
--- a/build_tools/prep_moduledeps
+++ b/build_tools/prep_moduledeps
@@ -33,12 +33,13 @@ process_dir() {
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
--
GitLab