(file) Return to common.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/common.mak between version 1.6 and 1.9

version 1.6, 2008/10/17 11:07:30 version 1.9, 2008/11/18 19:56:40
Line 35 
Line 35 
 ################################################################################ ################################################################################
  
 ifeq ($(OS_TYPE),vms) ifeq ($(OS_TYPE),vms)
       # Allow option lib/option syntax
       _P1 = $(foreach lib,$(LIBRARIES),$(word 1,$(subst /, ,$(lib))))
     FULL_LIBRARIES = $(addprefix $(LIB_DIR)/$(LIB_PREFIX), \     FULL_LIBRARIES = $(addprefix $(LIB_DIR)/$(LIB_PREFIX), \
         $(addsuffix $(LIB_SUFFIX), $(LIBRARIES)))          $(addsuffix $(LIB_SUFFIX), $(_P1)))
 else else
     ifeq ($(PEGASUS_USE_STATIC_LIBRARIES),true)     ifeq ($(PEGASUS_USE_STATIC_LIBRARIES),true)
         _P1 = $(addprefix $(LIB_DIR)/$(LIB_PREFIX), $(LIBRARIES))         _P1 = $(addprefix $(LIB_DIR)/$(LIB_PREFIX), $(LIBRARIES))
Line 49 
Line 51 
 endif endif
  
 ifeq ($(OS),zos) ifeq ($(OS),zos)
       ifeq ($(PEGASUS_USE_STATIC_LIBRARIES),true)
           _P1 = $(addprefix $(LIB_DIR)/$(LIB_PREFIX), $(LIBRARIES))
           _P2 = $(addsuffix $(STATLIB_SUFFIX), $(_P1))
           _P3 = $(addsuffix $(DYNLIB_SUFFIX), $(_P1))
           _P4 = $(shell echo $(_P2) $(_P3))
           DYNAMIC_LIBRARIES = $(foreach linkfile, $(_P4), $(wildcard $(linkfile)))
           FULL_LIBRARIES = $(foreach linkfile, $(_P4), $(wildcard $(linkfile)))
       else
     DYNAMIC_LIBRARIES = $(addprefix $(LIB_DIR)/$(LIB_PREFIX), \     DYNAMIC_LIBRARIES = $(addprefix $(LIB_DIR)/$(LIB_PREFIX), \
         $(addsuffix $(DYNLIB_SUFFIX), $(LIBRARIES)))         $(addsuffix $(DYNLIB_SUFFIX), $(LIBRARIES)))
       endif
 else else
     DYNAMIC_LIBRARIES = $(addprefix -l, $(LIBRARIES))     DYNAMIC_LIBRARIES = $(addprefix -l, $(LIBRARIES))
 endif endif


Legend:
Removed from v.1.6  
changed lines
  Added in v.1.9

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2