[sr-dev] git:carstenbock/ims: - Cleanup of Makefile for SCSCF

[Carsten Bock]

Module: sip-router
Branch: carstenbock/ims
Commit: 789a227b8029e6443700466ebacc11edf878ea89
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=789a227b8029e6443700466ebacc11edf878ea89

Author: Carsten Bock <carsten at bock.info>
Committer: Carsten Bock <carsten at bock.info>
Date:   Thu Jan  6 22:52:53 2011 +0100

- Cleanup of Makefile for SCSCF

---

 modules/scscf/Makefile |   23 +++++++----------------
 1 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/modules/scscf/Makefile b/modules/scscf/Makefile
index 569b398..d3b37ec 100644
--- a/modules/scscf/Makefile
+++ b/modules/scscf/Makefile
@@ -11,24 +11,15 @@ include ../../Makefile.defs
 auto_gen=
 NAME=scscf.so
 
-ifeq ($(CFG_NAME),kamailio)
-	DEFS+=-DSER_MOD_INTERFACE
-	SERLIBPATH=../../lib
-	SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1
-	#LIBS+=-L../../lib/cds -lser_cds
-else
-ifeq ($(CFG_NAME),sip-router)
-	DEFS+=-DSER_MOD_INTERFACE
-	SERLIBPATH=../../lib
-	SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1
-	LIBS+=-L../../lib/cds -lser_cds
-else
-	LIBS+=-L../../lib/cds -l_ser_cds
-endif
-endif
+DEFS+=-DSER
+INCLUDES = -I../../lib -I../..
+DEFS+=-DSER_MOD_INTERFACE
+
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/cds/ser_cds
 
 DEFS += -DCDP_FOR_SER
-DEFS += -I/usr/include/libxml2 -I../../lib -DSER -I../..
+DEFS += -I/usr/include/libxml2 
 LIBS += -L$(LOCALBASE)/lib -lxml2
 
 #DEFS += -DWITH_IMS_PM