[asterisk-commits] branch rizzo/base r9717 - in /team/rizzo/base:
./ agi/ apps/ cdr/ channels/ c...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sun Feb 12 11:34:46 MST 2006
Author: rizzo
Date: Sun Feb 12 12:34:35 2006
New Revision: 9717
URL: http://svn.digium.com/view/asterisk?rev=9717&view=rev
Log:
merge head changes, plus fix codec_ilbc compile
Modified:
team/rizzo/base/ (props changed)
team/rizzo/base/Makefile
team/rizzo/base/agi/Makefile
team/rizzo/base/apps/Makefile
team/rizzo/base/apps/app_curl.c
team/rizzo/base/cdr/Makefile
team/rizzo/base/channels/Makefile
team/rizzo/base/codecs/Makefile
team/rizzo/base/configs/Makefile
team/rizzo/base/cygwin/Makefile
team/rizzo/base/db1-ast/Makefile
team/rizzo/base/formats/Makefile
team/rizzo/base/funcs/Makefile
team/rizzo/base/include/asterisk/lock.h
team/rizzo/base/pbx/Makefile
team/rizzo/base/res/Makefile
team/rizzo/base/stdtime/Makefile
team/rizzo/base/utils/Makefile
Propchange: team/rizzo/base/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Feb 12 12:34:35 2006
@@ -1,1 +1,1 @@
-/trunk:1-9687
+/trunk:1-9716
Modified: team/rizzo/base/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/Makefile?rev=9717&r1=9716&r2=9717&view=diff
==============================================================================
--- team/rizzo/base/Makefile (original)
+++ team/rizzo/base/Makefile Sun Feb 12 12:34:35 2006
@@ -487,12 +487,7 @@
$(MAKE) -C editline libedit.a
db1-ast/libdb1.a: FORCE
- @if [ -d db1-ast ]; then \
- $(MAKE) -C db1-ast libdb1.a ; \
- else \
- echo "You need to do a cvs update -d not just cvs update"; \
- exit 1; \
- fi
+ $(MAKE) -C db1-ast libdb1.a
ifneq ($(wildcard .depend),)
include .depend
@@ -557,12 +552,7 @@
rm -f $@.tmp
stdtime/libtime.a: FORCE
- @if [ -d stdtime ]; then \
- $(MAKE) -C stdtime libtime.a ; \
- else \
- echo "You need to do a cvs update -d not just cvs update"; \
- exit 1; \
- fi
+ $(MAKE) -C stdtime libtime.a
cygwin_a:
$(MAKE) -C cygwin all
@@ -582,13 +572,17 @@
subdirs:
for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
-clean:
+clean-depend:
+ for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done
+ rm -f .depend .tags-depend
+
+clean: clean-depend
for x in $(SUBDIRS); do $(MAKE) -C $$x clean || exit 1 ; done
- rm -f *.o *.so asterisk .depend
+ rm -f *.o *.so asterisk
rm -f defaults.h
rm -f include/asterisk/build.h
rm -f include/asterisk/version.h
- rm -f .tags-depend .tags-sources tags TAGS
+ rm -f .tags-sources tags TAGS
@if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
@if [ -d mpg123-0.59r ]; then $(MAKE) -C mpg123-0.59r clean; fi
$(MAKE) -C db1-ast clean
@@ -658,6 +652,7 @@
grep ^C update.out | cut -b4- ; \
fi ; \
rm -f update.out; \
+ $(MAKE) clean-depend; \
elif [ -d CVS ]; then \
echo "Updating from CVS..." ; \
cvs -q -z3 update -Pd | tee update.out; \
@@ -667,6 +662,7 @@
grep ^C update.out | cut -d' ' -f2- ; \
fi ; \
rm -f update.out; \
+ $(MAKE) clean-depend; \
else \
echo "Not under version control"; \
fi
Modified: team/rizzo/base/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/agi/Makefile?rev=9717&r1=9716&r2=9717&view=diff
==============================================================================
--- team/rizzo/base/agi/Makefile (original)
+++ team/rizzo/base/agi/Makefile Sun Feb 12 12:34:35 2006
@@ -35,8 +35,11 @@
eagi-sphinx-test: eagi-sphinx-test.o
$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o $(LIBS)
-clean:
- rm -f *.so *.o look .depend eagi-test eagi-sphinx-test
+clean-depend:
+ rm -f .depend
+
+clean: clean-depend
+ rm -f *.so *.o look eagi-test eagi-sphinx-test
%.so : %.o
$(CC) -shared -Xlinker -x -o $@ $<
Modified: team/rizzo/base/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/apps/Makefile?rev=9717&r1=9716&r2=9717&view=diff
==============================================================================
--- team/rizzo/base/apps/Makefile (original)
+++ team/rizzo/base/apps/Makefile Sun Feb 12 12:34:35 2006
@@ -19,6 +19,7 @@
MODS:=$(filter-out app_ivrdemo.so,$(MODS))
MODS:=$(filter-out app_skel.so,$(MODS))
MODS:=$(filter-out app_rpt.so,$(MODS))
+MODS:=$(filter-out app_dial.so,$(MODS)) # XXX lr replaced by app_dial2
ifndef WITHOUT_ZAPTEL
ZAPAVAIL:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)
@@ -63,8 +64,11 @@
all: $(MODS)
-clean:
- rm -f *.so *.o look .depend
+clean-depend:
+ rm -f .depend
+
+clean: clean-depend
+ rm -f *.so *.o look
%.so : %.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
Modified: team/rizzo/base/apps/app_curl.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/apps/app_curl.c?rev=9717&r1=9716&r2=9717&view=diff
==============================================================================
--- team/rizzo/base/apps/app_curl.c (original)
+++ team/rizzo/base/apps/app_curl.c Sun Feb 12 12:34:35 2006
@@ -125,7 +125,7 @@
return -1;
}
- LOCAL_USER_ACF_ADD(u);
+ LOCAL_USER_ADD(u);
AST_STANDARD_APP_ARGS(args, info);
Modified: team/rizzo/base/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/cdr/Makefile?rev=9717&r1=9716&r2=9717&view=diff
==============================================================================
--- team/rizzo/base/cdr/Makefile (original)
+++ team/rizzo/base/cdr/Makefile Sun Feb 12 12:34:35 2006
@@ -101,8 +101,11 @@
uninstall:
-clean:
- rm -f *.so *.o .depend
+clean-depend:
+ rm -f .depend
+
+clean: clean-depend
+ rm -f *.so *.o
%.so : %.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
Modified: team/rizzo/base/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/channels/Makefile?rev=9717&r1=9716&r2=9717&view=diff
==============================================================================
--- team/rizzo/base/channels/Makefile (original)
+++ team/rizzo/base/channels/Makefile Sun Feb 12 12:34:35 2006
@@ -151,8 +151,11 @@
all: depend $(MODS)
-clean:
- rm -f *.so *.o .depend
+clean-depend:
+ rm -f .depend
+
+clean: clean-depend
+ rm -f *.so *.o
rm -f busy.h ringtone.h gentone gentone-ulaw
%.so : %.o
Modified: team/rizzo/base/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/codecs/Makefile?rev=9717&r1=9716&r2=9717&view=diff
==============================================================================
--- team/rizzo/base/codecs/Makefile (original)
+++ team/rizzo/base/codecs/Makefile Sun Feb 12 12:34:35 2006
@@ -63,8 +63,11 @@
all: depend $(MODS)
-clean:
- rm -f *.so *.o .depend
+clean-depend:
+ rm -f .depend
+
+clean: clean-depend
+ rm -f *.so *.o
[ ! -d g723.1 ] || $(MAKE) -C g723.1 clean
[ ! -d g723.1b ] || $(MAKE) -C g723.1b clean
$(MAKE) -C gsm clean
@@ -86,7 +89,7 @@
$(LIBILBC):
$(MAKE) -C ilbc all
-$(MODILBC): codec_ilbc.o $(LIBILBC)
+codec_ilbc.so: codec_ilbc.o $(LIBILBC)
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBILBC)
codec_g723_1.so : codec_g723_1.o $(LIBG723)
Modified: team/rizzo/base/configs/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/configs/Makefile?rev=9717&r1=9716&r2=9717&view=diff
==============================================================================
--- team/rizzo/base/configs/Makefile (original)
+++ team/rizzo/base/configs/Makefile Sun Feb 12 12:34:35 2006
@@ -19,6 +19,12 @@
clean:
rm -rf ${TARGETS}
+clean-depend:
+ # not necessary here
+
+depend:
+ # not necessary here
+
install:
# empty target here, samples are installed with "make samples"
Modified: team/rizzo/base/cygwin/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/cygwin/Makefile?rev=9717&r1=9716&r2=9717&view=diff
==============================================================================
--- team/rizzo/base/cygwin/Makefile (original)
+++ team/rizzo/base/cygwin/Makefile Sun Feb 12 12:34:35 2006
@@ -2,5 +2,8 @@
all: $(OBJS)
$(OBJS) : %.o: %.c
$(CC) $< -o asterisk.exe
+
+clean-depend:
+
clean:
rm -f asterisk.exe
Modified: team/rizzo/base/db1-ast/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/db1-ast/Makefile?rev=9717&r1=9716&r2=9717&view=diff
==============================================================================
--- team/rizzo/base/db1-ast/Makefile (original)
+++ team/rizzo/base/db1-ast/Makefile Sun Feb 12 12:34:35 2006
@@ -42,6 +42,8 @@
$(PROG): db_dump185.o $(LIBDBSO)
$(CC) -o $@ db_dump185.o -L. -ldb
+clean-depend:
+
clean:
rm -f $(LIBDB) $(LIBDBSO) $(OBJS) $(SHOBJS)
Modified: team/rizzo/base/formats/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/formats/Makefile?rev=9717&r1=9716&r2=9717&view=diff
==============================================================================
--- team/rizzo/base/formats/Makefile (original)
+++ team/rizzo/base/formats/Makefile Sun Feb 12 12:34:35 2006
@@ -33,8 +33,11 @@
all: depend $(MODS)
-clean:
- rm -f *.so *.o .depend
+clean-depend:
+ rm -f .depend
+
+clean: clean-depend
+ rm -f *.so *.o
%.so : %.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
Modified: team/rizzo/base/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/funcs/Makefile?rev=9717&r1=9716&r2=9717&view=diff
==============================================================================
--- team/rizzo/base/funcs/Makefile (original)
+++ team/rizzo/base/funcs/Makefile Sun Feb 12 12:34:35 2006
@@ -26,8 +26,11 @@
all: $(MODS)
-clean:
- rm -f *.so *.o .depend
+clean-depend:
+ rm -f .depend
+
+clean: clean-depend
+ rm -f *.so *.o
%.so : %.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
Modified: team/rizzo/base/include/asterisk/lock.h
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/include/asterisk/lock.h?rev=9717&r1=9716&r2=9717&view=diff
==============================================================================
--- team/rizzo/base/include/asterisk/lock.h (original)
+++ team/rizzo/base/include/asterisk/lock.h Sun Feb 12 12:34:35 2006
@@ -638,7 +638,7 @@
#define pthread_cond_signal use_ast_cond_signal_instead_of_pthread_cond_signal
#define pthread_cond_broadcast use_ast_cond_broadcast_instead_of_pthread_cond_broadcast
#define pthread_cond_wait use_ast_cond_wait_instead_of_pthread_cond_wait
-#define pthread_cond_timedwait use_ast_cond_wait_instead_of_pthread_cond_timedwait
+#define pthread_cond_timedwait use_ast_cond_timedwait_instead_of_pthread_cond_timedwait
#define AST_MUTEX_DEFINE_STATIC(mutex) __AST_MUTEX_DEFINE(static,mutex)
#define AST_MUTEX_DEFINE_EXPORTED(mutex) __AST_MUTEX_DEFINE(/**/,mutex)
Modified: team/rizzo/base/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/pbx/Makefile?rev=9717&r1=9716&r2=9717&view=diff
==============================================================================
--- team/rizzo/base/pbx/Makefile (original)
+++ team/rizzo/base/pbx/Makefile Sun Feb 12 12:34:35 2006
@@ -40,8 +40,11 @@
all: depend $(MODS)
-clean:
- rm -f *.so *.o .depend
+clean-depend:
+ rm -f .depend
+
+clean: clean-depend
+ rm -f *.so *.o
pbx_gtkconsole.o: pbx_gtkconsole.c
$(CC) $(CFLAGS) $(GTK_FLAGS) -c -o $@ $<
Modified: team/rizzo/base/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/res/Makefile?rev=9717&r1=9716&r2=9717&view=diff
==============================================================================
--- team/rizzo/base/res/Makefile (original)
+++ team/rizzo/base/res/Makefile Sun Feb 12 12:34:35 2006
@@ -86,8 +86,11 @@
res_crypto.so: res_crypto.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS)
-clean:
- rm -f *.so *.o .depend
+clean-depend:
+ rm -f .depend
+
+clean: clean-depend
+ rm -f *.so *.o
res_odbc.so: res_odbc.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc
Modified: team/rizzo/base/stdtime/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/stdtime/Makefile?rev=9717&r1=9716&r2=9717&view=diff
==============================================================================
--- team/rizzo/base/stdtime/Makefile (original)
+++ team/rizzo/base/stdtime/Makefile Sun Feb 12 12:34:35 2006
@@ -10,8 +10,11 @@
uninstall:
-clean:
- rm -f libtime.a *.o test .depend
+clean-depend:
+ rm -f .depend
+
+clean: clean-depend
+ rm -f libtime.a *.o test
depend: .depend
Modified: team/rizzo/base/utils/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/utils/Makefile?rev=9717&r1=9716&r2=9717&view=diff
==============================================================================
--- team/rizzo/base/utils/Makefile (original)
+++ team/rizzo/base/utils/Makefile Sun Feb 12 12:34:35 2006
@@ -43,8 +43,11 @@
uninstall:
for x in $(TARGET); do rm -f $$x $(DESTDIR)$(ASTSBINDIR)/$$x; done
-clean:
- rm -f *.o astman smsq stereorize streamplayer check_expr .depend
+clean-depend:
+ rm -f .depend
+
+clean: clean-depend
+ rm -f *.o astman smsq stereorize streamplayer check_expr
rm -f ast_expr2.o ast_expr2f.o
astman: astman.o ../md5.o
More information about the asterisk-commits
mailing list