[Javaprofiler-commits] CVS: library Makefile,1.6,1.7 Makefile.rules,1.4,1.5 README,1.43,1.44 config.mk,1.40,1.41

[Pavel V. <va...@us...>]

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

Modified Files:
	Makefile Makefile.rules README config.mk 
Log Message:
library-src-02-09-10
by marek

Index: Makefile
===================================================================
RCS file: /cvsroot/javaprofiler/library/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Makefile	2 Sep 2001 15:22:59 -0000	1.6
--- Makefile	12 Sep 2002 15:43:56 -0000	1.7
***************
*** 7,8 ****
--- 7,9 ----
  
  src: src.dir.2 src2.dir.2
+ 

Index: Makefile.rules
===================================================================
RCS file: /cvsroot/javaprofiler/library/Makefile.rules,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Makefile.rules	2 Sep 2001 15:22:59 -0000	1.4
--- Makefile.rules	12 Sep 2002 15:43:56 -0000	1.5
***************
*** 62,63 ****
--- 62,85 ----
  src2.clean.2:
  	$(MAKE) $(MFLAGS) src2 clean
+ 
+ config_linux:
+ 	cp config/config_x86_linux_gcc302.mk config.mk
+ 
+ config_solaris:
+ 	cp config/config_sparc_sunos58_gcc302.mk config.mk
+ 
+ config_windows:
+ 	copy config\config_x86_win32_vc98.mk config.mk
+ 
+ linux:
+ 	$(MAKE) config_linux
+ 	$(MAKE) demo
+ 
+ solaris:
+ 	$(MAKE) config_solaris
+ 	$(MAKE) demo
+ 
+ windows:
+ 	$(MAKE) config_windows
+ 	$(MAKE) demo
+ 

Index: README
===================================================================
RCS file: /cvsroot/javaprofiler/library/README,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** README	23 Jul 2002 22:09:27 -0000	1.43
--- README	12 Sep 2002 15:43:56 -0000	1.44
***************
*** 220,223 ****
--- 220,225 ----
                  to "config.mk" (so, you replace original file)
  
+               OR run "nmake config_windows"
+ 
         5.1.2  modify new "config.mk" - paths etc.
  
***************
*** 240,243 ****
--- 242,248 ----
         5.2.1  same as 5.1.1
  
+               OR run "make config_linux"   (for linux)
+               OR run "make config_solaris" (for solaris)
+ 
         5.2.2  same as 5.1.2
  
***************
*** 256,264 ****
     5.3 Make rules
  
!        $(MAKE)         compile the whole source tree
!        $(MAKE) demo    compile sources and demos
!        $(MAKE) doc     generate project documentation only
!        $(MAKE) src     compile sources only
!        $(MAKE) clean   clean binary object files and docs (sources remain)
  
         where $(MAKE) is appropriate "make" program for given platform/compiler
--- 261,277 ----
     5.3 Make rules
  
!        $(MAKE)        compile the whole source tree
!        $(MAKE) demo   compile sources and demos
!        $(MAKE) doc    generate project documentation only (HTML, LATEX)
!        $(MAKE) src    compile sources only
!        $(MAKE) clean  clean binary object files and docs (sources remain)
! 
!        $(MAKE) config_windows   configure windows config.mk
!        $(MAKE) config_linux     configure linux config.mk
!        $(MAKE) config_solaris   configure solaris config.mk
! 
!        $(MAKE) windows  copy appropriate config.mk and compile
!        $(MAKE) linux    copy appropriate config.mk and compile
!        $(MAKE) solaris  copy appropriate config.mk and compile
  
         where $(MAKE) is appropriate "make" program for given platform/compiler

Index: config.mk
===================================================================
RCS file: /cvsroot/javaprofiler/library/config.mk,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** config.mk	23 Jul 2002 22:09:27 -0000	1.40
--- config.mk	12 Sep 2002 15:43:56 -0000	1.41
***************
*** 1,68 ****
! ################################################################
! # configuration file
! # Linux, x86, GNU C/C++ 3.0.2
! #
! # author: Marek Przeczek
! 
! PROF_LIBRARY_NAME        = profiler/libprofiler.so
! PROF_JAVA_INTERF_PACKAGE = IProf.jar
! 
! NATIVE_LIBRARY_NAME = libCommunShMem.so
! 
! ################################################################
! # PATHS
! # modify for your own system
! # do not use "\" as a last character in path definition
! 
! COMPILER_PATH = /home2/mm/gcc-3.0.2
! JAVA_PATH     = /home2/mm/j2sdk1.4.1
! DOXYGEN_PATH  = /home2/mm
! 
! CCC     = "$(COMPILER_PATH)/bin/g++"
! LD      = "$(COMPILER_PATH)/bin/g++"
! JAVAC   = "$(JAVA_PATH)/bin/javac"
! JAVAH   = "$(JAVA_PATH)/bin/javah"
! JAR     = "$(JAVA_PATH)/bin/jar"
! DOXYGEN = "$(DOXYGEN_PATH)/bin/doxygen"
! 
! ################################################################
! # SPECIAL SETTINGS
! # don't modify
! 
! DOXYGENFLAGS =
! JAVACFLAGS   = -classpath ../../src2/$(PROF_JAVA_INTERF_PACKAGE)
! 
! ################################################################
! # COMPILER/OS DEPENDENT OPTIONS
! # modify as needed
! 
! DEFINES  = -DLINUX -DUSE_RAW_MONITORS -DUSE_ALLOCATOR -DEXPERIMENTAL -fpic
! 
! INCLUDES = -I$(JAVA_PATH)/include -I$(JAVA_PATH)/include/linux
! 
! # debug or not ?
! # 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)
! 
! ################################################################
! # MAKEFILE
! 
! MFLAGS = -f Makefile -C
! 
! include dir.info
! 
! all: $(addsuffix .dir.2, $(DIRS)) $(addsuffix .o, $(FILES)) 
! 
! clean: $(addsuffix .clean.2, $(DIRS))
! 	rm -Rf $(CLEAN_FILES)
  
--- 1,2 ----
! all: