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

Diff for /pegasus/mak/program-unix.mak between version 1.36 and 1.38

version 1.36, 2007/01/17 23:41:05 version 1.38, 2007/04/23 07:44:33
Line 48 
Line 48 
  
 TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i) TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i)
  
 ifeq ($(OS_TYPE),windows)  
 S_OBJECTS = $(TMP_OBJECTS:.s=.obj)  
 CPP_OBJECTS = $(S_OBJECTS:.cpp=.obj)  
 OBJECTS = $(CPP_OBJECTS:.c=.obj)  
 else  
 S_OBJECTS = $(TMP_OBJECTS:.s=.o) S_OBJECTS = $(TMP_OBJECTS:.s=.o)
 CPP_OBJECTS = $(S_OBJECTS:.cpp=.o) CPP_OBJECTS = $(S_OBJECTS:.cpp=.o)
 OBJECTS = $(CPP_OBJECTS:.c=.o) OBJECTS = $(CPP_OBJECTS:.c=.o)
 endif  
  
 FULL_PROGRAM=$(BIN_DIR)/$(PROGRAM)$(EXE) FULL_PROGRAM=$(BIN_DIR)/$(PROGRAM)$(EXE)
  
Line 103 
Line 97 
 ##               This will set runtime library search path for ICU libraries to ${ICU_INSTALL}/lib ##               This will set runtime library search path for ICU libraries to ${ICU_INSTALL}/lib
 ## ##
      ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)      ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
         $(LINK_WRAPPER) $(CXX) $(PR_FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)          $(LINK_WRAPPER) $(CXX) $(PR_FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) > $(PROGRAM).llst
           @ $(ZIP) -m $(FULL_PROGRAM).llst.zip $(PROGRAM).llst
      else      else
       ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU       ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
         ifdef PEGASUS_HAS_MESSAGES         ifdef PEGASUS_HAS_MESSAGES


Legend:
Removed from v.1.36  
changed lines
  Added in v.1.38

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2