From 5a3db54ec56cecfa2384b2d5ee17c8311d810abd Mon Sep 17 00:00:00 2001 From: kpfleming Date: Tue, 21 Jul 2009 13:39:44 +0000 Subject: Merged revisions 207680 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r207680 | kpfleming | 2009-07-21 08:28:04 -0500 (Tue, 21 Jul 2009) | 18 lines Merged revisions 207647 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r207647 | kpfleming | 2009-07-21 08:04:44 -0500 (Tue, 21 Jul 2009) | 12 lines Ensure that user-provided CFLAGS and LDFLAGS are honored. This commit changes the build system so that user-provided flags (in ASTCFLAGS and ASTLDFLAGS) are supplied to the compiler/linker *after* all flags provided by the build system itself, so that the user can effectively override the build system's flags if desired. In addition, ASTCFLAGS and ASTLDFLAGS can now be provided *either* in the environment before running 'make', or as variable assignments on the 'make' command line. As a result, the use of COPTS and LDOPTS is no longer necessary, so they are no longer documented, but are still supported so as not to break existing build systems that supply them when building Asterisk. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@207683 f38db490-d61c-443f-a65b-d21fe96a405b --- agi/Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'agi') diff --git a/agi/Makefile b/agi/Makefile index 89bf7bbec..46b7c3f39 100644 --- a/agi/Makefile +++ b/agi/Makefile @@ -25,20 +25,15 @@ endif include $(ASTTOPDIR)/Makefile.rules -ASTCFLAGS+=-DSTANDALONE +_ASTCFLAGS+=-DSTANDALONE all: $(AGIS) strcompat.c: ../main/strcompat.c @cp $< $@ -strcompat.o: ASTCFLAGS+=-DSTANDALONE - -eagi-test.o: ASTCFLAGS+=-DSTANDALONE eagi-test: eagi-test.o strcompat.o -eagi-sphinx-test.o: ASTCFLAGS+=-DSTANDALONE - eagi-sphinx-test: eagi-sphinx-test.o install: all -- cgit v1.2.3