[naviserver-commits] naviserver/include Makefile.global.in,1.11,1.12

[Zoran V. <vas...@us...>]

Update of /cvsroot/naviserver/naviserver/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18304/include

Modified Files:
	Makefile.global.in 
Log Message:
Link against libnsd library
when linking new nsdbstest driver


Index: Makefile.global.in
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/Makefile.global.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile.global.in	10 Jun 2005 07:29:19 -0000	1.11
--- Makefile.global.in	21 Oct 2005 12:04:44 -0000	1.12
***************
*** 79,89 ****
      INCDIR   = $(NAVISERVER)/include
  else
!     LDFLAGS	+= -L../nsthread -L../nsd
      INCDIR   = ../include
      ifneq (nsthread,$(LIB))
!         LIBS += -lnsthread
!         ifneq (nsd,$(LIB))
              ifneq (nsthreadtest,$(PGM))
!                 LIBS += -lnsd
              endif
          endif
--- 79,93 ----
      INCDIR   = $(NAVISERVER)/include
  else
!     LDFLAGS += -L../nsthread -L../nsd -L../nsdb
      INCDIR   = ../include
      ifneq (nsthread,$(LIB))
!         LIBS += -lnsthread 
!         ifneq (nsd,$(LIB)) 
              ifneq (nsthreadtest,$(PGM))
!                 ifeq (nsdbtest,$(MODNAME))
!                     LIBS += -lnsd -lnsdb
!                 else 
!                     LIBS += -lnsd
!                 endif
              endif
          endif
***************
*** 92,96 ****
  
  NSLIBS      += @TCL_LIB_SPEC@ @TCL_LIBS@ @LDFLAGS@ @LIBS@
! CCLIBS       = $(NSLIBS) @TCL_LD_FLAGS@
  
  # Install directories
--- 96,100 ----
  
  NSLIBS      += @TCL_LIB_SPEC@ @TCL_LIBS@ @LDFLAGS@ @LIBS@
! CCLIBS       = $(NSLIBS)
  
  # Install directories