pegasus/mak/program-unix.mak - diff

Return to program-unix.mak CVS log

Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/program-unix.mak between version 1.16 and 1.17

version 1.16, 2004/03/04 21:59:19

version 1.17, 2004/04/19 16:54:27

Line 43

ifdef PEGASUS_HAS_MESSAGES

ifdef ICU_ROOT

ifdef ICU_INSTALL

ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS

$(LINK_WRAPPER) $(CXX) $(FLAGS) -Xlinker -rpath-link -Xlinker $(LIB_DIR) -Xlinker -rpath -Xlinker ${ICU_INSTALL}/lib -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)

else

$(LINK_WRAPPER) $(CXX) $(FLAGS) -Xlinker -rpath -Xlinker $(LIB_DIR) -Xlinker -rpath -Xlinker ${ICU_INSTALL}/lib -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)

endif

else

ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS

$(LINK_WRAPPER) $(CXX) $(FLAGS) -Xlinker -rpath-link -Xlinker $(LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)

else

$(LINK_WRAPPER) $(CXX) $(FLAGS) -Xlinker -rpath -Xlinker $(LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)

endif

else

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)

Legend:

Removed from v.1.16
changed lines
	Added in v.1.17

No CVS admin address has been configured