[Teem-commit] teem/src GNUmakefile,1.53,1.54

[Gordon K. <kin...@us...>]

Update of /cvsroot/teem/teem/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16554

Modified Files:
	GNUmakefile 
Log Message:
added transitive linking for megalibs

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/teem/teem/src/GNUmakefile,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** GNUmakefile	22 Mar 2004 21:49:54 -0000	1.53
--- GNUmakefile	26 May 2004 02:29:46 -0000	1.54
***************
*** 59,62 ****
--- 59,63 ----
  $(checkArchDarwin)
  $(checkArchValid)
+ $(checkTeemDest)
  
  ## the architecture name may have two parts, ARCH and SUBARCH,
***************
*** 156,160 ****
    BDEST = $(TEEM_ROOT)/$(TEEM_ARCH)/bin
  else
-   IPATH += -I$(TEEM_ROOT)/include
    IDEST = $(TEEM_DEST)/include
    LDEST = $(TEEM_DEST)/lib
--- 157,160 ----
***************
*** 169,172 ****
--- 169,176 ----
  IPATH += -I$(IDEST)
  LPATH += -L$(LDEST)
+ ifneq (undefined,$(origin TEEM_DEST))
+   # we still need this for the teem*.h headers (such as teem32bit.h)
+   IPATH += -I$(TEEM_ROOT)/include
+ endif
  
  ## By giving a list of library extensions we care about, LIBEXTS determines
***************
*** 374,378 ****
  ifdef TEEM_SHEXT
  $(LDEST)/libteem.$(TEEM_SHEXT) : $(foreach lib,$(LIBS),$(call objs.dev,$(lib)))
! 	$(LD) -o $@ $(LDFLAGS) $(LPATH) $^
  endif
  unmegalibs:
--- 378,386 ----
  ifdef TEEM_SHEXT
  $(LDEST)/libteem.$(TEEM_SHEXT) : $(foreach lib,$(LIBS),$(call objs.dev,$(lib)))
! 	$(LD) -o $@ \
!           $(if $(TEEM_DEST),$(if $(SHARED_LINK_NAME),$(SHARED_LINK_NAME)$@,),) \
!           $(LDFLAGS) $(LPATH) $^ \
!           $(foreach X,$(xterns),$(TEEM_$(X)_LPATH)) \
!           $(foreach X,$(xterns),$($(X).LINK))
  endif
  unmegalibs: