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.44 and 1.45

version 1.44, 2008/03/11 19:39:49

version 1.45, 2008/05/19 17:51:11

Line 53

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

else

ifdef PEGASUS_HAS_MESSAGES

ifdef ICU_ROOT

ifdef ICU_INSTALL

SYS_LIBS += -L${ICU_INSTALL}/lib -licui18n -licuuc

endif

ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU

ifdef PEGASUS_USE_RELEASE_DIRS

EXTRA_LINK_FLAGS += $(LINK_RPATH) $(LINK_DEST_LIB) $(LINK_RPATH_LINK) $(LINK_LIB_DIR)

Line 110

Line 90

## This will set runtime library search path for ICU libraries to ${ICU_INSTALL}/lib

ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)

$(LINK_WRAPPER) $(CXX) $(PR_FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) > $(PROGRAM).llst

$(LINK_WRAPPER) $(CXX) $(PR_FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES) > $(PROGRAM).llst

@ $(ZIP) -a -m $(FULL_PROGRAM).llst.zip $(PROGRAM).llst

else

ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU

Legend:

Removed from v.1.44
changed lines
	Added in v.1.45

No CVS admin address has been configured