aboutsummaryrefslogtreecommitdiffstats
path: root/utils/Makefile
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-27 16:10:33 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-27 16:10:33 +0000
commit1c9fffa54c13362e256390e6aa7b03d73d7f2265 (patch)
treebbffd464df4f3eba7263d6e230c76469400b2b2e /utils/Makefile
parentdb07a1f968269c3d2076b403ebb808b2fdcc8258 (diff)
fix bugs caused by r144949 when MALLOC_DEBUG is defined
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@144950 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'utils/Makefile')
-rw-r--r--utils/Makefile36
1 files changed, 14 insertions, 22 deletions
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