r22078 - gnucash/trunk/src - [Cutecash] Follow-up for r22075: Removal of "calculation" module in CMake.

[Christian Stimming]

Author: cstim
Date: 2012-03-13 09:18:51 -0400 (Tue, 13 Mar 2012)
New Revision: 22078
Trac: http://svn.gnucash.org/trac/changeset/22078

Modified:
   gnucash/trunk/src/CMakeLists.txt
   gnucash/trunk/src/app-utils/CMakeLists.txt
   gnucash/trunk/src/gnc/CMakeLists.txt
Log:
[Cutecash] Follow-up for r22075: Removal of "calculation" module in CMake.

Modified: gnucash/trunk/src/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/CMakeLists.txt	2012-03-12 19:32:56 UTC (rev 22077)
+++ gnucash/trunk/src/CMakeLists.txt	2012-03-13 13:18:51 UTC (rev 22078)
@@ -88,7 +88,6 @@
 ADD_SUBDIRECTORY (gnc-module)
 ADD_SUBDIRECTORY (engine)
 ADD_SUBDIRECTORY (backend/xml)
-ADD_SUBDIRECTORY (calculation)
 ADD_SUBDIRECTORY (app-utils)
 ADD_SUBDIRECTORY (import-export)
 IF (WITH_SQL)

Modified: gnucash/trunk/src/app-utils/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/app-utils/CMakeLists.txt	2012-03-12 19:32:56 UTC (rev 22077)
+++ gnucash/trunk/src/app-utils/CMakeLists.txt	2012-03-13 13:18:51 UTC (rev 22078)
@@ -14,7 +14,7 @@
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/libqof/qof) # for qof.h
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/gnc-module) # for gnc-glib-utils.h
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/core-utils) # for gnc-glib-utils.h
-INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/calculation) # for finproto.h
+INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/app-utils/calculation) # for finproto.h
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/engine) # for gnc-engine.h
 INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/src/engine) # for swig-runtime.h
 INCLUDE_DIRECTORIES (${CMAKE_CURRENT_SOURCE_DIR}) # for <option-util.h>
@@ -39,6 +39,10 @@
   gnc-ui-balances.h
   guile-util.h
   option-util.h
+  calculation/finvar.h
+  calculation/finproto.h
+  calculation/fin_spl_protos.h
+  calculation/fin_static_proto.h
 )
 
 # Command to generate the swig-app-utils.c wrapper file
@@ -46,6 +50,8 @@
 GNC_ADD_SWIG_COMMAND (${SWIG_APP_UTILS_C} ${CMAKE_CURRENT_SOURCE_DIR}/app-utils.i)
 
 SET (app_utils_SOURCES
+  calculation/expression_parser.c
+  calculation/fin.c
   QuickFill.c
   file-utils.c
   gfec.c

Modified: gnucash/trunk/src/gnc/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/gnc/CMakeLists.txt	2012-03-12 19:32:56 UTC (rev 22077)
+++ gnucash/trunk/src/gnc/CMakeLists.txt	2012-03-13 13:18:51 UTC (rev 22078)
@@ -106,7 +106,7 @@
 
 TARGET_LINK_LIBRARIES (cutecash gnc-backend-xml)
 TARGET_LINK_LIBRARIES (cutecash gnc-import)
-TARGET_LINK_LIBRARIES (cutecash app-utils calculation)
+TARGET_LINK_LIBRARIES (cutecash app-utils)
 IF (WITH_SQL)
   TARGET_LINK_LIBRARIES (cutecash gnc-backend-dbi gnc-backend-sql)
   TARGET_LINK_LIBRARIES (cutecash ${LIBDBI_LIBRARY})