[QuantLibAddin-cvs] QuantLibAddin/Addins/Calc Makefile.am, 1.1, 1.1.2.1 qladdin.cpp, 1.2.2.1, 1.2.2.2

[Eric E. <eri...@us...>]

Update of /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19528

Modified Files:
      Tag: R000313f0-branch
	Makefile.am qladdin.cpp 
Log Message:
calc addin for linux

Index: Makefile.am
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** Makefile.am	19 May 2006 16:56:16 -0000	1.1
--- Makefile.am	4 Aug 2006 22:39:26 -0000	1.1.2.1
***************
*** 1,7 ****
  
  AM_CPPFLAGS = -I${top_srcdir} -I$(OFFICE_SDK_PATH)/include \
  -DUNX -DGCC -DLINUX -DCPPU_ENV=gcc3
  
! COMPONENT_NAME=QLA-Calc
  IDL_DIR=$(OFFICE_SDK_PATH)/idl
  DKREGISTRYNAME=$(OFFICE_PROGRAM_PATH)/types.rdb
--- 1,10 ----
+ OFFICE_SDK_PATH=/opt/openoffice.org2.0_sdk
+ OFFICE_PROGRAM_PATH=/usr/lib/openoffice.org2.0/program
  
+ # -DCPPU_ENV=gcc3
  AM_CPPFLAGS = -I${top_srcdir} -I$(OFFICE_SDK_PATH)/include \
  -DUNX -DGCC -DLINUX -DCPPU_ENV=gcc3
  
! COMPONENT_NAME=QuantLibAddinCalc
  IDL_DIR=$(OFFICE_SDK_PATH)/idl
  DKREGISTRYNAME=$(OFFICE_PROGRAM_PATH)/types.rdb
***************
*** 13,17 ****
  endif
  
! libQuantLibAddinCalc_la_LIBADD = ../../qla/libQuantLibAddin.la
  
  libQuantLibAddinCalc_la_LDFLAGS = \
--- 16,20 ----
  endif
  
! libQuantLibAddinCalc_la_LIBADD = ../../qlo/libQuantLibAddin.la
  
  libQuantLibAddinCalc_la_LDFLAGS = \
***************
*** 63,120 ****
  noinst_HEADERS = \
      calcutils.hpp \
!     calendar.hpp \
!     capfloor.hpp \
!     couponvectors.hpp \
!     date.hpp \
!     daycounter.hpp \
      exercise.hpp \
-     instruments.hpp \
-     interpolation.hpp \
-     mathf.hpp \
-     ohfunctions.hpp \
      options.hpp \
!     prices.hpp \
      processes.hpp \
      qla_all.hpp \
      qladdin.hpp \
      qldefs.hpp \
-     randomsequencegenerator.hpp \
-     schedule.hpp \
-     shortratemodels.hpp \
-     simpleswap.hpp \
-     swap.hpp \
-     termstructures.hpp \
      utilities.hpp \
!     volatilities.hpp \
!     xibor.hpp
  endif
  
  libQuantLibAddinCalc_la_SOURCES = \
      calcutils.cpp \
!     calendar.cpp \
!     capfloor.cpp \
!     couponvectors.cpp \
!     date.cpp \
!     daycounter.cpp \
      exercise.cpp \
      funcdef.cpp \
-     instruments.cpp \
-     interpolation.cpp \
-     mathf.cpp \
-     ohfunctions.cpp \
      options.cpp \
!     prices.cpp \
      processes.cpp \
      qladdin.cpp \
-     randomsequencegenerator.cpp \
-     schedule.cpp \
      session.cpp \
-     shortratemodels.cpp \
-     simpleswap.cpp \
-     swap.cpp \
-     termstructures.cpp \
      utilities.cpp \
!     volatilities.cpp \
!     xibor.cpp
  
  if BUILD_CALC
--- 66,95 ----
  noinst_HEADERS = \
      calcutils.hpp \
!     conversions.hpp \
      exercise.hpp \
      options.hpp \
!     payoffs.hpp \
!     pricingengines.hpp \
      processes.hpp \
      qla_all.hpp \
      qladdin.hpp \
      qldefs.hpp \
      utilities.hpp \
!     volatilities.hpp
  endif
  
  libQuantLibAddinCalc_la_SOURCES = \
      calcutils.cpp \
!     conversions.cpp \
      exercise.cpp \
      funcdef.cpp \
      options.cpp \
!     payoffs.cpp \
!     pricingengines.cpp \
      processes.cpp \
      qladdin.cpp \
      session.cpp \
      utilities.cpp \
!     volatilities.cpp
  
  if BUILD_CALC

Index: qladdin.cpp
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/qladdin.cpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** qladdin.cpp	2 Aug 2006 13:03:46 -0000	1.2.2.1
--- qladdin.cpp	4 Aug 2006 22:39:26 -0000	1.2.2.2
***************
*** 29,33 ****
  #include <rtl/uuid.h>
   
! #include <oh/objhandlerdefines.hpp> 
  
  #ifdef BOOST_MSVC
--- 29,33 ----
  #include <rtl/uuid.h>
   
! #include <oh/objhandler.hpp> 
  
  #ifdef BOOST_MSVC