Module: sip-router Branch: carstenbock/ims Commit: 479aa8b8b1ae75c3471a486e34cae9f3bb608e32 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=479aa8b… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue Jan 11 16:30:54 2011 +0100 Stupid Typo! --- lib/lost/Makefile | 2 +- modules/ecscf/Makefile | 13 ++++++++----- modules/lrf/Makefile | 12 ++++++------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/lost/Makefile b/lib/lost/Makefile index 8fd7a1d..28b82d3 100644 --- a/lib/lost/Makefile +++ b/lib/lost/Makefile @@ -23,5 +23,5 @@ SER_LIBS=$(SERLIBPATH)/cds/ser_cds # TYPE=lib => shared or static library, executable otherwise TYPE = lib -include ../Makefile.defs +include ../../Makefile.libs diff --git a/modules/ecscf/Makefile b/modules/ecscf/Makefile index 4b3b17f..69a6060 100644 --- a/modules/ecscf/Makefile +++ b/modules/ecscf/Makefile @@ -11,12 +11,15 @@ NAME=ecscf.so DEFS+=-DSER DEFS+=-DSER_MOD_INTERFACE -SERLIBPATH=../../lib -SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/lost/lost_client +DEFS+=-DCDP_FOR_SER + +INCLUDES += -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ + -I$(LOCALBASE)/include -I../../lib -I../.. -DEFS += -DCDP_FOR_SER -DEFS += -I/usr/include/libxml2 -I$(SERLIBPATH) -I../.. -LIBS += -L$(LOCALBASE)/lib -lxml2 +LIBS += -L$(LOCALBASE)/lib -L/usr/pkg/lib -lxml2 + +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/lost/lost_client \ #MOD_INSTALL_CFGS=ecscf.cfg diff --git a/modules/lrf/Makefile b/modules/lrf/Makefile index ca35945..26454d4 100644 --- a/modules/lrf/Makefile +++ b/modules/lrf/Makefile @@ -8,19 +8,19 @@ include ../../Makefile.defs auto_gen= NAME=lrf.so -LIBS= DEFS+=-DSER -INCLUDES = -I../../lib -I../.. DEFS+=-DSER_MOD_INTERFACE +DEFS+=-DCDP_FOR_SER + +INCLUDES += -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ + -I$(LOCALBASE)/include -I../../lib -I../.. + +LIBS += -L$(LOCALBASE)/lib -L/usr/pkg/lib -lxml2 SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/cds/ser_cds $(SERLIBPATH)/lost/lost_client -DEFS += -DCDP_FOR_SER -DEFS += -I/usr/include/libxml2 -LIBS += -L$(LOCALBASE)/lib -lxml2 - #MOD_INSTALL_CFGS=lrf.cfg include ../../Makefile.modules