[sr-dev] git:carstenbock/ims: - Cleanup of Makefiles for CDP and CDP_AVP

Module: sip-router Branch: carstenbock/ims Commit: 60798118dce7988175e7dbc1f1187690af202a9b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6079811… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 6 22:04:39 2011 +0100 - Cleanup of Makefiles for CDP and CDP_AVP - Adaptions to make icscf compile under sip-router.org --- modules/cdp/Makefile | 15 ++------------- modules/cdp_avp/Makefile | 19 +++---------------- modules/icscf/Makefile | 8 +++----- 3 files changed, 8 insertions(+), 34 deletions(-) diff --git a/modules/cdp/Makefile b/modules/cdp/Makefile index 23fc4ba..e8ac8d1 100644 --- a/modules/cdp/Makefile +++ b/modules/cdp/Makefile @@ -9,19 +9,8 @@ include ../../Makefile.defs auto_gen= NAME=cdp.so -ifeq ($(CFG_NAME),sip-router) - DEFS+=-DSER_MOD_INTERFACE -endif - -ifeq ($(CFG_NAME),kamailio) - DEFS+=-DSER_MOD_INTERFACE -endif - -ifeq ($(CFG_NAME),Wharf) - DEFS += -DWHARF -else - DEFS += -DCDP_FOR_SER -endif +DEFS+=-DSER_MOD_INTERFACE +DEFS += -DCDP_FOR_SER DEFS += -I/usr/include/libxml2 LIBS += -L$(LOCALBASE)/lib -lxml2 -lrt diff --git a/modules/cdp_avp/Makefile b/modules/cdp_avp/Makefile index 97653e0..126ef02 100644 --- a/modules/cdp_avp/Makefile +++ b/modules/cdp_avp/Makefile @@ -10,22 +10,9 @@ include ../../Makefile.defs NAME=cdp_avp.so - -ifeq ($(CFG_NAME),sip-router) - DEFS+=-DSER_MOD_INTERFACE -endif - -ifeq ($(CFG_NAME),kamailio) - DEFS+=-DSER_MOD_INTERFACE -endif - - -ifeq ($(CFG_NAME),Wharf) - DEFS += -DWHARF -else - DEFS += -DCDP_FOR_SER - DEFS += -I/usr/include/libxml2 -endif +DEFS+=-DSER_MOD_INTERFACE +DEFS += -DCDP_FOR_SER +DEFS += -I/usr/include/libxml2 #libs+= #includes+= diff --git a/modules/icscf/Makefile b/modules/icscf/Makefile index 97af4df..ced956e 100644 --- a/modules/icscf/Makefile +++ b/modules/icscf/Makefile @@ -11,11 +11,9 @@ include ../../Makefile.defs auto_gen= NAME=icscf.so -ifeq ($(CFG_NAME),sip-router) - DEFS+=-DSER_MOD_INTERFACE - SERLIBPATH=../../lib - SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 -endif +DEFS+=-DSER_MOD_INTERFACE +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 DEFS += -DCDP_FOR_SER DEFS += -I/usr/include/libxml2