diff options
| -rw-r--r-- | agi/Makefile | 5 | ||||
| -rw-r--r-- | include/asterisk/astmm.h | 7 | ||||
| -rw-r--r-- | utils/Makefile | 36 |
3 files changed, 26 insertions, 22 deletions
diff --git a/agi/Makefile b/agi/Makefile index 0cb6f3f02..d580a1632 100644 --- a/agi/Makefile +++ b/agi/Makefile @@ -29,9 +29,14 @@ 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 diff --git a/include/asterisk/astmm.h b/include/asterisk/astmm.h index f2a632e3c..5d0d47ff5 100644 --- a/include/asterisk/astmm.h +++ b/include/asterisk/astmm.h @@ -27,6 +27,13 @@ #include "asterisk.h" +/* Include these now to prevent them from being needed later */ +#include <sys/types.h> +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <stdarg.h> + /* Undefine any macros */ #undef malloc #undef calloc diff --git a/utils/Makefile b/utils/Makefile index e6f1d32a2..e44b37a0c 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -82,52 +82,44 @@ clean: md5.c: $(ASTTOPDIR)/main/md5.c @cp $< $@ +md5.o: ASTCFLAGS+=-DSTANDALONE + astman: astman.o md5.o astman: LIBS+=$(NEWT_LIB) -astman.o: ASTCFLAGS+=-DNO_MALLOC_DEBUG +astman.o: ASTCFLAGS+=-DSTANDALONE stereorize: stereorize.o frame.o stereorize: LIBS+=-lm hashtab.c: $(ASTTOPDIR)/main/hashtab.c @cp $< $@ +hashtab.o: ASTCFLAGS+=-DSTANDALONE strcompat.c: $(ASTTOPDIR)/main/strcompat.c @cp $< $@ - -$(ASTTOPDIR)/main/ast_expr2.c: - @echo " [BISON] $(ASTTOPDIR)/main/ast_expr2.y -> $@" - @bison -o $@ -d --name-prefix=ast_yy $(ASTTOPDIR)/main/ast_expr2.y - -$(ASTTOPDIR)/main/ast_expr2f.c: - @echo " [FLEX] $(ASTTOPDIR)/main/ast_expr2.fl -> $@" - @flex -o $@ --full $(ASTTOPDIR)/main/ast_expr2.fl +strcompat.o: ASTCFLAGS+=-DSTANDALONE pval.c: $(ASTTOPDIR)/res/ael/pval.c @cp $< $@ +pval.o : ASTCFLAGS+=-DSTANDALONE ast_expr2.c: $(ASTTOPDIR)/main/ast_expr2.c @cp $< $@ - ast_expr2.o: ASTCFLAGS+=-DSTANDALONE ast_expr2f.c: $(ASTTOPDIR)/main/ast_expr2f.c @cp $< $@ - ast_expr2f.o: ASTCFLAGS+=-DSTANDALONE -I$(ASTTOPDIR)/main -Wno-unused -pval.o : ASTCFLAGS+=-DSTANDALONE - check_expr: check_expr.o ast_expr2.o ast_expr2f.o strcompat.o threadstorage.o clicompat.o +check_expr.o: ASTCFLAGS+=-DSTANDALONE aelbison.c: $(ASTTOPDIR)/res/ael/ael.tab.c @cp $< $@ - aelbison.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res/ael -DYYENABLE_NLS=0 -DSTANDALONE pbx_ael.c: $(ASTTOPDIR)/pbx/pbx_ael.c @cp $< $@ - pbx_ael.o: ASTCFLAGS+=-DSTANDALONE aelparse.c: $(ASTTOPDIR)/res/ael/ael_lex.c @@ -136,32 +128,32 @@ aelparse.c: $(ASTTOPDIR)/res/ael/ael_lex.c ael_main.o: ASTCFLAGS+=-DSTANDALONE aelparse.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res -DSTANDALONE -Wno-unused - aelparse: aelparse.o aelbison.o pbx_ael.o hashtab.o ael_main.o ast_expr2f.o ast_expr2.o strcompat.o pval.o extconf.o astobj2.c: $(ASTTOPDIR)/main/astobj2.c @cp $< $@ +astobj2.o: ASTCFLAGS+=-DSTANDALONE utils.c: $(ASTTOPDIR)/main/utils.c @cp $< $@ +utils.o: ASTCFLAGS+=-DSTANDALONE sha1.c: $(ASTTOPDIR)/main/sha1.c @cp $< $@ +sha1.o: ASTCFLAGS+=-DSTANDALONE threadstorage.c: $(ASTTOPDIR)/main/threadstorage.c @cp $< $@ +threadstorage.o: ASTCFLAGS+=-DSTANDALONE -hashtest2.o: ASTCFLAGS+=-O0 - +hashtest2.o: ASTCFLAGS+=-O0 -DSTANDALONE hashtest2: hashtest2.o md5.o utils.o astobj2.o sha1.o strcompat.o threadstorage.o clicompat.o hashtest: hashtest.o md5.o hashtab.o utils.o sha1.o strcompat.o threadstorage.o clicompat.o - -hashtest.o: ASTCFLAGS+=-O0 +hashtest.o: ASTCFLAGS+=-O0 -DSTANDALONE refcounter: refcounter.o md5.o hashtab.o utils.o sha1.o strcompat.o threadstorage.o clicompat.o - -refcounter.o: ASTCFLAGS+=-O0 +refcounter.o: ASTCFLAGS+=-O0 -DSTANDALONE extconf.o: extconf.c |