(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.19 and 1.32

version 1.19, 2006/09/20 21:03:36 version 1.32, 2009/05/05 09:01:38
Line 1 
Line 1 
 #//%2006////////////////////////////////////////////////////////////////////////  #//%LICENSE////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  #// Licensed to The Open Group (TOG) under one or more contributor license
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  #// agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  #// this work for additional information regarding copyright ownership.
 #// IBM Corp.; EMC Corporation, The Open Group.  #// Each contributor licenses this file to you under the OpenPegasus Open
 #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  #// Source License; you may not use this file except in compliance with the
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  #// License.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 #// EMC Corporation; VERITAS Software Corporation; The Open Group.  
 #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 #// EMC Corporation; Symantec Corporation; The Open Group.  
 #// #//
 #// Permission is hereby granted, free of charge, to any person obtaining a copy  #// Permission is hereby granted, free of charge, to any person obtaining a
 #// of this software and associated documentation files (the "Software"), to  #// copy of this software and associated documentation files (the "Software"),
 #// deal in the Software without restriction, including without limitation the  #// to deal in the Software without restriction, including without limitation
 #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  #// the rights to use, copy, modify, merge, publish, distribute, sublicense,
 #// sell copies of the Software, and to permit persons to whom the Software is  #// and/or sell copies of the Software, and to permit persons to whom the
 #// furnished to do so, subject to the following conditions:  #// Software is furnished to do so, subject to the following conditions:
 #// #//
 #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  #// The above copyright notice and this permission notice shall be included
 #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  #// in all copies or substantial portions of the Software.
 #// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 #// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 #// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 #// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 #// #//
 #//==============================================================================  #// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   #// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   #// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   #// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   #// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   #// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   #// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   #//
   #//////////////////////////////////////////////////////////////////////////
 ROOT = ../../../.. ROOT = ../../../..
  
 DIR = Pegasus/ProviderManager2/JMPI DIR = Pegasus/ProviderManager2/JMPI
  
 include $(ROOT)/mak/config.mak include $(ROOT)/mak/config.mak
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU)  ifeq ($(OS_TYPE),windows)
      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)/$(PEGASUS_JAVA_TYPE) -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
   ifeq ($(PEGASUS_JVM),ibm64)
      JAVALIBS=$(JAVA_SDK)/jre/bin
      EXTRA_INCLUDES = $(SYS_INCLUDES) -I$(JAVA_SDK)/include
      EXTRA_LIBRARIES += -L$(JAVALIBS)/j9vm/ -L$(JAVALIBS)/classic/ -L$(JAVALIBS)/ -ljvm
 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)/$(PEGASUS_JAVA_TYPE) -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_JMPIPM_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
  
Line 76 
Line 83 
 LIBRARIES = \ LIBRARIES = \
         pegprovidermanager \         pegprovidermanager \
         pegconfig \         pegconfig \
         pegprovider \  
         pegclient \  
         pegwql \         pegwql \
         pegquerycommon \         pegquerycommon \
           pegprovider \
           pegclient \
           peggeneral \
         pegcommon         pegcommon
  
 SOURCES = \ SOURCES = \
Line 90 
Line 98 
         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: repository tests poststarttests:

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