[asterisk-commits] branch group/autoconf_and_menuselect r11039 - in
/team/group/autoconf_and_men...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Feb 24 14:48:00 MST 2006
Author: russell
Date: Fri Feb 24 15:47:57 2006
New Revision: 11039
URL: http://svn.digium.com/view/asterisk?rev=11039&view=rev
Log:
simplifications and typo fixes
Modified:
team/group/autoconf_and_menuselect/apps/Makefile
team/group/autoconf_and_menuselect/build_tools/menuselect.h
team/group/autoconf_and_menuselect/cdr/Makefile
team/group/autoconf_and_menuselect/channels/Makefile
team/group/autoconf_and_menuselect/formats/Makefile
team/group/autoconf_and_menuselect/pbx/Makefile
team/group/autoconf_and_menuselect/res/Makefile
team/group/autoconf_and_menuselect/utils/Makefile
team/group/autoconf_and_menuselect/utils/makeopts.xml
Modified: team/group/autoconf_and_menuselect/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/apps/Makefile?rev=11039&r1=11038&r2=11039&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/apps/Makefile (original)
+++ team/group/autoconf_and_menuselect/apps/Makefile Fri Feb 24 15:47:57 2006
@@ -11,9 +11,7 @@
# the GNU General Public License
#
-MODS:=$(patsubst %.c,%.so,$(wildcard app_*.c))
-
-MODS:=$(filter-out $(MENUSELECT_APPS),$(MODS))
+MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%.so,$(wildcard app_*.c)))
#
# Experimental things
Modified: team/group/autoconf_and_menuselect/build_tools/menuselect.h
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/build_tools/menuselect.h?rev=11039&r1=11038&r2=11039&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/build_tools/menuselect.h (original)
+++ team/group/autoconf_and_menuselect/build_tools/menuselect.h Fri Feb 24 15:47:57 2006
@@ -41,7 +41,7 @@
"quit => q",
"save and quit => x",
"",
- "XXX means dependencies havenot been met",
+ "XXX means dependencies have not been met",
};
const char * const makeopts_files[] = {
Modified: team/group/autoconf_and_menuselect/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/cdr/Makefile?rev=11039&r1=11038&r2=11039&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/cdr/Makefile (original)
+++ team/group/autoconf_and_menuselect/cdr/Makefile Fri Feb 24 15:47:57 2006
@@ -11,9 +11,7 @@
# the GNU General Public License
#
-MODS:=$(patsubst %.c,%.so,$(wildcard cdr_*.c))
-
-MODS:=$(filter-out $(MENUSELECT_CDR),$(MODS))
+MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%.so,$(wildcard cdr_*.c)))
ifneq ($(UNIXODBC),1)
MODS:=$(filter-out cdr_odbc.so,$(MODS))
Modified: team/group/autoconf_and_menuselect/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/channels/Makefile?rev=11039&r1=11038&r2=11039&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/channels/Makefile (original)
+++ team/group/autoconf_and_menuselect/channels/Makefile Fri Feb 24 15:47:57 2006
@@ -14,9 +14,7 @@
# the GNU General Public License
#
-MODS:=$(patsubst %.c,%.so,$(wildcard chan_*.c))
-
-MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(MODS))
+MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%.so,$(wildcard chan_*.c)))
ifeq (${OSARCH},OpenBSD)
PTLIB=-lpt_OpenBSD_x86_r
Modified: team/group/autoconf_and_menuselect/formats/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/formats/Makefile?rev=11039&r1=11038&r2=11039&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/formats/Makefile (original)
+++ team/group/autoconf_and_menuselect/formats/Makefile Fri Feb 24 15:47:57 2006
@@ -11,9 +11,7 @@
# the GNU General Public License
#
-MODS:=$(patsubst %.c,%.so,$(wildcard format_*.c))
-
-MODS:=$(filter-out $(MENUSELECT_FORMATS),$(MODS))
+MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%.so,$(wildcard format_*.c)))
#
# OGG/Vorbis format
Modified: team/group/autoconf_and_menuselect/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/pbx/Makefile?rev=11039&r1=11038&r2=11039&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/pbx/Makefile (original)
+++ team/group/autoconf_and_menuselect/pbx/Makefile Fri Feb 24 15:47:57 2006
@@ -11,9 +11,7 @@
# the GNU General Public License
#
-MODS:=$(patsubst %.c,%.so,$(wildcard pbx_*.c))
-
-MODS:=$(filter-out $(MENUSELECT_PBX),$(MODS))
+MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%.so,$(wildcard pbx_*.c)))
ifneq (${GTK},1)
MODS:=$(filter-out pbx_gtkconsole.so,$(MODS))
Modified: team/group/autoconf_and_menuselect/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/res/Makefile?rev=11039&r1=11038&r2=11039&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/res/Makefile (original)
+++ team/group/autoconf_and_menuselect/res/Makefile Fri Feb 24 15:47:57 2006
@@ -11,9 +11,7 @@
# the GNU General Public License
#
-MODS:=$(patsubst %.c,%.so,$(wildcard res_*.c))
-
-MODS:=$(filter-out $(MENUSELECT_RES),$(MODS))
+MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%.so,$(wildcard res_*.c)))
ifneq ($(UNIXODBC),1)
MODS:=$(filter-out res_odbc.so,$(MODS))
Modified: team/group/autoconf_and_menuselect/utils/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/utils/Makefile?rev=11039&r1=11038&r2=11039&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/utils/Makefile (original)
+++ team/group/autoconf_and_menuselect/utils/Makefile Fri Feb 24 15:47:57 2006
@@ -16,9 +16,9 @@
#
CFLAGS+=-DNO_AST_MM
-UTILS:=astman smsq stereorize streamplayer
+TARGET:=astman smsq stereorize streamplayer
-UTILS:=$(filter-out $(MENUSELECT_UTILS),$(UTILS))
+UTILS:=$(filter-out $(MENUSELECT_UTILS),$(TARGET))
ifneq ($(LIBPOPT),1)
UTILS:=$(filter-out smsq,$(UTILS))
@@ -36,20 +36,20 @@
all: depend $(UTILS)
install:
- for x in $(TARGET); do \
+ for x in $(UTILS); do \
if [ "$$x" != "none" ]; then \
$(INSTALL) -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \
fi; \
done
uninstall:
- for x in $(UTILS); do rm -f $$x $(DESTDIR)$(ASTSBINDIR)/$$x; done
+ for x in $(TARGET); do rm -f $$x $(DESTDIR)$(ASTSBINDIR)/$$x; done
clean-depend:
rm -f .depend
clean: clean-depend
- rm -f *.o astman smsq stereorize streamplayer check_expr
+ rm -f *.o $(TARGET) check_expr
rm -f ast_expr2.o ast_expr2f.o
astman: astman.o ../md5.o
Modified: team/group/autoconf_and_menuselect/utils/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/utils/makeopts.xml?rev=11039&r1=11038&r2=11039&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/utils/makeopts.xml (original)
+++ team/group/autoconf_and_menuselect/utils/makeopts.xml Fri Feb 24 15:47:57 2006
@@ -16,7 +16,7 @@
<description>A utility for reading from a raw TCP stream and sending the data to stdout</description>
</member>
<member>
- <name>stereoize</name>
+ <name>stereorize</name>
<description>Merge two mono WAV-files to one stereo WAV-file.</description>
</member>
</category>
More information about the asterisk-commits
mailing list