[asterisk-commits] russell: trunk r77411 - in /trunk: ./ Makefile

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Jul 26 16:24:42 2007
New Revision: 77411

URL: http://svn.digium.com/view/asterisk?view=rev&rev=77411
Log:
Merged revisions 77410 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r77410 | russell | 2007-07-26 16:23:23 -0500 (Thu, 26 Jul 2007) | 10 lines

AST_DEVMODE was defined in trunk, but not in 1.4.  When Asterisk is compiled
under dev mode, AST_DEVMODE will get defined in buildopts.h.  Change 1.4 to
define it in the same way that trunk does.  Also, revert the change that added
this define in the Makefile

The advantage to doing it this way is that buildopts.h gets installed when
you install Asterisk.  Then, when building any out of tree modules, or
building asterisk-addons, these modules know which options the rest of Asterisk
was built with.

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=77411&r1=77410&r2=77411
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Jul 26 16:24:42 2007
@@ -193,7 +193,7 @@
 ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
 
 ifeq ($(AST_DEVMODE),yes)
-  ASTCFLAGS+=-Werror -Wunused -Wundef $(AST_DECLARATION_AFTER_STATEMENT) -DAST_DEVMODE
+  ASTCFLAGS+=-Werror -Wunused -Wundef $(AST_DECLARATION_AFTER_STATEMENT)
 endif
 
 ifneq ($(findstring BSD,$(OSARCH)),)