(file) Return to jmpi.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / ProviderManager2 / JMPI

Diff for /pegasus/src/Pegasus/ProviderManager2/JMPI/jmpi.mak between version 1.24 and 1.25

version 1.24, 2006/11/02 17:00:24 version 1.25, 2006/11/08 20:31:51
Line 47 
Line 47 
    PEGASUS_JVM=sun    PEGASUS_JVM=sun
 endif endif
 ifeq ($(PEGASUS_JVM),sun) ifeq ($(PEGASUS_JVM),sun)
    JAVALIBS=$(JAVA_SDK)/jre/lib/i386     JAVALIBS=$(JAVA_SDK)/jre/lib/$(PEGASUS_JAVA_ARCH)
    EXTRA_INCLUDES = $(SYS_INCLUDES) -I$(JAVA_SDK)/include -I$(JAVA_SDK)/include/linux    EXTRA_INCLUDES = $(SYS_INCLUDES) -I$(JAVA_SDK)/include -I$(JAVA_SDK)/include/linux
    EXTRA_LIBRARIES += -L$(JAVALIBS)/native_threads -L$(JAVALIBS)/client -ljvm -lhpi -lcrypt -lpegclient     EXTRA_LIBRARIES += -L$(JAVALIBS)/native_threads -L$(JAVALIBS)/client -ljvm -lhpi -lcrypt
 endif endif
 ifeq ($(PEGASUS_JVM),ibm) ifeq ($(PEGASUS_JVM),ibm)
    JAVALIBS=$(JAVA_SDK)/jre/bin    JAVALIBS=$(JAVA_SDK)/jre/bin
    EXTRA_INCLUDES = $(SYS_INCLUDES) -I$(JAVA_SDK)/include    EXTRA_INCLUDES = $(SYS_INCLUDES) -I$(JAVA_SDK)/include
    EXTRA_LIBRARIES += -L$(JAVALIBS)/classic/ -L$(JAVALIBS)/ -ljvm -lhpi -lcrypt -lpegclient     EXTRA_LIBRARIES += -L$(JAVALIBS)/classic/ -L$(JAVALIBS)/ -ljvm -lhpi -lcrypt
 endif endif
 ifeq ($(PEGASUS_JVM),bea) ifeq ($(PEGASUS_JVM),bea)
    JAVALIBS=$(JAVA_SDK)/jre/lib/i386     JAVALIBS=$(JAVA_SDK)/jre/lib/$(PEGASUS_JAVA_ARCH)
    EXTRA_INCLUDES = $(SYS_INCLUDES) -I$(JAVA_SDK)/include/ -I$(JAVA_SDK)/include/linux/    EXTRA_INCLUDES = $(SYS_INCLUDES) -I$(JAVA_SDK)/include/ -I$(JAVA_SDK)/include/linux/
    EXTRA_LIBRARIES += -L$(JAVALIBS)/ -L$(JAVALIBS)/jrockit/ -L$(JAVALIBS)/native_threads/ -ljvm -lhpi -lcrypt -lpegclient     EXTRA_LIBRARIES += -L$(JAVALIBS)/ -L$(JAVALIBS)/jrockit/ -L$(JAVALIBS)/native_threads/ -ljvm -lhpi -lcrypt
 endif endif
 ifeq ($(PEGASUS_JVM),gcj) ifeq ($(PEGASUS_JVM),gcj)
    EXTRA_LIBRARIES += -lgcj     JAVALIBS=$(JAVA_SDK)/jre/lib/$(PEGASUS_JAVA_ARCH)
      EXTRA_LIBRARIES += -L$(JAVALIBS)/client -ljvm
 endif endif
 endif endif
 endif endif


Legend:
Removed from v.1.24  
changed lines
  Added in v.1.25

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2