From 4a2c61fdc8454facb3e8f557f26ee91aa9ca6233 Mon Sep 17 00:00:00 2001 From: russell Date: Fri, 19 May 2006 19:46:10 +0000 Subject: [PATCH] we have to build local copies of aelflex.o, aelbison.o, and pbx_ael.o as well to make sure aelparse doesn't use versions of these objects compiled with astmm support (issue #7122) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@28796 f38db490-d61c-443f-a65b-d21fe96a405b --- utils/Makefile | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/utils/Makefile b/utils/Makefile index 0cc2adab7..c141d7cf9 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -11,9 +11,6 @@ # the GNU General Public License # -# -# Don't use ast mm routines -# UTILS:=astman smsq stereorize streamplayer aelparse ifeq (${OSARCH},SunOS) @@ -76,8 +73,17 @@ ast_expr2f.o: ../ast_expr2f.c check_expr: check_expr.c ast_expr2.o ast_expr2f.o $(CC) $(CFLAGS) -o $@ $^ -aelparse : ../pbx/ael/aelflex.o ../pbx/ael/aelbison.o ../pbx/pbx_ael.o ael_main.o ast_expr2f.o ast_expr2.o - $(CC) $(CFLAGS) -g -o aelparse ../pbx/ael/aelflex.o ../pbx/ael/aelbison.o ael_main.o ../pbx/pbx_ael.o ast_expr2f.o ast_expr2.o +aelflex.o: ../pbx/ael/ael_lex.c ../include/asterisk/ael_structs.h ../pbx/ael/ael.tab.h + $(CC) $(CFLAGS) -I../pbx/ -c -o $@ $< + +aelbison.o: ../pbx/ael/ael.tab.c ../pbx/ael/ael.tab.h ../include/asterisk/ael_structs.h + $(CC) $(CFLAGS) -I../pbx/ -c -o $@ $< + +pbx_ael.o: ../pbx/pbx_ael.c + $(CC) $(CFLAGS) -c -o $@ $< + +aelparse : aelflex.o aelbison.o pbx_ael.o ael_main.o ast_expr2f.o ast_expr2.o + $(CC) $(CFLAGS) -g -o aelparse aelflex.o aelbison.o ael_main.o pbx_ael.o ast_expr2f.o ast_expr2.o ael_main.o : ael_main.c ../include/asterisk/ael_structs.h $(CC) $(CFLAGS) -c -g -o ael_main.o ael_main.c