[Javaprofiler-commits] CVS: library config.mk,1.19,1.20

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

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

Modified Files:
	config.mk 
Log Message:
no message

Index: config.mk
===================================================================
RCS file: /cvsroot/javaprofiler/library/config.mk,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** config.mk	2001/08/25 23:27:43	1.19
--- config.mk	2001/08/26 00:11:32	1.20
***************
*** 1,12 ****
  ################################################################
  # configuration file
! # SunOS 5.8, SPARC, GNU C/C++ 3.0 (using GNU make 3.7x)
  #
  # author: Marek Przeczek
  
! PROF_LIBRARY_NAME        = profiler/libprofiler.so
  PROF_JAVA_INTERF_PACKAGE = IProf.jar
  
! NATIVE_LIBRARY_NAME = libCommunShMem.so
  
  ################################################################
--- 1,12 ----
  ################################################################
  # configuration file
! # Microsoft Windows NT 4.0/2000, x86, Borland C/C++ 5.5.1
  #
  # author: Marek Przeczek
  
! PROF_LIBRARY_NAME        = profiler.dll
  PROF_JAVA_INTERF_PACKAGE = IProf.jar
  
! NATIVE_LIBRARY_NAME = CommunShMem.dll
  
  ################################################################
***************
*** 15,29 ****
  # do not use "\" as a last character in path definition
  
! COMPILER_PATH = /home/mprz7483/BIG/gcc-3.0
! JAVA_PATH     = /home/mprz7483/BIG/j2sdk1_3_1
! DOCPP_PATH    = /home/mprz7483/BIG/doc++-3.4.7
! 
! 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"
! JDOC  = "$(JAVA_PATH)/bin/javadoc"
! DOCPP = "$(DOCPP_PATH)/docxx"
  
  ################################################################
--- 15,29 ----
  # do not use "\" as a last character in path definition
  
! COMPILER_PATH = C:\Borland\BCC55
! JAVA_PATH     = C:\jdk1.3.1
! DOCPP_PATH    = C:\doc++-3.4.7
! 
! CCC   = "$(COMPILER_PATH)\Bin\bcc32"
! LD    = "$(COMPILER_PATH)\Bin\bcc32"
! JAVAC = "$(JAVA_PATH)\bin\javac"
! JAVAH = "$(JAVA_PATH)\bin\javah"
! JAR   = "$(JAVA_PATH)\bin\jar"
! JDOC  = "$(JAVA_PATH)\bin\javadoc"
! DOCPP = "$(DOCPP_PATH)\docxx"
  
  ################################################################
***************
*** 38,56 ****
  # modify as needed
  
! DEFINES  = -DSUNOS -fpic -D_REENTRANT
  
! INCLUDES = -I$(JAVA_PATH)/include -I$(JAVA_PATH)/include/solaris
  
  # 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  = -lsocket -lpthread -lthread -lnsl
  
! LDFLAGS2 = $(DEFINES) -shared -o $(NATIVE_LIBRARY_NAME)
! LDLIBS2  = -lsocket
  
  CPPFLAGS = -c $(FLAGS) $(DEFINES) $(INCLUDES)
--- 38,58 ----
  # modify as needed
  
! DEFINES  = -DWIN32 -tWD -tWM -VM -Vd \
!            -w-inl -w-pia -w-rch -w-par -w-aus -w-csu
  
! INCLUDES = -I$(JAVA_PATH)\include -I$(JAVA_PATH)\include\win32 \
!            -I$(COMPILER_PATH)\Include
  
  # debug or not ?
  # choose one of following two possibilities
  
! FLAGS   = -Od -D_DEBUG
! #FLAGS   = -O -O2 -DNDEBUG -6 -f- -k- -Oc -Oi -OS -Ov -v- -x- -RT-
  
! LDFLAGS = $(DEFINES) -L$(COMPILER_PATH)\Lib -L$(COMPILER_PATH)\Lib\PSDK
! LDLIBS  = wsock32.lib winmm.lib
  
! LDFLAGS2 = $(LDFLAGS)
! LDLIBS2  = wsock32.lib
  
  CPPFLAGS = -c $(FLAGS) $(DEFINES) $(INCLUDES)
***************
*** 59,68 ****
  # 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)
--- 61,73 ----
  # MAKEFILE
  
! MFLAGS = -f Makefile.mak
  
! !include dir.info
  
! all:
! 	for %i in (xxx $(DIRS))  do if not %i == xxx $(MAKE) $(MFLAGS) %i.dir
! 	for %i in (xxx $(FILES)) do if not %i == xxx $(MAKE) $(MFLAGS) %i.obj
  
! clean:
! 	for %i in (xxx $(CLEAN_FILES)) do if exist %i del %i
! 	for %i in (xxx $(DIRS)) do if not %i == xxx $(MAKE) $(MFLAGS) %i.clean