[Javaprofiler-commits] CVS: library config.mk,1.32,1.33

[Marek P. <ma...@us...>]

Update of /cvsroot/javaprofiler/library
In directory usw-pr-cvs1:/tmp/cvs-serv698

Modified Files:
	config.mk 
Log Message:
config file for linux changed

Index: config.mk
===================================================================
RCS file: /cvsroot/javaprofiler/library/config.mk,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** config.mk	2002/01/27 15:17:24	1.32
--- config.mk	2002/01/28 13:06:38	1.33
***************
*** 20,24 ****
  
  CCC     = "$(COMPILER_PATH)/bin/g++"
! LD      = "$(COMPILER_PATH)/bin/g++"
  JAVAC   = "$(JAVA_PATH)/bin/javac"
  JAVAH   = "$(JAVA_PATH)/bin/javah"
--- 20,24 ----
  
  CCC     = "$(COMPILER_PATH)/bin/g++"
! LD      = "$(COMPILER_PATH)/bin/gcc"
  JAVAC   = "$(JAVA_PATH)/bin/javac"
  JAVAH   = "$(JAVA_PATH)/bin/javah"
***************
*** 37,41 ****
  # modify as needed
  
! DEFINES  = -DLINUX -DUSE_RAW_MONITORS -DUSE_ALLOCATOR -fpic
  
  INCLUDES = -I$(JAVA_PATH)/include -I$(JAVA_PATH)/include/linux
--- 37,41 ----
  # modify as needed
  
! DEFINES  = -DLINUX -DUSE_RAW_MONITORS -DUSE_ALLOCATOR
  
  INCLUDES = -I$(JAVA_PATH)/include -I$(JAVA_PATH)/include/linux
***************
*** 44,57 ****
  # choose one of following two possibilities
  
! FLAGS   = -O0 -D_DEBUG
  #FLAGS   = -O3 -DNDEBUG -fno-rtti -fno-exceptions
  
! LDFLAGS = $(DEFINES) -shared -o $(PROF_LIBRARY_NAME)
! LDLIBS  =
  
  LDFLAGS2 = $(DEFINES) -shared -o $(NATIVE_LIBRARY_NAME)
! LDLIBS2  =
  
! CPPFLAGS = -c $(FLAGS) $(DEFINES) $(INCLUDES)
  
  ################################################################
--- 44,67 ----
  # choose one of following two possibilities
  
! FLAGS   = -O0 -D_DEBUG 
  #FLAGS   = -O3 -DNDEBUG -fno-rtti -fno-exceptions
  
! # shared library dynamically or statically linked
! # with gcc and stdc++ libraries
! # choose one of following two possibilities
! 
! LDFLAGS = $(DEFINES) -shared -o $(PROF_LIBRARY_NAME) 
! LDLIBS  = -lstdc++
  
  LDFLAGS2 = $(DEFINES) -shared -o $(NATIVE_LIBRARY_NAME)
! LDLIBS2  = -lstdc++
! 
! #LDFLAGS = $(DEFINES) -shared -static -static-libgcc -o $(PROF_LIBRARY_NAME) 
! #LDLIBS  = $(COMPILER_PATH)/lib/libstdc++.a
! #
! #LDFLAGS2 = $(DEFINES) -shared -static -static-libgcc -o $(NATIVE_LIBRARY_NAME)
! #LDLIBS2  = $(COMPILER_PATH)/lib/libstdc++.a
  
! CPPFLAGS = -fpic -c $(FLAGS) $(DEFINES) $(INCLUDES)
  
  ################################################################