[svn-commits] murf: branch murf/bug_7638 r78695 - in /team/murf/bug_7638: pbx/ res/ utils/

[SVN commits to the Digium repositories]

Author: murf
Date: Wed Aug  8 18:49:45 2007
New Revision: 78695

URL: http://svn.digium.com/view/asterisk?view=rev&rev=78695
Log:
Yay! I separated the ael lex and grammar engines into their own loadable module. Much better than having them crammed into the core.

Modified:
    team/murf/bug_7638/pbx/Makefile
    team/murf/bug_7638/pbx/pbx_ael.c
    team/murf/bug_7638/res/Makefile
    team/murf/bug_7638/utils/Makefile

Modified: team/murf/bug_7638/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7638/pbx/Makefile?view=diff&rev=78695&r1=78694&r2=78695
==============================================================================
--- team/murf/bug_7638/pbx/Makefile (original)
+++ team/murf/bug_7638/pbx/Makefile Wed Aug  8 18:49:45 2007
@@ -28,8 +28,6 @@
 clean::
 	rm -f ael/*.o
 
-$(if $(filter pbx_ael,$(EMBEDDED_MODS)),modules.link,pbx_ael.so): ael/ael.tab.o ael/ael_lex.o
-
 dundi-parser.o: dundi-parser.h
 dundi-parser.o: ASTCFLAGS+=-I.
 

Modified: team/murf/bug_7638/pbx/pbx_ael.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7638/pbx/pbx_ael.c?view=diff&rev=78695&r1=78694&r2=78695
==============================================================================
--- team/murf/bug_7638/pbx/pbx_ael.c (original)
+++ team/murf/bug_7638/pbx/pbx_ael.c Wed Aug  8 18:49:45 2007
@@ -21,6 +21,10 @@
  * \brief Compile symbolic Asterisk Extension Logic into Asterisk extensions, version 2.
  * 
  */
+
+/*** MODULEINFO
+	<depend>res_ael_share</depend>
+ ***/
 
 #include "asterisk.h"
 

Modified: team/murf/bug_7638/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7638/res/Makefile?view=diff&rev=78695&r1=78694&r2=78695
==============================================================================
--- team/murf/bug_7638/res/Makefile (original)
+++ team/murf/bug_7638/res/Makefile Wed Aug  8 18:49:45 2007
@@ -26,12 +26,14 @@
 include $(ASTTOPDIR)/Makefile.moddir_rules
 
 ael/ael_lex.o: ael/ael_lex.c ../include/asterisk/ael_structs.h ael/ael.tab.h
-ael/ael_lex.o: ASTCFLAGS+=-I.
+ael/ael_lex.o: ASTCFLAGS+=-I. -Iael 
 
 ael/ael.tab.o: ael/ael.tab.c ael/ael.tab.h ../include/asterisk/ael_structs.h
-ael/ael.tab.o: ASTCFLAGS+=-I. -DYYENABLE_NLS=0
+ael/ael.tab.o: ASTCFLAGS+=-I. -Iael -DYYENABLE_NLS=0
 
 $(if $(filter res_snmp,$(EMBEDDED_MODS)),modules.link,res_snmp.so): snmp/agent.o
+
+$(if $(filter res_ael_share,$(EMBEDDED_MODS)),modules.link,res_ael_share.so): ael/ael_lex.o ael/ael.tab.o
 
 ael/ael_lex.c:
 	(cd ael; flex ael.flex; sed -i -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c)

Modified: team/murf/bug_7638/utils/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7638/utils/Makefile?view=diff&rev=78695&r1=78694&r2=78695
==============================================================================
--- team/murf/bug_7638/utils/Makefile (original)
+++ team/murf/bug_7638/utils/Makefile Wed Aug  8 18:49:45 2007
@@ -96,10 +96,10 @@
 
 check_expr: check_expr.o ast_expr2.o ast_expr2f.o
 
-aelbison.c: ../pbx/ael/ael.tab.c
+aelbison.c: ../res/ael/ael.tab.c
 	@cp $< $@
-aelbison.o: aelbison.c ../pbx/ael/ael.tab.h ../include/asterisk/ael_structs.h
-aelbison.o: ASTCFLAGS+=-I../pbx/ael  -DYYENABLE_NLS=0
+aelbison.o: aelbison.c ../res/ael/ael.tab.h ../include/asterisk/ael_structs.h
+aelbison.o: ASTCFLAGS+=-I../res/ael  -DYYENABLE_NLS=0
 
 pbx_ael.c: ../pbx/pbx_ael.c
 	@cp $< $@
@@ -107,10 +107,10 @@
 
 ael_main.o: ael_main.c ../include/asterisk/ael_structs.h
 
-aelparse.c: ../pbx/ael/ael_lex.c
+aelparse.c: ../res/ael/ael_lex.c
 	@cp $< $@
-aelparse.o: aelparse.c ../include/asterisk/ael_structs.h ../pbx/ael/ael.tab.h
-aelparse.o: ASTCFLAGS+=-I../pbx -DSTANDALONE_AEL
+aelparse.o: aelparse.c ../include/asterisk/ael_structs.h ../res/ael/ael.tab.h
+aelparse.o: ASTCFLAGS+=-I../res -DSTANDALONE_AEL
 
 aelparse: aelparse.o aelbison.o pbx_ael.o ael_main.o ast_expr2f.o ast_expr2.o strcompat.o pval.o extconf.o