(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.11 and 1.34.32.1

version 1.11, 2003/06/06 16:29:07 version 1.34.32.1, 2007/10/31 08:24:42
Line 1 
Line 1 
   #//%2006////////////////////////////////////////////////////////////////////////
   #//
   #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
   #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
   #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
   #// IBM Corp.; EMC Corporation, The Open Group.
   #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
   #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; Symantec Corporation; The Open Group.
   #//
   #// Permission is hereby granted, free of charge, to any person obtaining a copy
   #// of this software and associated documentation files (the "Software"), to
   #// deal in the Software without restriction, including without limitation the
   #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
   #// sell copies of the Software, and to permit persons to whom the Software is
   #// furnished to do so, subject to the following conditions:
   #//
   #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
   #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED
   #// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
   #// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
   #// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
   #// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
   #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   #//
   #//==============================================================================
 INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES) INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES)
  
   ifndef LINK_RPATH
       LINK_RPATH = -Xlinker -rpath
   endif
   
   LINK_DEST_LIB = -Xlinker $(PEGASUS_DEST_LIB_DIR)
   
   LINK_LIB_DIR = -Xlinker $(LIB_DIR)
   
   LINK_ICU = -Xlinker ${ICU_INSTALL}/lib
   
   ifndef LINK_RPATH_LINK
       LINK_RPATH_LINK = -Xlinker -rpath-link
   endif
   
   
   
 TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i) TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i)
  
 OBJECTS = $(TMP_OBJECTS:.cpp=.o)  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)
   CPP_OBJECTS = $(S_OBJECTS:.cpp=.o)
   OBJECTS = $(CPP_OBJECTS:.c=.o)
   endif
  
 FULL_PROGRAM=$(BIN_DIR)/$(PROGRAM)$(EXE) FULL_PROGRAM=$(BIN_DIR)/$(PROGRAM)$(EXE)
  
 EXE_OUTPUT = $(EXE_OUT) $(FULL_PROGRAM) EXE_OUTPUT = $(EXE_OUT) $(FULL_PROGRAM)
  
   ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
       ifdef PEGASUS_HAS_MESSAGES
           ifdef ICU_ROOT
               ifdef ICU_INSTALL
                 FLAGS += -L${ICU_INSTALL}/lib
                 PRFLAGS += -L${ICU_INSTALL}/lib
                 SYS_LIBS += ${ICU_INSTALL}/lib/libicui18n.x ${ICU_INSTALL}/lib/libicuuc.x
               endif
           endif
       endif
   else
   ifdef PEGASUS_HAS_MESSAGES
       ifdef ICU_ROOT
           ifdef ICU_INSTALL
             SYS_LIBS += -L${ICU_INSTALL}/lib -licui18n -licuuc
           endif
       endif
   endif
   endif
   
 ifdef PEGASUS_PURIFY ifdef PEGASUS_PURIFY
     PUREOPTIONS = -follow-child-processes=yes -locking=no \     PUREOPTIONS = -follow-child-processes=yes -locking=no \
         -always-use-cache-dir -cache-dir=$(PURIFY_TMP)/cache \         -always-use-cache-dir -cache-dir=$(PURIFY_TMP)/cache \
Line 25 
Line 99 
 ## DYNAMIC_LIBRARIES is defined appropriately in libraries.mak and Makefile ## DYNAMIC_LIBRARIES is defined appropriately in libraries.mak and Makefile
 ## files ## files
 ## ##
   ## ICU_INSTALL - Specifies the directory path where the ICU lib directory is located.
   ##               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) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)          $(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
          ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU)        ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
         $(LINK_WRAPPER) $(CXX) $(FLAGS) -Xlinker -rpath -XLinker -Xlinker $(LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)          ifdef PEGASUS_HAS_MESSAGES
             ifdef ICU_ROOT
               ifdef ICU_INSTALL
                 ifdef  PEGASUS_USE_RELEASE_DIRS
                   $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_DEST_LIB) $(LINK_RPATH_LINK) $(LINK_LIB_DIR) $(LINK_RPATH) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
                 else
                   $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_LIB_DIR) $(LINK_RPATH) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
                 endif
               endif
             endif
      else      else
          ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU)            ifdef  PEGASUS_USE_RELEASE_DIRS
         $(LINK_WRAPPER) $(CXX) $(FLAGS) -Xlinker -rpath -XLinker -Xlinker $(LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)              $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_DEST_LIB) $(LINK_RPATH_LINK) $(LINK_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
             else
               $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
             endif
           endif
          else          else
              ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)              ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)
         $(LINK_WRAPPER) $(CXX) -Wl,-brtl -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)           ifdef  PEGASUS_USE_RELEASE_DIRS
              ifdef PEGASUS_HAS_MESSAGES
                ifdef ICU_ROOT
                  ifdef ICU_INSTALL
                    $(LINK_WRAPPER) $(CXX) -Wl,-brtl -blibpath:/usr/linux/lib:/usr/lib:/lib:$(ICU_INSTALL)/lib -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
                  endif
                endif
              else
                $(LINK_WRAPPER) $(CXX) -Wl,-brtl -blibpath:/usr/linux/lib:/usr/lib:/lib -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
              endif
              else              else
         $(LINK_WRAPPER) $(CXX) $(FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)             $(LINK_WRAPPER) $(CXX) -Wl,-brtl -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
                  endif                  endif
          else
           $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
              endif              endif
          endif          endif
      endif      endif
Line 47 
Line 148 
         $(TOUCH) $(FULL_PROGRAM)         $(TOUCH) $(FULL_PROGRAM)
         @ $(ECHO)         @ $(ECHO)
 else else
         $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXE_OUTPUT) $(OBJECTS) $(FULL_LIBRARIES) $(SYS_LIBS)          $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(EXE_OUTPUT) $(OBJECTS) $(FULL_LIBRARIES) $(SYS_LIBS)
 endif endif
         $(TOUCH) $(FULL_PROGRAM)         $(TOUCH) $(FULL_PROGRAM)
         @ $(ECHO)         @ $(ECHO)

Legend:
Removed from v.1.11  
changed lines
  Added in v.1.34.32.1
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2