From f20ef313d021be53e18c2adf115226abfeae3ebb Mon Sep 17 00:00:00 2001 From: kpfleming Date: Sat, 1 Aug 2009 01:13:03 +0000 Subject: Merged revisions 209760-209761 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r209760 | kpfleming | 2009-07-31 20:03:07 -0500 (Fri, 31 Jul 2009) | 13 lines Merged revisions 209759 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r209759 | kpfleming | 2009-07-31 19:52:00 -0500 (Fri, 31 Jul 2009) | 7 lines Minor changes inspired by testing with latest GCC. The latest GCC (what will become 4.5.x) has a few new warnings, that in these cases found some either downright buggy code, or at least seriously poorly designed code that could be improved. ........ ................ r209761 | kpfleming | 2009-07-31 20:04:06 -0500 (Fri, 31 Jul 2009) | 1 line Revert accidental Makefile change. ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@209762 f38db490-d61c-443f-a65b-d21fe96a405b --- main/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/Makefile') diff --git a/main/Makefile b/main/Makefile index 5643fb357..f147abd66 100644 --- a/main/Makefile +++ b/main/Makefile @@ -102,7 +102,7 @@ editline/libedit.a: CHECK_SUBDIR $(MAKE) -C editline libedit.a db1-ast/libdb1.a: CHECK_SUBDIR - CFLAGS="$(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS) $(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" $(MAKE) -C db1-ast libdb1.a + _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a ast_expr2.c ast_expr2.h: bison -o $@ -d --name-prefix=ast_yy ast_expr2.y -- cgit v1.2.3