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

Diff for /pegasus/mak/program-vms.mak between version 1.6 and 1.7

version 1.6, 2008/04/11 19:05:10 version 1.7, 2008/11/18 19:56:40
Line 52 
Line 52 
  
 EXE_OUTPUT =$(FULL_PROGRAM) EXE_OUTPUT =$(FULL_PROGRAM)
  
   ifeq ($(PEGASUS_USE_STATIC_LIBRARIES),true)
       EXTRA_LIBRARIES += -L$(OPENSSL_LIB) -lssl$$libssl_shr -lssl$$libcrypto_shr32
       LIBRARIES += vms/include=vms_crtl_init
   endif
   
   ifeq (,$(findstring libpegrepository, $(LIBRARIES)))
       EXTRA_LIBRARIES += -Llibz -lz
   endif
   
 ifdef VMSSHARE ifdef VMSSHARE
     EXE_VMSOUTPUT =/sysexe/share=$(FULL_VMSPROGRAM)     EXE_VMSOUTPUT =/sysexe/share=$(FULL_VMSPROGRAM)
 else else
Line 62 
Line 71 
 OPT = $(OPT_VMSDIRA)]$(PROGRAM)/opt OPT = $(OPT_VMSDIRA)]$(PROGRAM)/opt
 VMSPROGRAM = YES VMSPROGRAM = YES
  
   # GSMATCH and IDENTIFICATION
   
   LINKER_OPTIONS += \
       GSMATCH=$(PEGASUS_VMS_LINKER_GSMATCH) \
       IDENTIFICATION=$(PEGASUS_VMS_LINKER_IDENT)
  
 $(FULL_PROGRAM): $(OBJ_DIR)/target $(BIN_DIR)/target $(OPT_DIR)/target \ $(FULL_PROGRAM): $(OBJ_DIR)/target $(BIN_DIR)/target $(OPT_DIR)/target \
     $(OBJECTS) $(FULL_LIBRARIES) $(ERROR)     $(OBJECTS) $(FULL_LIBRARIES) $(ERROR)
  
 ifdef OBJECTS_IN_OPTIONFILE ifdef OBJECTS_IN_OPTIONFILE
         @ take $(PLATFORM_VMSDIRA)]vms_create_optfile.com "$(OPT_VMSDIRA)]" \          @ take $(PLATFORM_VMSDIRA)]vms_create_optfile.com \
             "$(VMSROOT)[src$(VMSDIR)]" "$(PROGRAM)" "$(strip $(LIBRARIES))" \              "$(PROGRAM)" "$(strip $(LIBRARIES))" "$(strip $(EXTRA_LIBRARIES))" \
             "$(SHARE_COPY)" "$(VMS_VECTOR)" "$(SOURCES)" "$(OBJ_VMSDIRA)]"              "$(strip $(VMS_VECTOR))" "$(strip $(LINKER_OPTIONS))" \
               "$(SOURCES)" "$(OBJ_VMSDIRA)]"
         cxxlink$(LFLAGS)$(EXE_VMSOUTPUT)/reposit=$(CXXREPOSITORY_VMSROOT) \         cxxlink$(LFLAGS)$(EXE_VMSOUTPUT)/reposit=$(CXXREPOSITORY_VMSROOT) \
             $(OPT) $(DLLOPT)              $(foreach lib,$(SYS_LIBS),$(lib),) $(OPT) $(DLLOPT)
 else else
         @ take $(PLATFORM_VMSDIRA)]vms_create_optfile.com "$(OPT_VMSDIRA)]" \          @ take $(PLATFORM_VMSDIRA)]vms_create_optfile.com \
             "$(VMSROOT)[src$(VMSDIR)]" "$(PROGRAM)" "$(strip $(LIBRARIES))" \              "$(PROGRAM)" "$(strip $(LIBRARIES))" "$(strip $(EXTRA_LIBRARIES))" \
             "$(SHARE_COPY)" "$(VMS_VECTOR)" "$(OBJ_VMSDIRA)]"              "$(strip $(VMS_VECTOR))" "$(strip $(LINKER_OPTIONS))"
         cxxlink$(LFLAGS)$(EXE_VMSOUTPUT)/reposit=$(CXXREPOSITORY_VMSROOT) \         cxxlink$(LFLAGS)$(EXE_VMSOUTPUT)/reposit=$(CXXREPOSITORY_VMSROOT) \
             $(VMSOBJECTS) $(OPT) $(DLLOPT)              $(VMSOBJECTS) $(foreach lib,$(SYS_LIBS),$(lib),) $(OPT) $(DLLOPT)
 endif endif
         @ $(TOUCH) $(FULL_VMSPROGRAM)         @ $(TOUCH) $(FULL_VMSPROGRAM)
 ifdef SHARE_COPY ifdef SHARE_COPY


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

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2