[svn-commits] kpfleming: branch group/new_loader_completion r40544
- in /team/group/new_loa...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Sat Aug 19 13:47:07 MST 2006
Author: kpfleming
Date: Sat Aug 19 15:47:06 2006
New Revision: 40544
URL: http://svn.digium.com/view/asterisk?rev=40544&view=rev
Log:
begin reorg of build tree and top-level Makefile
Added:
team/group/new_loader_completion/core/
team/group/new_loader_completion/core/abstract_jb.c
- copied unchanged from r40543, team/group/new_loader_completion/abstract_jb.c
team/group/new_loader_completion/core/acl.c
- copied unchanged from r40543, team/group/new_loader_completion/acl.c
team/group/new_loader_completion/core/aescrypt.c
- copied unchanged from r40543, team/group/new_loader_completion/aescrypt.c
team/group/new_loader_completion/core/aeskey.c
- copied unchanged from r40543, team/group/new_loader_completion/aeskey.c
team/group/new_loader_completion/core/aesopt.h
- copied unchanged from r40543, team/group/new_loader_completion/aesopt.h
team/group/new_loader_completion/core/aestab.c
- copied unchanged from r40543, team/group/new_loader_completion/aestab.c
team/group/new_loader_completion/core/alaw.c
- copied unchanged from r40543, team/group/new_loader_completion/alaw.c
team/group/new_loader_completion/core/app.c
- copied unchanged from r40543, team/group/new_loader_completion/app.c
team/group/new_loader_completion/core/ast_expr2.c
- copied unchanged from r40543, team/group/new_loader_completion/ast_expr2.c
team/group/new_loader_completion/core/ast_expr2.fl
- copied unchanged from r40543, team/group/new_loader_completion/ast_expr2.fl
team/group/new_loader_completion/core/ast_expr2.h
- copied unchanged from r40543, team/group/new_loader_completion/ast_expr2.h
team/group/new_loader_completion/core/ast_expr2.y
- copied unchanged from r40543, team/group/new_loader_completion/ast_expr2.y
team/group/new_loader_completion/core/ast_expr2f.c
- copied unchanged from r40543, team/group/new_loader_completion/ast_expr2f.c
team/group/new_loader_completion/core/asterisk.c
- copied unchanged from r40543, team/group/new_loader_completion/asterisk.c
team/group/new_loader_completion/core/astmm.c
- copied unchanged from r40543, team/group/new_loader_completion/astmm.c
team/group/new_loader_completion/core/autoservice.c
- copied unchanged from r40543, team/group/new_loader_completion/autoservice.c
team/group/new_loader_completion/core/buildinfo.c
- copied unchanged from r40543, team/group/new_loader_completion/buildinfo.c
team/group/new_loader_completion/core/callerid.c
- copied unchanged from r40543, team/group/new_loader_completion/callerid.c
team/group/new_loader_completion/core/cdr.c
- copied unchanged from r40543, team/group/new_loader_completion/cdr.c
team/group/new_loader_completion/core/channel.c
- copied unchanged from r40543, team/group/new_loader_completion/channel.c
team/group/new_loader_completion/core/chanvars.c
- copied unchanged from r40543, team/group/new_loader_completion/chanvars.c
team/group/new_loader_completion/core/cli.c
- copied unchanged from r40543, team/group/new_loader_completion/cli.c
team/group/new_loader_completion/core/coef_in.h
- copied unchanged from r40543, team/group/new_loader_completion/coef_in.h
team/group/new_loader_completion/core/coef_out.h
- copied unchanged from r40543, team/group/new_loader_completion/coef_out.h
team/group/new_loader_completion/core/config.c
- copied unchanged from r40543, team/group/new_loader_completion/config.c
team/group/new_loader_completion/core/cryptostub.c
- copied unchanged from r40543, team/group/new_loader_completion/cryptostub.c
team/group/new_loader_completion/core/db.c
- copied unchanged from r40543, team/group/new_loader_completion/db.c
team/group/new_loader_completion/core/db1-ast/
- copied from r40543, team/group/new_loader_completion/db1-ast/
team/group/new_loader_completion/core/devicestate.c
- copied unchanged from r40543, team/group/new_loader_completion/devicestate.c
team/group/new_loader_completion/core/dlfcn.c
- copied unchanged from r40543, team/group/new_loader_completion/dlfcn.c
team/group/new_loader_completion/core/dns.c
- copied unchanged from r40543, team/group/new_loader_completion/dns.c
team/group/new_loader_completion/core/dnsmgr.c
- copied unchanged from r40543, team/group/new_loader_completion/dnsmgr.c
team/group/new_loader_completion/core/dsp.c
- copied unchanged from r40543, team/group/new_loader_completion/dsp.c
team/group/new_loader_completion/core/ecdisa.h
- copied unchanged from r40543, team/group/new_loader_completion/ecdisa.h
team/group/new_loader_completion/core/editline/
- copied from r40543, team/group/new_loader_completion/editline/
team/group/new_loader_completion/core/enum.c
- copied unchanged from r40543, team/group/new_loader_completion/enum.c
team/group/new_loader_completion/core/file.c
- copied unchanged from r40543, team/group/new_loader_completion/file.c
team/group/new_loader_completion/core/fixedjitterbuf.c
- copied unchanged from r40543, team/group/new_loader_completion/fixedjitterbuf.c
team/group/new_loader_completion/core/fixedjitterbuf.h
- copied unchanged from r40543, team/group/new_loader_completion/fixedjitterbuf.h
team/group/new_loader_completion/core/frame.c
- copied unchanged from r40543, team/group/new_loader_completion/frame.c
team/group/new_loader_completion/core/fskmodem.c
- copied unchanged from r40543, team/group/new_loader_completion/fskmodem.c
team/group/new_loader_completion/core/http.c
- copied unchanged from r40543, team/group/new_loader_completion/http.c
team/group/new_loader_completion/core/image.c
- copied unchanged from r40543, team/group/new_loader_completion/image.c
team/group/new_loader_completion/core/indications.c
- copied unchanged from r40543, team/group/new_loader_completion/indications.c
team/group/new_loader_completion/core/io.c
- copied unchanged from r40543, team/group/new_loader_completion/io.c
team/group/new_loader_completion/core/jitterbuf.c
- copied unchanged from r40543, team/group/new_loader_completion/jitterbuf.c
team/group/new_loader_completion/core/jitterbuf.h
- copied unchanged from r40543, team/group/new_loader_completion/jitterbuf.h
team/group/new_loader_completion/core/loader.c
- copied unchanged from r40543, team/group/new_loader_completion/loader.c
team/group/new_loader_completion/core/logger.c
- copied unchanged from r40543, team/group/new_loader_completion/logger.c
team/group/new_loader_completion/core/manager.c
- copied unchanged from r40543, team/group/new_loader_completion/manager.c
team/group/new_loader_completion/core/md5.c
- copied unchanged from r40543, team/group/new_loader_completion/md5.c
team/group/new_loader_completion/core/netsock.c
- copied unchanged from r40543, team/group/new_loader_completion/netsock.c
team/group/new_loader_completion/core/pbx.c
- copied unchanged from r40543, team/group/new_loader_completion/pbx.c
team/group/new_loader_completion/core/plc.c
- copied unchanged from r40543, team/group/new_loader_completion/plc.c
team/group/new_loader_completion/core/poll.c
- copied unchanged from r40543, team/group/new_loader_completion/poll.c
team/group/new_loader_completion/core/privacy.c
- copied unchanged from r40543, team/group/new_loader_completion/privacy.c
team/group/new_loader_completion/core/rtp.c
- copied unchanged from r40543, team/group/new_loader_completion/rtp.c
team/group/new_loader_completion/core/say.c
- copied unchanged from r40543, team/group/new_loader_completion/say.c
team/group/new_loader_completion/core/sched.c
- copied unchanged from r40543, team/group/new_loader_completion/sched.c
team/group/new_loader_completion/core/sha1.c
- copied unchanged from r40543, team/group/new_loader_completion/sha1.c
team/group/new_loader_completion/core/slinfactory.c
- copied unchanged from r40543, team/group/new_loader_completion/slinfactory.c
team/group/new_loader_completion/core/srv.c
- copied unchanged from r40543, team/group/new_loader_completion/srv.c
team/group/new_loader_completion/core/stdtime/
- copied from r40543, team/group/new_loader_completion/stdtime/
team/group/new_loader_completion/core/strcompat.c
- copied unchanged from r40543, team/group/new_loader_completion/strcompat.c
team/group/new_loader_completion/core/tdd.c
- copied unchanged from r40543, team/group/new_loader_completion/tdd.c
team/group/new_loader_completion/core/term.c
- copied unchanged from r40543, team/group/new_loader_completion/term.c
team/group/new_loader_completion/core/translate.c
- copied unchanged from r40543, team/group/new_loader_completion/translate.c
team/group/new_loader_completion/core/udptl.c
- copied unchanged from r40543, team/group/new_loader_completion/udptl.c
team/group/new_loader_completion/core/ulaw.c
- copied unchanged from r40543, team/group/new_loader_completion/ulaw.c
team/group/new_loader_completion/core/utils.c
- copied unchanged from r40543, team/group/new_loader_completion/utils.c
team/group/new_loader_completion/doc/asterisk.8
- copied unchanged from r40543, team/group/new_loader_completion/asterisk.8
team/group/new_loader_completion/doc/asterisk.sgml
- copied unchanged from r40543, team/group/new_loader_completion/asterisk.sgml
team/group/new_loader_completion/utils/muted.c
- copied unchanged from r40543, team/group/new_loader_completion/muted.c
Removed:
team/group/new_loader_completion/abstract_jb.c
team/group/new_loader_completion/acl.c
team/group/new_loader_completion/aescrypt.c
team/group/new_loader_completion/aeskey.c
team/group/new_loader_completion/aesopt.h
team/group/new_loader_completion/aestab.c
team/group/new_loader_completion/alaw.c
team/group/new_loader_completion/app.c
team/group/new_loader_completion/ast_expr2.c
team/group/new_loader_completion/ast_expr2.fl
team/group/new_loader_completion/ast_expr2.h
team/group/new_loader_completion/ast_expr2.y
team/group/new_loader_completion/ast_expr2f.c
team/group/new_loader_completion/asterisk.8
team/group/new_loader_completion/asterisk.c
team/group/new_loader_completion/asterisk.sgml
team/group/new_loader_completion/astmm.c
team/group/new_loader_completion/autoservice.c
team/group/new_loader_completion/buildinfo.c
team/group/new_loader_completion/callerid.c
team/group/new_loader_completion/cdr.c
team/group/new_loader_completion/channel.c
team/group/new_loader_completion/chanvars.c
team/group/new_loader_completion/cli.c
team/group/new_loader_completion/coef_in.h
team/group/new_loader_completion/coef_out.h
team/group/new_loader_completion/config.c
team/group/new_loader_completion/cryptostub.c
team/group/new_loader_completion/db.c
team/group/new_loader_completion/db1-ast/
team/group/new_loader_completion/devicestate.c
team/group/new_loader_completion/dlfcn.c
team/group/new_loader_completion/dns.c
team/group/new_loader_completion/dnsmgr.c
team/group/new_loader_completion/dsp.c
team/group/new_loader_completion/ecdisa.h
team/group/new_loader_completion/editline/
team/group/new_loader_completion/enum.c
team/group/new_loader_completion/file.c
team/group/new_loader_completion/fixedjitterbuf.c
team/group/new_loader_completion/fixedjitterbuf.h
team/group/new_loader_completion/frame.c
team/group/new_loader_completion/fskmodem.c
team/group/new_loader_completion/http.c
team/group/new_loader_completion/image.c
team/group/new_loader_completion/indications.c
team/group/new_loader_completion/io.c
team/group/new_loader_completion/jitterbuf.c
team/group/new_loader_completion/jitterbuf.h
team/group/new_loader_completion/loader.c
team/group/new_loader_completion/logger.c
team/group/new_loader_completion/manager.c
team/group/new_loader_completion/md5.c
team/group/new_loader_completion/muted.c
team/group/new_loader_completion/netsock.c
team/group/new_loader_completion/pbx.c
team/group/new_loader_completion/plc.c
team/group/new_loader_completion/poll.c
team/group/new_loader_completion/privacy.c
team/group/new_loader_completion/rtp.c
team/group/new_loader_completion/say.c
team/group/new_loader_completion/sched.c
team/group/new_loader_completion/sha1.c
team/group/new_loader_completion/slinfactory.c
team/group/new_loader_completion/sounds.txt
team/group/new_loader_completion/srv.c
team/group/new_loader_completion/stdtime/
team/group/new_loader_completion/strcompat.c
team/group/new_loader_completion/tdd.c
team/group/new_loader_completion/term.c
team/group/new_loader_completion/translate.c
team/group/new_loader_completion/udptl.c
team/group/new_loader_completion/ulaw.c
team/group/new_loader_completion/utils.c
Modified:
team/group/new_loader_completion/Makefile
team/group/new_loader_completion/Makefile.moddir_rules
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=40544&r1=40543&r2=40544&view=diff
==============================================================================
--- team/group/new_loader_completion/Makefile (original)
+++ team/group/new_loader_completion/Makefile Sat Aug 19 15:47:06 2006
@@ -46,9 +46,6 @@
ASTTOPDIR:=$(shell pwd)
-# Remember the MAKELEVEL at the top
-MAKETOPLEVEL?=$(MAKELEVEL)
-
# Overwite config files on "make samples"
OVERWRITE=y
@@ -60,20 +57,7 @@
# For example, make DESTDIR=/tmp/asterisk woud put things in
# /tmp/asterisk/etc/asterisk
# !!! Watch out, put no spaces or comments after the value !!!
-DESTDIR?=
#DESTDIR?=/tmp/asterisk
-
-# Original busydetect routine
-#BUSYDETECT = -DBUSYDETECT
-
-# Improved busydetect routine, comment the previous one if you use this one
-#BUSYDETECT+= -DBUSYDETECT_MARTIN
-# Detect the busy signal looking only at tone lengths
-# For example if you have 3 beeps 100ms tone, 100ms silence separated by 500 ms of silence
-#BUSYDETECT+= -DBUSYDETECT_TONEONLY
-# Enforce the detection of busy signal (get rid of false hangups)
-# Don't use together with -DBUSYDETECT_TONEONLY
-#BUSYDETECT+= -DBUSYDETECT_COMPARE_TONE_AND_SILENCE
# Define standard directories for various platforms
# These apply if they are not redefined in asterisk.conf
@@ -131,60 +115,6 @@
GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
-ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
- ifneq ($(wildcard menuselect.makeopts),)
- include menuselect.makeopts
- include menuselect.makedeps
- endif
-endif
-
-ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
- ifneq ($(wildcard makeopts),)
- include makeopts
- endif
-endif
-
-TOPDIR_CFLAGS=-Iinclude
-MOD_SUBDIR_CFLAGS=-I../include -I..
-OTHER_SUBDIR_CFLAGS=-I../include -I..
-
-ifeq ($(origin MENUSELECT_CFLAGS),undefined)
- MENUSELECT_CFLAGS:=$(shell grep MENUSELECT_CFLAGS $(USER_MAKEOPTS) .)
- ifeq ($(MENUSELECT_CFLAGS),)
- MENUSELECT_CFLAGS:=$(shell grep MENUSELECT_CFLAGS $(GLOBAL_MAKEOPTS) .)
- endif
- ifneq ($(MENUSELECT_CFLAGS),)
- MENUSELECT_CFLAGS:=$(shell echo $(MENUSELECT_CFLAGS) | cut -f2 -d'=')
- endif
-endif
-
-ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),$(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)))
-# More GSM codec optimization
-# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
-# which support MMX instructions. This should be newer pentiums,
-# ppro's, etc, as well as the AMD K6 and K7.
-#K6OPT = -DK6OPT
-
-# Tell gcc to optimize the code
-OPTIMIZE+=-O6
-else
- # Stack backtraces, while useful for debugging, are incompatible with optimizations
- ifeq ($(OSARCH),Linux)
- CFLAGS+=-DSTACK_BACKTRACES
- endif
-endif
-
-# *CLI> show memory allocations [filename]
-# *CLI> show memory summary [filename]
-ifneq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),)
- TOPDIR_CFLAGS+=-include include/asterisk/astmm.h
- MOD_SUBDIR_CFLAGS+=-include ../include/asterisk/astmm.h
-endif
-
-ifneq ($(findstring STATIC_BUILD,$(MENUSELECT_CFLAGS)),)
- STATIC_BUILD=-static
-endif
-
ifeq ($(OSARCH),Linux)
ifeq ($(PROC),x86_64)
# You must have GCC 3.4 to use k8, otherwise use athlon
@@ -218,25 +148,18 @@
endif
endif
-GREP=grep
ID=id
ifeq ($(OSARCH),SunOS)
- GREP=/usr/xpg4/bin/grep
M4=/usr/local/bin/m4
ID=/usr/xpg4/bin/id
endif
-ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
-ifneq ($(OPTIMIZE),)
-ASTCFLAGS+=$(OPTIMIZE)
-endif
+ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(OPTIMIZE)
ifeq ($(AST_DEVMODE),yes)
ASTCFLAGS+=-Werror -Wunused
endif
-
-ASTOBJ=-o asterisk
ifeq ($(findstring BSD,$(OSARCH)),BSD)
ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
@@ -254,10 +177,10 @@
BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk)
ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
-endif # FreeBSD
+endif
ifeq ($(OSARCH),NetBSD)
- AST_CFLAGS+=-pthread -I$(CROSS_COMPILE_TARGET)/usr/pkg/include
+ ASTCFLAGS+=-pthread -I$(CROSS_COMPILE_TARGET)/usr/pkg/include
endif
ifeq ($(OSARCH),OpenBSD)
@@ -267,8 +190,6 @@
ifeq ($(OSARCH),SunOS)
ASTCFLAGS+=-Wcast-align -DSOLARIS -Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/opt/ssl/include -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include
endif
-
-LIBEDIT=editline/libedit.a
ASTERISKVERSION:=$(shell build_tools/make_version .)
@@ -287,7 +208,7 @@
MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs
OTHER_SUBDIRS:=utils agi
-SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
+SUBDIRS_ALL:=$(MOD_SUBDIRS:%=%-all) $(OTHER_SUBDIRS:%=%-all)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
SUBDIRS_CLEAN_DEPEND:=$(SUBDIRS:%=%-clean-depend)
@@ -295,38 +216,12 @@
OTHER_SUBDIRS_DEPEND:=$(OTHER_SUBDIRS:%=%-depend)
SUBDIRS_DEPEND:=$(MOD_SUBDIRS_DEPEND) $(OTHER_SUBDIRS_DEPEND)
SUBDIRS_UNINSTALL:=$(SUBDIRS:%=%-uninstall)
-
-OBJS= io.o sched.o logger.o frame.o loader.o config.o channel.o \
- translate.o file.o pbx.o cli.o md5.o term.o \
- ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
- cdr.o tdd.o acl.o rtp.o udptl.o manager.o asterisk.o \
- dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
- astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
- utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
- netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
- cryptostub.o sha1.o http.o fixedjitterbuf.o abstract_jb.o
-
-# we need to link in the objects statically, not as a library, because
-# otherwise modules will not have them available if none of the static
-# objects use it.
-OBJS+=stdtime/localtime.o
-
-# At the moment say.o is an optional component which can be overridden
-# by a module.
-OBJS+=say.o
-
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),)
- OBJS+= poll.o
- ASTCFLAGS+=-DPOLLCOMPAT
-endif
-
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),)
- OBJS+= dlfcn.o
- ASTCFLAGS+=-DDLFCNCOMPAT
-endif
+MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript)
+MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
+MOD_SUBDIRS_EMBED_LIBS:=$(MOD_SUBDIRS:%=%-embed-libs)
ifeq ($(OSARCH),Linux)
- AST_LIBS+=-ldl -lpthread $(EDITLINE_LIB) -lm -lresolv #-lnjamd
+ AST_LIBS+=-ldl -lpthread $(EDITLINE_LIB) -lm -lresolv
else
AST_LIBS+=$(EDITLINE_LIB) -lm
endif
@@ -370,10 +265,6 @@
SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
endif
-ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
- CFLAGS+=$(TOPDIR_CFLAGS)$(ASTCFLAGS)
-endif
-
# This is used when generating the doxygen documentation
ifneq ($(DOT),:)
HAVEDOT=yes
@@ -381,8 +272,6 @@
HAVEDOT=no
endif
-include Makefile.rules
-
_all: all
@echo " +--------- Asterisk Build Complete ---------+"
@echo " + Asterisk has successfully been built, but +"
@@ -392,94 +281,37 @@
@echo " + make install +"
@echo " +-------------------------------------------+"
-all: cleantest config.status menuselect.makeopts depend $(SUBDIRS) asterisk
-
-$(MOD_SUBDIRS):
- @CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@ SUBDIR=$@
-
-$(OTHER_SUBDIRS):
- @CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@ SUBDIR=$@
-
-config.status: configure
- @CFLAGS="" ./configure
+all: cleantest makeopts makeopts.embed_rules depend $(SUBDIRS_ALL) asterisk
+
+makeopts:
@echo "****"
- @echo "**** The configure script was just executed, so 'make' needs to be"
- @echo "**** restarted."
+ @echo "**** The configure script must be executed before running 'make'."
@echo "****"
@exit 1
-makeopts: configure
- @CFLAGS="" ./configure
- @echo "****"
- @echo "**** The configure script was just executed, so 'make' needs to be"
- @echo "**** restarted."
- @echo "****"
- @exit 1
-
-menuselect.makeopts menuselect.makedeps: menuselect/menuselect makeopts.xml
+menuselect.makeopts: menuselect/menuselect menuselect-tree
menuselect/menuselect --check-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts
-#ifneq ($(wildcard tags),)
-ctags: tags
-#endif
-
-ifneq ($(wildcard TAGS),)
-all: TAGS
-endif
-
-editline/config.h:
- cd editline && unset CFLAGS AST_LIBS && CFLAGS="$(OPTIMIZE)" ./configure ; \
-
-editline/libedit.a:
- cd editline && unset CFLAGS AST_LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
- $(MAKE) -C editline libedit.a
-
-db1-ast/libdb1.a:
- CFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a
-
-ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
- ifneq ($(wildcard .depend),)
- include .depend
- endif
-endif
-
-ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
- ifneq ($(wildcard .tags-depend),)
- include .tags-depend
- endif
-endif
-
-ast_expr2.c ast_expr2.h:
- bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
-
-ast_expr2f.c:
- flex -o $@ --full ast_expr2.fl
-
-testexpr2: config.status include/asterisk/buildopts.h ast_expr2f.c ast_expr2.c ast_expr2.h
- $(CC) -g -c -Iinclude -DSTANDALONE ast_expr2f.c
- $(CC) -g -c -Iinclude -DSTANDALONE ast_expr2.c
- $(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o
- rm ast_expr2.o ast_expr2f.o
-
-manpage: asterisk.8
-
-asterisk.8: asterisk.sgml
- rm -f asterisk.8
- docbook2man asterisk.sgml
- mv ./*.8 asterisk.8
-
-asterisk.pdf: asterisk.sgml
- docbook2pdf asterisk.sgml
-
-asterisk.ps: asterisk.sgml
- docbook2ps asterisk.sgml
-
-asterisk.html: asterisk.sgml
- docbook2html asterisk.sgml
- mv r1.html asterisk.html
-
-asterisk.txt: asterisk.sgml
- docbook2txt asterisk.sgml
+$(MOD_SUBDIRS_EMBED_LDSCRIPT):
+ @echo "EMBED_LDSCRIPTS+="`$(MAKE) -s -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
+
+$(MOD_SUBDIRS_EMBED_LDFLAGS):
+ @echo "EMBED_LDFLAGS+="`$(MAKE) -s -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
+
+$(MOD_SUBDIRS_EMBED_LIBS):
+ @echo "EMBED_LIBS+="`$(MAKE) -s -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+
+makeopts.embed_rules: menuselect.makeopts
+ @rm -f $@
+ @$(MAKE) -s $(MOD_SUBDIRS_EMBED_LDSCRIPT)
+ @$(MAKE) -s $(MOD_SUBDIRS_EMBED_LDFLAGS)
+ @$(MAKE) -s $(MOD_SUBDIRS_EMBED_LIBS)
+
+$(MOD_SUBDIRS):
+ @CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@ SUBDIR=$@ all
+
+$(OTHER_SUBDIRS):
+ @CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@ SUBDIR=$@ all
defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp
@@ -502,58 +334,6 @@
fi
@rm -f $@.tmp
-channel.o: CFLAGS+=$(ZAPTEL_INCLUDE)
-
-MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript)
-MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
-MOD_SUBDIRS_EMBED_LIBS:=$(MOD_SUBDIRS:%=%-embed-libs)
-
-$(MOD_SUBDIRS_EMBED_LDSCRIPT):
- @echo "EMBED_LDSCRIPTS+="`$(MAKE) -s -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
-
-$(MOD_SUBDIRS_EMBED_LDFLAGS):
- @echo "EMBED_LDFLAGS+="`$(MAKE) -s -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
-
-$(MOD_SUBDIRS_EMBED_LIBS):
- @echo "EMBED_LIBS+="`$(MAKE) -s -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
-makeopts.embed_rules: menuselect.makeopts menuselect.makedeps
- @rm -f makeopts.embed_rules
- @$(MAKE) -s $(MOD_SUBDIRS_EMBED_LDSCRIPT)
- @$(MAKE) -s $(MOD_SUBDIRS_EMBED_LDFLAGS)
- @$(MAKE) -s $(MOD_SUBDIRS_EMBED_LIBS)
- @echo "****"
- @echo "**** The embedded modules were just changed, so 'make' needs to be"
- @echo "**** restarted."
- @echo "****"
- @exit 1
-
-ifneq ($(wildcard makeopts.embed_rules),)
- include makeopts.embed_rules
-endif
-
-AST_EMBED_LDSCRIPTS:=$(sort $(EMBED_LDSCRIPTS))
-AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED_LDFLAGS),$(value $(dep)))
-AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))
-OBJS:=$(sort $(OBJS))
-
-foo: makeopts.embed_rules
- @echo ldscript: $(AST_EMBED_LDSCRIPTS)
- @echo ldflags: $(AST_EMBED_LDFLAGS)
- @echo libs: $(AST_EMBED_LIBS)
-
-asterisk: makeopts.embed_rules include/asterisk/buildopts.h editline/libedit.a db1-ast/libdb1.a $(OBJS) $(AST_EMBED_LDSCRIPTS)
- @build_tools/make_build_h > include/asterisk/build.h.tmp
- @if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \
- mv include/asterisk/build.h.tmp include/asterisk/build.h ; \
- fi
- @rm -f include/asterisk/build.h.tmp
- @$(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
- $(ECHO_PREFIX) echo " [LD] $(OBJS) buildinfo.o $(AST_EMBED_LDSCRIPTS) -> $@"
- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a $(AST_EMBED_LDFLAGS) $(AST_EMBED_LDSCRIPTS) $(AST_LIBS) $(AST_EMBED_LIBS)
-
-muted: muted.o
-muted: LIBS+=$(AUDIO_LIBS)
-
$(SUBDIRS_CLEAN_DEPEND):
@$(MAKE) -C $(@:-clean-depend=) clean-depend
@@ -563,15 +343,10 @@
clean-depend: $(SUBDIRS_CLEAN_DEPEND)
clean: $(SUBDIRS_CLEAN) clean-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-sources tags TAGS
- rm -f .depend .tags-depend
- @if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
- @$(MAKE) -C db1-ast clean
- @$(MAKE) -C stdtime clean
+ rm -f .depend
@$(MAKE) -C menuselect clean
dist-clean: distclean
@@ -635,8 +410,7 @@
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
- if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
- if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
+ $(INSTALL) -m 755 core/asterisk $(DESTDIR)$(ASTSBINDIR)/
$(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
$(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
@@ -658,7 +432,7 @@
mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
- $(INSTALL) -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+ $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
@@ -848,54 +622,16 @@
dont-optimize: _all
-valgrind: dont-optimize
-
$(MOD_SUBDIRS_DEPEND):
@CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $(@:-depend=) depend
$(OTHER_SUBDIRS_DEPEND):
@CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $(@:-depend=) depend
-depend: include/asterisk/version.h include/asterisk/buildopts.h .depend defaults.h $(SUBDIRS_DEPEND)
-
-.depend: include/asterisk/version.h include/asterisk/buildopts.h defaults.h
- build_tools/mkdep $(CFLAGS) $(wildcard *.c)
-
-.tags-depend:
- @echo -n ".tags-depend: " > $@
- @$(FIND) . -maxdepth 1 -name \*.c -printf "\t%p \\\\\n" >> $@
- @$(FIND) . -maxdepth 1 -name \*.h -printf "\t%p \\\\\n" >> $@
- @$(FIND) $(SUBDIRS) -name \*.c -printf "\t%p \\\\\n" >> $@
- @$(FIND) $(SUBDIRS) -name \*.h -printf "\t%p \\\\\n" >> $@
- @$(FIND) include -name \*.h -printf "\t%p \\\\\n" >> $@
- @echo >> $@
-
-.tags-sources:
- @rm -f $@
- @$(FIND) . -maxdepth 1 -name \*.c -print >> $@
- @$(FIND) . -maxdepth 1 -name \*.h -print >> $@
- @$(FIND) $(SUBDIRS) -name \*.c -print >> $@
- @$(FIND) $(SUBDIRS) -name \*.h -print >> $@
- @$(FIND) include -name \*.h -print >> $@
-
-tags: .tags-depend .tags-sources
- ctags -L .tags-sources -o $@
-
-ctags: tags
-
-TAGS: .tags-depend .tags-sources
- etags -o $@ `cat .tags-sources`
-
-etags: TAGS
-
-%_env:
- $(MAKE) -C $(shell echo $@ | sed "s/_env//g") env
+depend: include/asterisk/version.h include/asterisk/buildopts.h defaults.h $(SUBDIRS_DEPEND)
sounds:
$(MAKE) -C sounds all
-
-env:
- env
# If the cleancount has been changed, force a make clean.
# .cleancount is the global clean count, and .lastclean is the
@@ -942,18 +678,18 @@
rm -rf $(DESTDIR)$(ASTETCDIR)
rm -rf $(DESTDIR)$(ASTLOGDIR)
-menuselect: menuselect/menuselect makeopts.xml
+menuselect: menuselect/menuselect menuselect-tree
- at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
-menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h config.status mxml/libmxml.a
+menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts mxml/libmxml.a
@CFLAGS="-include $(ASTTOPDIR)/include/asterisk/autoconfig.h -I$(ASTTOPDIR)/include" PARENTSRC="$(ASTTOPDIR)" $(MAKE) -C menuselect menuselect
mxml/libmxml.a:
@cd mxml && unset CFLAGS AST_LIBS && test -f config.h || ./configure
$(MAKE) -C mxml libmxml.a
-makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
- @echo "Generating list of available modules ..."
+menuselect-tree: $(foreach dir,$(MOD_SUBDIRS),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
+ @echo "Generating input for menuselect ..."
@build_tools/prep_moduledeps > $@
-.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) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
+.PHONY: menuselect sounds clean clean-depend dist-clean distclean all _all depend cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_CLEAN_DEPEND) $(SUBDIRS_DEPEND) $(SUBDIRS_UNINSTALL) $(SUBDIRS_ALL) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
Modified: team/group/new_loader_completion/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/Makefile.moddir_rules?rev=40544&r1=40543&r2=40544&view=diff
==============================================================================
--- team/group/new_loader_completion/Makefile.moddir_rules (original)
+++ team/group/new_loader_completion/Makefile.moddir_rules Sat Aug 19 15:47:06 2006
@@ -10,6 +10,14 @@
# This program is free software, distributed under the terms of
# the GNU General Public License
#
+
+ifneq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),)
+ CFLAGS+=-include $(ASTTOPDIR)/include/asterisk/astmm.h
+endif
+
+ifneq ($(findstring STATIC_BUILD,$(MENUSELECT_CFLAGS)),)
+ STATIC_BUILD=-static
+endif
include $(ASTTOPDIR)/Makefile.rules
Modified: team/group/new_loader_completion/configure
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/configure?rev=40544&r1=40543&r2=40544&view=diff
==============================================================================
--- team/group/new_loader_completion/configure (original)
+++ team/group/new_loader_completion/configure Sat Aug 19 15:47:06 2006
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 40221 .
+# From configure.ac Revision: 40396 .
# 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="asterisk.c"
+ac_unique_file="core/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=40544&r1=40543&r2=40544&view=diff
==============================================================================
--- team/group/new_loader_completion/configure.ac (original)
+++ team/group/new_loader_completion/configure.ac Sat Aug 19 15:47:06 2006
@@ -14,7 +14,7 @@
AC_CANONICAL_TARGET
# check existence of the package
-AC_CONFIG_SRCDIR([asterisk.c])
+AC_CONFIG_SRCDIR([core/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=40544&r1=40543&r2=40544&view=diff
==============================================================================
--- team/group/new_loader_completion/utils/Makefile (original)
+++ team/group/new_loader_completion/utils/Makefile Sat Aug 19 15:47:06 2006
@@ -93,9 +93,12 @@
./testexpr2s expr2.testinput
smsq: smsq.o
-smsq: LIBS+=-lpopt
+smsq: LIBS+=$(POPT_LIB)
streamplayer: streamplayer.o
+
+muted: muted.o
+muted: LIBS+=$(AUDIO_LIBS)
ifneq ($(wildcard .depend),)
include .depend
More information about the svn-commits
mailing list