Module: sip-router Branch: master Commit: 821640817c5d5ec210fc17a106bfc74ee4639bf9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82164081...

Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@gmail.com Date: Thu Jan 28 13:44:08 2010 +0100

Makefile.defs: moved init of vars before FLAVOUR updates

- some vars might depend on type of FLAVOUR installed - kamailio flavour compiles shm stats by default

---

Makefile.defs | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Makefile.defs b/Makefile.defs index 7e2dd0f..a015244 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -115,6 +115,14 @@ endif # verbose # flavour: sip-router, ser or kamailio FLAVOUR?=sip-router

+#prefix for various configs and scripts +#config name/name-prefix for distributed configs +CFG_NAME=sip-router +#config name/name-prefix for distributed scripts +SCR_NAME=sip-router +#name in source tree +SRC_NAME=sip-router + ifeq ($(FLAVOUR),sip-router) # main binary name MAIN_NAME=ser @@ -124,19 +132,17 @@ MAIN_NAME=ser else ifeq ($(FLAVOUR),kamailio) # main binary name MAIN_NAME=kamailio +# use kamailio config +CFG_NAME=kamailio +# kamailio statistics on +KMSTATS ?= 1 +# fast malloc statistics on +FMSTATS ?= 1 else # default: # main binary name MAIN_NAME=sip-router endif

-#prefix for various configs and scripts -#config name/name-prefix for distributed configs -CFG_NAME=sip-router -#config name/name-prefix for distributed scripts -SCR_NAME=sip-router -#name in source tree -SRC_NAME=sip-router - # what to install INSTALL_FLAVOUR=$(FLAVOUR)

@@ -650,6 +656,9 @@ endif ifeq ($(KMSTATS), 1) C_DEFS+= -DSTATISTICS endif +ifeq ($(FMSTATS), 1) + C_DEFS+= -DMALLOC_STATS +endif

ifneq ($(STUN),) C_DEFS+= -DUSE_STUN