(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.12.2.1 and 1.25.4.1

version 1.12.2.1, 2006/02/10 16:12:48 version 1.25.4.1, 2007/01/19 19:12:14
Line 34 
Line 34 
  
 include $(ROOT)/mak/config.mak include $(ROOT)/mak/config.mak
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU)  ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
      JAVALIBS=$(JAVA_SDK)/jre/lib/
      EXTRA_INCLUDES = $(SYS_INCLUDES) -I$(JAVA_SDK)/include -I$(JAVA_SDK)/include/win32
      EXTRA_LIBRARIES += $(JAVA_SDK)/lib/jvm.lib
   else
   ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
      SYS_INCLUDES += -I${JAVA_SDK}/include
      EXTRA_LIBRARIES += ${JAVA_SDK}/bin/classic/libjvm.x
   else
 ifndef PEGASUS_JVM ifndef PEGASUS_JVM
    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)
      JAVALIBS=$(JAVA_SDK)/jre/lib/$(PEGASUS_JAVA_ARCH)
      EXTRA_LIBRARIES += -L$(JAVALIBS)/client -ljvm
 endif endif
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)  
    JAVALIBS=$(JAVA_SDK)/jre/lib/  
    EXTRA_INCLUDES = $(SYS_INCLUDES) -I$(JAVA_SDK)/include -I$(JAVA_SDK)/include/win32  
    EXTRA_LIBRARIES += $(JAVA_SDK)/lib/jvm.lib  
 endif endif
   
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)  
    SYS_INCLUDES += -I${JAVA_SDK}/include  
    EXTRA_LIBRARIES += ${JAVA_SDK}/bin/classic/libjvm.x  
 endif endif
  
 LOCAL_DEFINES = -DPEGASUS_SERVER_INTERNAL -DPEGASUS_INTERNALONLY  LOCAL_DEFINES = -DPEGASUS_JMPIPM_INTERNAL -DPEGASUS_INTERNALONLY
  
 ifeq ($(OS_TYPE),vms) ifeq ($(OS_TYPE),vms)
    EXTRA_LIBRARIES += java\$jvm_shr
  VMS_VECTOR = PegasusCreateProviderManager  VMS_VECTOR = PegasusCreateProviderManager
 endif endif
  
 LIBRARY = JMPIProviderManager LIBRARY = JMPIProviderManager
  
 LIBRARIES = \ LIBRARIES = \
     CMPIProviderManager \  
     pegprovidermanager \     pegprovidermanager \
           pegconfig \
           pegwql \
           pegquerycommon \
     pegprovider \     pegprovider \
     pegclient \     pegclient \
     pegcommon     pegcommon
  
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)  
 LIBRARIES += \  
         pegclient \  
         pegconfig  
 endif  
   
   
 SOURCES = \ SOURCES = \
         JMPIProviderManagerMain.cpp \         JMPIProviderManagerMain.cpp \
         JMPIProviderManager.cpp \         JMPIProviderManager.cpp \
Line 95 
Line 94 
         JMPIProvider.cpp \         JMPIProvider.cpp \
         JMPIImpl.cpp         JMPIImpl.cpp
  
 include $(ROOT)/mak/library.mak  include $(ROOT)/mak/dynamic-library.mak
  
   ifeq ($(OS_TYPE),vms)
   all:    $(FULL_PROGRAM)
   else
 all:    $(FULL_LIB) all:    $(FULL_LIB)
   endif
   
   repository tests poststarttests:

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