[asterisk-commits] kpfleming: branch group/new_loader_completion
r40547 - in /team/group/new_loa...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sat Aug 19 14:13:21 MST 2006
Author: kpfleming
Date: Sat Aug 19 16:13:21 2006
New Revision: 40547
URL: http://svn.digium.com/view/asterisk?rev=40547&view=rev
Log:
ok, at least all the modules build again
Modified:
team/group/new_loader_completion/Makefile
team/group/new_loader_completion/Makefile.rules
team/group/new_loader_completion/build_tools/embed_modules.xml
team/group/new_loader_completion/channels/chan_iax2.c
team/group/new_loader_completion/configure
team/group/new_loader_completion/configure.ac
team/group/new_loader_completion/utils/Makefile
Modified: team/group/new_loader_completion/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/Makefile?rev=40547&r1=40546&r2=40547&view=diff
==============================================================================
--- team/group/new_loader_completion/Makefile (original)
+++ team/group/new_loader_completion/Makefile Sat Aug 19 16:13:21 2006
@@ -115,6 +115,9 @@
GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
+MOD_SUBDIR_CFLAGS=-I../include -I../main
+OTHER_SUBDIR_CFLAGS=-I../include
+
ifeq ($(OSARCH),Linux)
ifeq ($(PROC),x86_64)
# You must have GCC 3.4 to use k8, otherwise use athlon
@@ -155,7 +158,7 @@
ID=/usr/xpg4/bin/id
endif
-ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(OPTIMIZE)
+ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
ifeq ($(AST_DEVMODE),yes)
ASTCFLAGS+=-Werror -Wunused
@@ -208,7 +211,7 @@
MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs
OTHER_SUBDIRS:=utils agi
-SUBDIRS_ALL:=$(MOD_SUBDIRS:%=%-all) $(OTHER_SUBDIRS:%=%-all)
+SUBDIRS_ALL:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
SUBDIRS_CLEAN_DEPEND:=$(SUBDIRS:%=%-clean-depend)
Modified: team/group/new_loader_completion/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/Makefile.rules?rev=40547&r1=40546&r2=40547&view=diff
==============================================================================
--- team/group/new_loader_completion/Makefile.rules (original)
+++ team/group/new_loader_completion/Makefile.rules Sat Aug 19 16:13:21 2006
@@ -14,6 +14,8 @@
# Each command is preceded by a short comment on what to do.
# Prefixing one or the other with @\# or @ or nothing makes the desired
# behaviour. ECHO_PREFIX prefixes the comment, CMD_PREFIX prefixes the command.
+
+include $(ASTTOPDIR)/makeopts
ifeq ($(NOISY_BUILD),)
ECHO_PREFIX=@
Modified: team/group/new_loader_completion/build_tools/embed_modules.xml
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/build_tools/embed_modules.xml?rev=40547&r1=40546&r2=40547&view=diff
==============================================================================
--- team/group/new_loader_completion/build_tools/embed_modules.xml (original)
+++ team/group/new_loader_completion/build_tools/embed_modules.xml Sat Aug 19 16:13:21 2006
@@ -11,8 +11,8 @@
</member>
<member name="funcs" displayname="Dialplan Functions" remove_on_change="funcs/*.o">
</member>
- <member name="pbx" displayname="PBX Functionality" remove_on_change="pbx/*.o">
+ <member name="pbx" displayname="PBX Functionality" remove_on_change="pbx/*.o pbx/ael/*.o">
</member>
- <member name="res" displayname="Resource Modules" remove_on_change="res/*.o">
+ <member name="res" displayname="Resource Modules" remove_on_change="res/*.o res/snmp/*.o">
</member>
</category>
Modified: team/group/new_loader_completion/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/channels/chan_iax2.c?rev=40547&r1=40546&r2=40547&view=diff
==============================================================================
--- team/group/new_loader_completion/channels/chan_iax2.c (original)
+++ team/group/new_loader_completion/channels/chan_iax2.c Sat Aug 19 16:13:21 2006
@@ -98,7 +98,7 @@
#include "iax2.h"
#include "iax2-parser.h"
#include "iax2-provision.h"
-#include "../jitterbuf.h"
+#include "jitterbuf.h"
/* Define SCHED_MULTITHREADED to run the scheduler in a special
multithreaded mode. */
Modified: team/group/new_loader_completion/configure
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/configure?rev=40547&r1=40546&r2=40547&view=diff
==============================================================================
--- team/group/new_loader_completion/configure (original)
+++ team/group/new_loader_completion/configure Sat Aug 19 16:13:21 2006
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 40396 .
+# From configure.ac Revision: 40544 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.60.
#
@@ -565,7 +565,7 @@
PACKAGE_BUGREPORT=
ac_unique_file="asterisk"
-ac_unique_file="core/asterisk.c"
+ac_unique_file="main/asterisk.c"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
Modified: team/group/new_loader_completion/configure.ac
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/configure.ac?rev=40547&r1=40546&r2=40547&view=diff
==============================================================================
--- team/group/new_loader_completion/configure.ac (original)
+++ team/group/new_loader_completion/configure.ac Sat Aug 19 16:13:21 2006
@@ -14,7 +14,7 @@
AC_CANONICAL_TARGET
# check existence of the package
-AC_CONFIG_SRCDIR([core/asterisk.c])
+AC_CONFIG_SRCDIR([main/asterisk.c])
# specify output header file
AC_CONFIG_HEADER(include/asterisk/autoconfig.h)
Modified: team/group/new_loader_completion/utils/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/utils/Makefile?rev=40547&r1=40546&r2=40547&view=diff
==============================================================================
--- team/group/new_loader_completion/utils/Makefile (original)
+++ team/group/new_loader_completion/utils/Makefile Sat Aug 19 16:13:21 2006
@@ -16,7 +16,7 @@
UTILS:=astman smsq stereorize streamplayer aelparse
ifeq (${OSARCH},SunOS)
- LIBS+=../strcompat.o -lsocket -lnsl
+ LIBS+=../main/strcompat.o -lsocket -lnsl
endif
ifeq ($(POPT_LIB),)
@@ -51,23 +51,23 @@
clean: clean-depend
rm -f *.o $(UTILS) check_expr
-$(eval $(call ast_make_final,astman,astman.o ../md5.o))
+$(eval $(call ast_make_final,astman,astman.o ../main/md5.o))
astman: LIBS+=-lnewt -lslang -ldl
$(eval $(call ast_make_final,stereorize,stereorize.o frame.o))
stereorize: LIBS+=-lm
-../ast_expr2.c:
- @echo " [BISON] ../ast_expr2.y -> $@"
- @bison -o $@ -d --name-prefix=ast_yy ../ast_expr2.y
+../main/ast_expr2.c:
+ @echo " [BISON] ../main/ast_expr2.y -> $@"
+ @bison -o $@ -d --name-prefix=ast_yy ../main/ast_expr2.y
-../ast_expr2f.c:
- @echo " [FLEX] ../ast_expr2.fl -> $@"
- @flex -o $@ --full ../ast_expr2.fl
+../main/ast_expr2f.c:
+ @echo " [FLEX] ../main/ast_expr2.fl -> $@"
+ @flex -o $@ --full ../main/ast_expr2.fl
-$(eval $(call ast_make_o_c,ast_expr2.o,../ast_expr2.c))
+$(eval $(call ast_make_o_c,ast_expr2.o,../main/ast_expr2.c))
-$(eval $(call ast_make_o_c,ast_expr2f.o,../ast_expr2f.c))
+$(eval $(call ast_make_o_c,ast_expr2f.o,../main/ast_expr2f.c))
ast_expr2f.o: CFLAGS+=-DSTANDALONE
$(eval $(call ast_make_final,check_expr,check_expr.c ast_expr2.o ast_expr2f.o))
@@ -85,9 +85,9 @@
$(eval $(call ast_make_o_c,ael_main.o,ael_main.c ../include/asterisk/ael_structs.h))
-testexpr2s: ../ast_expr2f.c ../ast_expr2.c ../ast_expr2.h
- $(CC) -g -c -I../include -DSTANDALONE ../ast_expr2f.c -o ast_expr2f.o
- $(CC) -g -c -I../include -DSTANDALONE ../ast_expr2.c -o ast_expr2.o
+testexpr2s: ../main/ast_expr2f.c ../main/ast_expr2.c ../main/ast_expr2.h
+ $(CC) -g -c -I../include -DSTANDALONE ../main/ast_expr2f.c -o ast_expr2f.o
+ $(CC) -g -c -I../include -DSTANDALONE ../main/ast_expr2.c -o ast_expr2.o
$(CC) -g -o testexpr2s ast_expr2f.o ast_expr2.o
rm ast_expr2.o ast_expr2f.o
./testexpr2s expr2.testinput
More information about the asterisk-commits
mailing list