diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-06-20 17:26:08 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-06-20 17:26:08 +0000 |
commit | e4c73c5b8de4a71f0e82076318a0163936655a8c (patch) | |
tree | 7abe726fc569e7bbe5238af2a0f2211012084597 | |
parent | bbd60b12e592138fe3eaa7dd84dc44728f6fc32a (diff) |
move tools used during build into build_tools subdirectory
clean up Makefile headers
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5942 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | .cvsignore | 1 | ||||
-rwxr-xr-x | Makefile | 20 | ||||
-rwxr-xr-x | agi/Makefile | 8 | ||||
-rwxr-xr-x | apps/Makefile | 8 | ||||
-rwxr-xr-x | build_tools/.cvsignore | 1 | ||||
-rwxr-xr-x | build_tools/make_build_h (renamed from make_build_h) | 0 | ||||
-rwxr-xr-x | build_tools/make_defaults_h (renamed from make_defaults_h) | 0 | ||||
-rwxr-xr-x | build_tools/make_version_h (renamed from make_version_h) | 0 | ||||
-rwxr-xr-x | build_tools/mkdep (renamed from mkdep) | 0 | ||||
-rwxr-xr-x | build_tools/vercomp.c (renamed from vercomp.c) | 0 | ||||
-rwxr-xr-x | cdr/Makefile | 6 | ||||
-rwxr-xr-x | channels/Makefile | 9 | ||||
-rwxr-xr-x | codecs/Makefile | 8 | ||||
-rwxr-xr-x | formats/Makefile | 6 | ||||
-rwxr-xr-x | funcs/Makefile | 4 | ||||
-rwxr-xr-x | pbx/Makefile | 10 | ||||
-rwxr-xr-x | res/Makefile | 10 | ||||
-rwxr-xr-x | stdtime/Makefile | 2 | ||||
-rwxr-xr-x | utils/Makefile | 15 |
19 files changed, 60 insertions, 48 deletions
diff --git a/.cvsignore b/.cvsignore index 85d4a8aa3..70d1a239c 100755 --- a/.cvsignore +++ b/.cvsignore @@ -19,4 +19,3 @@ update.out .tags-sources tags TAGS -vercomp @@ -317,15 +317,15 @@ endif .PHONY: ast_expr -vercomp: vercomp.c +build_tools/vercomp: build_tools/vercomp.c $(HOST_CC) -o $@ $< -ast_expr: vercomp +ast_expr: build_tools/vercomp $(MAKE) ast_expr.a ifeq ($(MAKECMDGOALS),ast_expr.a) -FLEXVER_GT_2_5_31=$(shell ./vercomp flex \>= 2.5.31) -BISONVER_GE_1_85=$(shell ./vercomp bison \>= 1.85 ) +FLEXVER_GT_2_5_31=$(shell build_tools/vercomp flex \>= 2.5.31) +BISONVER_GE_1_85=$(shell build_tools/vercomp bison \>= 1.85 ) endif ifeq ($(FLEXVER_GT_2_5_31),true) @@ -395,7 +395,7 @@ asterisk.txt: asterisk.sgml docbook2txt asterisk.sgml defaults.h: FORCE - ./make_defaults_h > $@.tmp + build_tools/make_defaults_h > $@.tmp if ! cmp -s $@.tmp $@ ; then \ mv $@.tmp $@ ; \ fi @@ -403,7 +403,7 @@ defaults.h: FORCE include/asterisk/build.h: - ./make_build_h > $@.tmp + build_tools/make_build_h > $@.tmp if ! cmp -s $@.tmp $@ ; then \ mv $@.tmp $@ ; \ fi @@ -415,7 +415,7 @@ include/asterisk/build.h: FORCE endif include/asterisk/version.h: FORCE - ./make_version_h > $@.tmp + build_tools/make_version_h > $@.tmp if ! cmp -s $@.tmp $@ ; then \ mv $@.tmp $@ ; \ fi @@ -446,7 +446,7 @@ clean: rm -f include/asterisk/version.h rm -f ast_expr.c ast_expr.h ast_expr.output rm -f ast_expr2.c ast_expr2f.c ast_expr2.h ast_expr2.output - rm -f ast_expr.a vercomp + rm -f ast_expr.a build_tools/vercomp rm -f .version rm -f .tags-depend .tags-sources tags TAGS @if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi @@ -762,8 +762,8 @@ depend: .depend defaults.h include/asterisk/build.h include/asterisk/version.h for x in $(SUBDIRS); do $(MAKE) -C $$x depend || exit 1 ; done .depend: - ./mkdep ${CFLAGS} $(filter-out ast_expr.c,$(wildcard *.c)) - ./mkdep -a -d ${CFLAGS} ast_expr.c + build_tools/mkdep ${CFLAGS} $(filter-out ast_expr.c,$(wildcard *.c)) + build_tools/mkdep -a -d ${CFLAGS} ast_expr.c .tags-depend: @echo -n ".tags-depend: " > $@ diff --git a/agi/Makefile b/agi/Makefile index 0d8a35922..999a07762 100755 --- a/agi/Makefile +++ b/agi/Makefile @@ -1,11 +1,11 @@ # # Asterisk -- A telephony toolkit for Linux. # -# Makefile for PBX frontends (dynamically loaded) +# Makefile for AGI-related stuff # -# Copyright (C) 1999, Mark Spencer +# Copyright (C) 1999-2005, Digium # -# Mark Spencer <markster@linux-support.net> +# Mark Spencer <markster@digium.com> # # This program is free software, distributed under the terms of # the GNU General Public License @@ -45,4 +45,4 @@ endif depend: .depend .depend: - ../mkdep $(CFLAGS) `ls *.c` + ../build_tools/mkdep $(CFLAGS) `ls *.c` diff --git a/apps/Makefile b/apps/Makefile index 9d4a36b4e..104aa4054 100755 --- a/apps/Makefile +++ b/apps/Makefile @@ -1,11 +1,11 @@ # # Asterisk -- A telephony toolkit for Linux. # -# Makefile for PBX frontends (dynamically loaded) +# Makefile for PBX applications # -# Copyright (C) 1999, Mark Spencer +# Copyright (C) 1999-2005, Digium # -# Mark Spencer <markster@linux-support.net> +# Mark Spencer <markster@digium.com> # # This program is free software, distributed under the terms of # the GNU General Public License @@ -128,7 +128,7 @@ endif depend: .depend .depend: - ../mkdep $(CFLAGS) `ls *.c` + ../build_tools/mkdep $(CFLAGS) `ls *.c` env: env diff --git a/build_tools/.cvsignore b/build_tools/.cvsignore new file mode 100755 index 000000000..1f389ab1d --- /dev/null +++ b/build_tools/.cvsignore @@ -0,0 +1 @@ +vercomp diff --git a/make_build_h b/build_tools/make_build_h index fda1cea38..fda1cea38 100755 --- a/make_build_h +++ b/build_tools/make_build_h diff --git a/make_defaults_h b/build_tools/make_defaults_h index 7b9411111..7b9411111 100755 --- a/make_defaults_h +++ b/build_tools/make_defaults_h diff --git a/make_version_h b/build_tools/make_version_h index f0e81f70a..f0e81f70a 100755 --- a/make_version_h +++ b/build_tools/make_version_h diff --git a/mkdep b/build_tools/mkdep index 84f969b1d..84f969b1d 100755 --- a/mkdep +++ b/build_tools/mkdep diff --git a/vercomp.c b/build_tools/vercomp.c index acc32f181..acc32f181 100755 --- a/vercomp.c +++ b/build_tools/vercomp.c diff --git a/cdr/Makefile b/cdr/Makefile index 9267f5ae8..5e73cf267 100755 --- a/cdr/Makefile +++ b/cdr/Makefile @@ -3,9 +3,9 @@ # # Makefile for CDR backends (dynamically loaded) # -# Copyright (C) 1999, Mark Spencer +# Copyright (C) 1999-2005, Digium # -# Mark Spencer <markster@linux-support.net> +# Mark Spencer <markster@digium.com> # # This program is free software, distributed under the terms of # the GNU General Public License @@ -98,4 +98,4 @@ cdr_sqlite.so: cdr_sqlite.o depend: .depend .depend: - ../mkdep $(CFLAGS) `ls *.c` + ../build_tools/mkdep $(CFLAGS) `ls *.c` diff --git a/channels/Makefile b/channels/Makefile index b4c60bf35..c4b1d643d 100755 --- a/channels/Makefile +++ b/channels/Makefile @@ -1,11 +1,11 @@ # # Asterisk -- A telephony toolkit for Linux. # -# Makefile for Channel backends (dynamically loaded) +# Makefile for channel drivers # -# Copyright (C) 1999, Mark Spencer +# Copyright (C) 1999-2005, Mark Spencer # -# Mark Spencer <markster@linux-support.net> +# Mark Spencer <markster@digium.com> # # Edited By Belgarath <> Aug 28 2004 # Added bare bones ultrasparc-linux support. @@ -13,6 +13,7 @@ # This program is free software, distributed under the terms of # the GNU General Public License # + ifeq ($(CROSS_COMPILE),) OSARCH=$(shell uname -s) PROC=$(shell uname -m) @@ -201,7 +202,7 @@ install: all depend: .depend .depend: - ../mkdep $(CFLAGS) `ls *.c` + ../build_tools/mkdep $(CFLAGS) `ls *.c` env: env diff --git a/codecs/Makefile b/codecs/Makefile index a5a3f722c..9801f2c5e 100755 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -1,11 +1,11 @@ # # Asterisk -- A telephony toolkit for Linux. # -# Makefile for PBX frontends (dynamically loaded) +# Makefile for codec modules # -# Copyright (C) 1999, Mark Spencer +# Copyright (C) 1999-2005, Digium # -# Mark Spencer <markster@linux-support.net> +# Mark Spencer <markster@digium.com> # # This program is free software, distributed under the terms of # the GNU General Public License @@ -98,4 +98,4 @@ install: all depend: .depend .depend: - ../mkdep $(CFLAGS) `ls *.c` + ../build_tools/mkdep $(CFLAGS) `ls *.c` diff --git a/formats/Makefile b/formats/Makefile index c0b881250..cbf43f899 100755 --- a/formats/Makefile +++ b/formats/Makefile @@ -3,9 +3,9 @@ # # Makefile for file format modules # -# Copyright (C) 1999, Mark Spencer +# Copyright (C) 1999-2005, Digium # -# Mark Spencer <markster@linux-support.net> +# Mark Spencer <markster@digium.com> # # This program is free software, distributed under the terms of # the GNU General Public License @@ -46,4 +46,4 @@ install: all depend: .depend .depend: - ../mkdep $(CFLAGS) `ls *.c` + ../build_tools/mkdep $(CFLAGS) `ls *.c` diff --git a/funcs/Makefile b/funcs/Makefile index 1bee2ae4f..543f23a97 100755 --- a/funcs/Makefile +++ b/funcs/Makefile @@ -3,7 +3,7 @@ # # Makefile for dialplan functions # -# Copyright (C) 2005, Digium, Inc. +# Copyright (C) 2005, Digium # # Kevin P. Fleming <kpfleming@digium.com> # @@ -64,7 +64,7 @@ endif depend: .depend .depend: pbx_functions.h - ../mkdep $(CFLAGS) `ls *.c` + ../build_tools/mkdep $(CFLAGS) `ls *.c` env: env diff --git a/pbx/Makefile b/pbx/Makefile index c2ebc6639..da3f426ba 100755 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -1,18 +1,16 @@ # # Asterisk -- A telephony toolkit for Linux. # -# Makefile for PBX frontends (dynamically loaded) +# Makefile for PBX modules # -# Copyright (C) 1999, Mark Spencer +# Copyright (C) 1999-2005, Mark Spencer # -# Mark Spencer <markster@linux-support.net> +# Mark Spencer <markster@digium.com> # # This program is free software, distributed under the terms of # the GNU General Public License # - - PBX_LIBS=pbx_config.so pbx_spool.so pbx_dundi.so pbx_loopback.so pbx_realtime.so \ pbx_ael.so @@ -69,4 +67,4 @@ install: all depend: .depend .depend: - ../mkdep $(CFLAGS) `ls *.c` + ../build_tools/mkdep $(CFLAGS) `ls *.c` diff --git a/res/Makefile b/res/Makefile index 0e8d3ae6a..e745f9ecc 100755 --- a/res/Makefile +++ b/res/Makefile @@ -1,11 +1,11 @@ # # Asterisk -- A telephony toolkit for Linux. # -# Makefile for CDR backends (dynamically loaded) +# Makefile for resource modules # -# Copyright (C) 1999, Mark Spencer +# Copyright (C) 1999-2005, Digium # -# Mark Spencer <markster@linux-support.net> +# Mark Spencer <markster@digium.com> # # This program is free software, distributed under the terms of # the GNU General Public License @@ -68,8 +68,8 @@ depend: .depend else \ echo "*** You don't have mpg123 installed. You're going to need ***";\ echo "*** it if you want MusicOnHold ***";\ - fi - ../mkdep $(CFLAGS) `ls *.c` + fi + ../build_tools/mkdep $(CFLAGS) `ls *.c` env: env diff --git a/stdtime/Makefile b/stdtime/Makefile index ccc11eda3..e97010f0f 100755 --- a/stdtime/Makefile +++ b/stdtime/Makefile @@ -14,7 +14,7 @@ clean: depend: .depend .depend: - ../mkdep $(CFLAGS) *.c + ../build_tools/mkdep $(CFLAGS) *.c test: test.c ${CC} ${CFLAGS} -o test test.c diff --git a/utils/Makefile b/utils/Makefile index 76328022a..b5a805571 100755 --- a/utils/Makefile +++ b/utils/Makefile @@ -1,4 +1,17 @@ # +# Asterisk -- A telephony toolkit for Linux. +# +# Various utilities +# +# Copyright (C) 1999-2005, Digium +# +# Mark Spencer <markster@digium.com> +# +# This program is free software, distributed under the terms of +# the GNU General Public License +# + +# # Don't use ast mm routines # CFLAGS+=-DNO_AST_MM @@ -44,5 +57,5 @@ endif depend: .depend .depend: - ../mkdep $(CFLAGS) `ls *.c` + ../build_tools/mkdep $(CFLAGS) `ls *.c` |