[libimdb-commit] CVS: libimdb constants.mk,1.1,1.2

[Jerry V. <jve...@us...>]

Update of /cvsroot/libimdb/libimdb
In directory sc8-pr-cvs1:/tmp/cvs-serv13910

Modified Files:
	constants.mk 
Log Message:
added JLOG_CPPFLAGS, fixed JAVADOC -link location and added JLOG_PEDANTIC_MPATROL


Index: constants.mk
===================================================================
RCS file: /cvsroot/libimdb/libimdb/constants.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** constants.mk	16 Jun 2003 04:18:37 -0000	1.1
--- constants.mk	21 Aug 2003 20:34:42 -0000	1.2
***************
*** 72,81 ****
  endif
  
- # WHOAMI_LINUX   := /usr/bin/whoami
- # WHOAMI_CYGWIN  := /bin/whoami
- # WHOAMI = $(WHOAMI_$(BUILD_OS))
- #
- # USER_NAME := $(shell $(WHOAMI))
- 
  CLASSPATH_SEP_CYGWIN  :=;
  CLASSPATH_SEP_LINUX   :=:
--- 72,75 ----
***************
*** 102,106 ****
  #createClassPath=$(subst $(space),$(CLASSPATH_SEP),$(strip $(1)))
  
- 
  AR_CYGWIN  := /bin/ar
  AR_LINUX   := /usr/bin/ar
--- 96,99 ----
***************
*** 261,264 ****
--- 254,267 ----
  CCFLAGS =$(filter-out $(CCFLAGS_DROP),$(CCFLAGS_$(CXX_COMPILER)) $(CCFLAGS_$(CXX_COMPILER)_BUILD_$(BUILD_OS)) $(CCFLAGS_$(CXX_COMPILER)_TARGET_$(TARGET_OS)) $(CCFLAGS_$(OBJS_TYPE)))
  
+ # The following settings are specific to the src/lib/libjlog library usage
+ # but are defined here for convenience. @see src/include/jlog/jlog.h for details.
+ #
+ # valid values are 'ARGUMENTS' 'LOCATION' and 'DISABLE'
+ #
+ JLOG_CPPFLAGS_LINUX  :=-DJLOG_ENTER_DETAIL=ARGUMENTS -DJLOG_SUCCESS_DETAIL=LOCATION -DJLOG_FAILURE_DETAIL=LOCATION -DJLOG_DEBUG_DETAIL=ARGUMENTS
+ JLOG_CPPFLAGS_CYGWIN :=-DJLOG_ENTER_DETAIL=ARGUMENTS -DJLOG_SUCCESS_DETAIL=LOCATION -DJLOG_FAILURE_DETAIL=LOCATION -DJLOG_DEBUG_DETAIL=ARGUMENTS
+ 
+ JLOG_CPPFLAGS=$(JLOG_CPPFLAGS_$(TARGET_OS))
+ 
  CPPFLAGS_gcc :=
  
***************
*** 267,271 ****
  #   $(error CPPFLAGS_$(CC_COMPILER)) was left undefined, fix constants.mk)
  #endif
! CPPFLAGS =$(filter-out $(CPPFLAGS_DROP),$(CPPFLAGS_$(CC_COMPILER)) -D$(BUILD_OS) -D$(BUILD_OS_VERSION))
  
  DATE_CYGWIN   := /bin/date
--- 270,274 ----
  #   $(error CPPFLAGS_$(CC_COMPILER)) was left undefined, fix constants.mk)
  #endif
! CPPFLAGS =$(filter-out $(CPPFLAGS_DROP),$(CPPFLAGS_$(CC_COMPILER)) -D$(BUILD_OS) -D$(BUILD_OS_VERSION) -DTARGET_OS="$(TARGET_OS)") $(JLOG_CPPFLAGS)
  
  DATE_CYGWIN   := /bin/date
***************
*** 393,397 ****
  LD_DYNAMIC_FLAGS_ld_BUILD_LINUX    =-shared -h $(basename $(@F))
  
! LD_DYNAMIC_FLAGS_gxx_TARGET_MINGW  :=-mno-cygwin
  
  LD_DYNAMIC_FLAGS=$(LD_DYNAMIC_FLAGS_$(LD_DYNAMIC_BASENAME)_BUILD_$(BUILD_OS)) \
--- 396,400 ----
  LD_DYNAMIC_FLAGS_ld_BUILD_LINUX    =-shared -h $(basename $(@F))
  
! LD_DYNAMIC_FLAGS_gcc_TARGET_MINGW  :=-mno-cygwin
  
  LD_DYNAMIC_FLAGS=$(LD_DYNAMIC_FLAGS_$(LD_DYNAMIC_BASENAME)_BUILD_$(BUILD_OS)) \
***************
*** 467,471 ****
  
  # PERL_INCLUDE is used for building swig projects providing perl interfaces
! PERL_INCLUDE         :=$(shell $(PERL) -e 'use Config; print "$$Config{archlib}/CORE";')
  
  RSH_CYGWIN      := /bin/rsh
--- 470,475 ----
  
  # PERL_INCLUDE is used for building swig projects providing perl interfaces
! PERL_INCLUDE       :=$(shell $(PERL) -e 'use Config; print "$$Config{archlib}/CORE";')
! PERL_LIBS          :=$(shell $(PERL) -e 'use Config; print "$$Config{archlib}/CORE/libperl.a $$Config{libs}";')
  
  RSH_CYGWIN      := /bin/rsh
***************
*** 502,506 ****
  # - requires JAVA_COMPILER be one of:
  #   SUNJava14
- #   Do *not* use Jikes 1.13 -- it is broken.
  #
  ifeq "$(JAVA_COMPILER)" "SUNJava14"
--- 506,509 ----
***************
*** 605,613 ****
  JAVA_SRCS_SOURCEPATH        :=$(JAVA_SRCS_SOURCEPATH_$(BUILD_OS))
  
! JAVADOC_FLAGS_13	:= -link http://web.interdynamix.com/~release/java/jdk1.3/docs/api
! JAVADOC_FLAGS_14	:= -link http://web.interdynamix.com/~release/java/jdk1.4/docs/api -source 1.4
! 
! JAVADOC_FLAGS_SUNJava14		:= $(JAVADOC_FLAGS_14)
! JAVADOC_FLAGS_JIKES118		:= $(JAVADOC_FLAGS_13)
  
  JAVADOC_FLAGS = -use -private -splitIndex -version \
--- 608,612 ----
  JAVA_SRCS_SOURCEPATH        :=$(JAVA_SRCS_SOURCEPATH_$(BUILD_OS))
  
! JAVADOC_FLAGS_14	:= -link http://java.sun.com/j2se/1.4.1/docs/api
  
  JAVADOC_FLAGS = -use -private -splitIndex -version \
***************
*** 656,659 ****
--- 655,659 ----
  endif
  
+ # define how dynamic libraries are to be named
  MYDYNAMIC_CYGWIN  =$(BUILD_DIR)/$(LIB_BASE).$(SO)
  MYDYNAMIC_LINUX   =$(BUILD_DIR)/lib$(LIB_BASE).$(SO).$(LIB_VERSION)
***************
*** 735,741 ****
--- 735,746 ----
  # placing a value in MPATROL enables the use of
  # mpatrol to check memory allocation.
+ # optional JLOG_PEDANTIC_MPATROL supported in jlog.h
+ # @todo - should we support a static link option ?
  ifdef MPATROL
      ifeq "$(BUILD_OS)" "LINUX"
  	CPPFLAGS+=-DMPATROL
+         ifdef JLOG_PEDANTIC_MPATROL
+ 	    CPPFLAGS+=-DJLOG_PEDANTIC_MPATROL
+         endif
  	LIBS_LINK+=/usr/local/lib/libmpatrol.$(SO) -lbfd -liberty -ldl
      else
***************
*** 743,747 ****
      endif
  endif
- 
  
  # don't put the dependency file in $(BUILD_DIR), because some projects
--- 748,751 ----