[sr-dev] git:carstenbock/ims: - Adapted Makefiles in order to compile properly

Carsten Bock carsten at bock.info
Tue Jan 11 14:30:15 CET 2011


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

Author: Carsten Bock <carsten at bock.info>
Committer: Carsten Bock <carsten at bock.info>
Date:   Tue Jan 11 11:56:54 2011 +0100

- Adapted Makefiles in order to compile properly

---

 lib/lost/Makefile.ser  |    9 ---------
 modules/ecscf/Makefile |   17 +++++------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/lib/lost/Makefile.ser b/lib/lost/Makefile.ser
deleted file mode 100644
index e21ed13..0000000
--- a/lib/lost/Makefile.ser
+++ /dev/null
@@ -1,9 +0,0 @@
-LIBNAME  = lost
-OUT_NAME = lib_lost_client.so
-OUT_TYPE = lib
-
-INCLUDES += -I/usr/include/libxml2
-LIBS     += -lxml2 -l_ser_cds -lcurl 
-
-include ../Makefile.ser.defs
-
diff --git a/modules/ecscf/Makefile b/modules/ecscf/Makefile
index 3ac6001..e7a80a1 100644
--- a/modules/ecscf/Makefile
+++ b/modules/ecscf/Makefile
@@ -9,21 +9,14 @@ include ../../Makefile.defs
 auto_gen=
 NAME=ecscf.so
 
-ifeq ($(CFG_NAME),sip-router)
-	DEFS += -DSER_MOD_INTERFACE
-	SERLIBPATH=/../lib
-	#SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1
-	DEFS += -I/usr/include/libxml2 -I../lib -DSER -I../..
-	DEFS += -I../../lib 
-	LIBS += -L/usr/local/lib -L../lib/cds -L../lib/lost -llost_client -lcds
-else
-	DEFS += -I/usr/include/libxml2 -I../../lib -DSER -I../..
-	LIBS += -L/usr/local/lib -L../../lib/cds -L../../lib/lost -l_lost_client
-endif	
-LIBS += -lxml2 
+DEFS+=-DSER_MOD_INTERFACE
+SERLIBPATH=../../lib
+SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1
 
 DEFS += -DCDP_FOR_SER
 DEFS += -I/usr/include/libxml2 
 LIBS += -L$(LOCALBASE)/lib -lxml2
 
+#MOD_INSTALL_CFGS=ecscf.cfg ecscf.xml
+
 include ../../Makefile.modules




More information about the sr-dev mailing list