pegasus/mak/config.mak - diff

Return to config.mak CVS log

Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/config.mak between version 1.153 and 1.155

version 1.153, 2007/09/12 21:30:58

version 1.155, 2007/11/02 19:38:23

Line 119

#############################################################################

ifdef PEGASUS_TEST_VALGRIND_LOG

BIN_DIR = $(HOME_DIR)/bin_exe

VALGRIND_SCRIPT_BIN_DIR = $(HOME_DIR)/bin

else

BIN_DIR = $(HOME_DIR)/bin

endif

LIB_DIR = $(HOME_DIR)/lib

# l10n

Line 224

Line 229

# option of the mof compiler needs to be set.

# *****

ifdef PEGASUS_CIM_SCHEMA

ifndef PEGASUS_CIM_SCHEMA

PEGASUS_CIM_SCHEMA=CIM2131

endif

CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)

ifeq ($(findstring $(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA))),1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 271 28),)

CIM_SCHEMA_VER=

else

CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))

endif

else

CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM2131

CIM_SCHEMA_VER=

endif

ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR)))

ALLOW_EXPERIMENTAL = -aE

Line 1035

Line 1039

PEGASUS_JAVA_JAR = jar

PEGASUS_JAVA_INTERPRETER = java

endif

# Disable client timeouts when we're doing a valgrind build

ifdef PEGASUS_TEST_VALGRIND_LOG

DEFINES += -DPEGASUS_DISABLE_CLIENT_TIMEOUT

endif

Legend:

Removed from v.1.153
changed lines
	Added in v.1.155

No CVS admin address has been configured