Restructure the src directory

It is split into
- /libgnucash (for the non-gui bits)
- /gnucash (for the gui)
- /common (misc source files used by both)
- /bindings (currently only holds python bindings)

This is the first step in restructuring the code. It will need much
more fine tuning later on.

CMakeLists.txt

@@ -34,7 +34,7 @@ SET (GNUCASH_RESAVE_VERSION "19920")
 SET(GETTEXT_PACKAGE "gnucash")
 
 # Extra cmake macros
-SET (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/src/cmake_modules;${CMAKE_MODULE_PATH}")
+SET (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/common/cmake_modules;${CMAKE_MODULE_PATH}")
 # CMake does a non-recursive build that puts the final build product directories in the build root. Some code needs to know this.
 
 INCLUDE (MacroAppendForeach)
@@ -161,7 +161,7 @@ ENDIF(WIN32)
 FIND_PACKAGE(PkgConfig REQUIRED)
 
 # The default FindPkgConfig.make code has a bug in how the setting of PKG_CONFIG_PATH is handled.
-# The src/cmake_modules/GncFindPkgConfig.cmake file overrides a couple of macros in FindPkgConfig to fix.
+# The common/cmake_modules/GncFindPkgConfig.cmake file overrides a couple of macros in FindPkgConfig to fix.
 
 INCLUDE (GncFindPkgConfig)
 
@@ -556,16 +556,16 @@ INSTALL(FILES ${gnucash_DOCS} DESTINATION share/doc/gnucash)
 SET (GETTEXT_PACKAGE "gnucash")
 
 IF (WIN32)
-  IF (MINGW)
-    SET (HAVE_SCANF_LLD 1)
-  ELSE ()
-    SET (HAVE_SCANF_I64D 1)
-  ENDIF ()
-  SET (HAVE_HTMLHELPW 1)
+IF (MINGW)
+SET (HAVE_SCANF_LLD 1)
+ELSE ()
+SET (HAVE_SCANF_I64D 1)
+ENDIF ()
+SET (HAVE_HTMLHELPW 1)
 ENDIF (WIN32)
 
 IF (NOT WIN32)
-  CHECK_INCLUDE_FILES (X11/Xlib.h HAVE_X11_XLIB_H)
+CHECK_INCLUDE_FILES (X11/Xlib.h HAVE_X11_XLIB_H)
 ENDIF (NOT WIN32)
 
 CHECK_INCLUDE_FILES (dirent.h HAVE_DIRENT_H)
@@ -589,99 +589,92 @@ CHECK_INCLUDE_FILES (utmp.h HAVE_UTMP_H)
 CHECK_INCLUDE_FILES (wctype.h HAVE_WCTYPE_H)
 
 IF (NOT DISABLE_NLS)
-  SET(ENABLE_NLS 1)
+SET(ENABLE_NLS 1)
 ENDIF(NOT DISABLE_NLS)
 
 IF (ENABLE_BINRELOC)
-  IF (UNIX OR MINGW)
-    SET(BR_PTHREAD 1)
-  ENDIF(UNIX OR MINGW)
+IF (UNIX OR MINGW)
+SET(BR_PTHREAD 1)
+ENDIF(UNIX OR MINGW)
 ENDIF(ENABLE_BINRELOC)
 
 IF (UNIX OR MINGW)
-  SET (HAVE_BIND_TEXTDOMAIN_CODESET 1)
-  SET (HAVE_DCGETTEXT 1)
-  SET (HAVE_GETTEXT 1)
-  SET (HAVE_GETTIMEOFDAY 1)
-  SET (HAVE_GUILE 1)
-  SET (HAVE_LIBM 1)
-  SET (HAVE_MEMCPY 1)
-  SET (STDC_HEADERS 1)
-  SET (_ALL_SOURCE 1)
-  SET (_GNU_SOURCE 1)
-  SET (_POSIX_PTHREAD_SEMANTICS 1)
-  SET (_TANDEM_SOURCE 1)
-  SET (__EXTENSIONS__ 1)
+SET (HAVE_BIND_TEXTDOMAIN_CODESET 1)
+SET (HAVE_DCGETTEXT 1)
+SET (HAVE_GETTEXT 1)
+SET (HAVE_GETTIMEOFDAY 1)
+SET (HAVE_GUILE 1)
+SET (HAVE_LIBM 1)
+SET (HAVE_MEMCPY 1)
+SET (STDC_HEADERS 1)
+SET (_ALL_SOURCE 1)
+SET (_GNU_SOURCE 1)
+SET (_POSIX_PTHREAD_SEMANTICS 1)
+SET (_TANDEM_SOURCE 1)
+SET (__EXTENSIONS__ 1)
 ENDIF (UNIX OR MINGW)
 
 IF (UNIX)
-  SET (HAVE_CHOWN 1)
-  SET (HAVE_DLERROR 1)
-  SET (HAVE_DLSYM 1)
-  SET (HAVE_GETHOSTID 1)
-  SET (HAVE_GETHOSTNAME 1)
-  SET (HAVE_GETPPID 1)
-  SET (HAVE_GETUID 1)
-  SET (HAVE_GMTIME_R 1)
-  SET (HAVE_LANGINFO_D_FMT 1)
-  SET (HAVE_LC_MESSAGES 1)
-  SET (HAVE_LIBPTHREAD 1)
-  SET (HAVE_LINK 1)
-  SET (HAVE_LOCALTIME_R 1)
-  SET (HAVE_PTHREAD_MUTEX_INIT 1)
-  SET (HAVE_PTHREAD_PRIO_INHERIT 1)
-  SET (HAVE_SCANF_LLD 1)
-  SET (HAVE_SETENV 1)
-  SET (HAVE_STPCPY 1)
-  SET (HAVE_STRFMON 1)
-  SET (HAVE_STRPTIME 1)
-  SET (HAVE_STRUCT_TM_GMTOFF 1)
-  SET (HAVE_TIMEGM 1)
-  SET (HAVE_TOWUPPER 1)
-  SET (GNC_PLATFORM_POSIX 1)
+SET (HAVE_CHOWN 1)
+SET (HAVE_DLERROR 1)
+SET (HAVE_DLSYM 1)
+SET (HAVE_GETHOSTID 1)
+SET (HAVE_GETHOSTNAME 1)
+SET (HAVE_GETPPID 1)
+SET (HAVE_GETUID 1)
+SET (HAVE_GMTIME_R 1)
+SET (HAVE_LANGINFO_D_FMT 1)
+SET (HAVE_LC_MESSAGES 1)
+SET (HAVE_LIBPTHREAD 1)
+SET (HAVE_LINK 1)
+SET (HAVE_LOCALTIME_R 1)
+SET (HAVE_PTHREAD_MUTEX_INIT 1)
+SET (HAVE_PTHREAD_PRIO_INHERIT 1)
+SET (HAVE_SCANF_LLD 1)
+SET (HAVE_SETENV 1)
+SET (HAVE_STPCPY 1)
+SET (HAVE_STRFMON 1)
+SET (HAVE_STRPTIME 1)
+SET (HAVE_STRUCT_TM_GMTOFF 1)
+SET (HAVE_TIMEGM 1)
+SET (HAVE_TOWUPPER 1)
+SET (GNC_PLATFORM_POSIX 1)
 ENDIF (UNIX)
 
 IF (WIN32)
-  SET (GNC_PLATFORM_WINDOWS 1)
+SET (GNC_PLATFORM_WINDOWS 1)
 ENDIF (WIN32)
 
 IF (APPLE)
 # FIXME: HANDLE gtk-mac-integration-gtk2
-  SET(GNC_PLATFORM_DARWIN 1)
-  SET(GNC_PLATFORM_OSX 1)
-  SET(PLATFORM_OSX 1)
-  SET(HAVE_OSX_KEYCHAIN 1)
+SET(GNC_PLATFORM_DARWIN 1)
+SET(GNC_PLATFORM_OSX 1)
+SET(PLATFORM_OSX 1)
+SET(HAVE_OSX_KEYCHAIN 1)
 ENDIF(APPLE)
 
 IF(GLIB2_VERSION VERSION_GREATER 2.46.0 OR GLIB2_VERSION VERSION_EQUAL 2.46.0)
-  SET(HAVE_GLIB_2_46 1)
+SET(HAVE_GLIB_2_46 1)
 ENDIF()
 
 IF(DISABLE_DEPRECATED_GNOME)
-  SET(GNOME_DISABLE_DEPRECATED 1)
+SET(GNOME_DISABLE_DEPRECATED 1)
 ENDIF(DISABLE_DEPRECATED_GNOME)
 
 IF(DISABLE_DEPRECATED_GTK)
-  SET(GTK_DISABLE_DEPRECATED 1)
-  SET(GDK_DISABLE_DEPRECATED 1)
-  SET(GDK_PIXMAP_DISABLE_DEPRECATED 1)
+SET(GTK_DISABLE_DEPRECATED 1)
+SET(GDK_DISABLE_DEPRECATED 1)
+SET(GDK_PIXMAP_DISABLE_DEPRECATED 1)
 ENDIF(DISABLE_DEPRECATED_GTK)
 
 IF(DISABLE_DEPRECATED_GLIB)
-  SET(G_DISABLE_DEPRECATED 1)
+SET(G_DISABLE_DEPRECATED 1)
 ENDIF(DISABLE_DEPRECATED_GLIB)
 
 ADD_DEFINITIONS (-DHAVE_CONFIG_H)
 
-SET (CONFIG_H ${CMAKE_CURRENT_BINARY_DIR}/src/config.h)
-CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.cmake.in ${CONFIG_H})
-
-IF (BUILDING_FROM_VCS)
-  SET (SWIG_RUNTIME_H ${CMAKE_CURRENT_BINARY_DIR}/src/swig-runtime.h)
-ELSE()
-  SET (SWIG_RUNTIME_H ${CMAKE_CURRENT_SOURCE_DIR}/src/swig-runtime.h)
-ENDIF()
-
+SET (CONFIG_H ${CMAKE_CURRENT_BINARY_DIR}/common/config.h)
+CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/common/config.h.cmake.in ${CONFIG_H})
 
 SET(SCHEME_INSTALLED_SOURCE_DIR ${CMAKE_INSTALL_PREFIX}/share/gnucash/scm)
 SET(SCHEME_INSTALLED_CACHE_DIR ${CMAKE_INSTALL_PREFIX}/lib/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION})
@@ -694,7 +687,12 @@ ADD_SUBDIRECTORY (lib)
 ADD_SUBDIRECTORY (macros)
 ADD_SUBDIRECTORY (packaging)
 ADD_SUBDIRECTORY (po)
-ADD_SUBDIRECTORY (src)
+ADD_SUBDIRECTORY (common)
+ADD_SUBDIRECTORY (libgnucash)
+IF (WITH_GNUCASH)
+  ADD_SUBDIRECTORY (gnucash)
+ENDIF (WITH_GNUCASH)
+ADD_SUBDIRECTORY (bindings)
 ADD_SUBDIRECTORY (test-templates)
 ADD_SUBDIRECTORY (util)
 
@@ -709,26 +707,27 @@ ADD_SUBDIRECTORY(cmake)
 SET(PACKAGE_PREFIX "${PACKAGE}-${PACKAGE_VERSION}")
 SET(DIST_FILE "${PACKAGE_PREFIX}.tar")
 
-SET(gnucash_DIST_local ${gnucash_DOCS} ChangeLog.2015 ChangeLog.2016
+SET(toplvl_DIST_local ${gnucash_DOCS} ChangeLog.2015 ChangeLog.2016
   CMakeLists.txt configure.ac Makefile.am make-gnucash-potfiles.in README)
 
 IF(BUILDING_FROM_VCS AND AUTOTOOLS_IN_DIST)
-  SET(gnucash_DIST_local ${gnucash_DIST_local} autogen.sh)
+  SET(toplvl_DIST_local ${toplvl_DIST_local} autogen.sh)
 ENDIF()
 
-SET_LOCAL_DIST(gnucash_DIST ${gnucash_DIST_local})
+SET_LOCAL_DIST(toplvl_DIST ${toplvl_DIST_local})
 
 # Each subdirectory is responsible for reporting its list of distribution files to its parent, up to here.
 #
 # Leaf directories use the SET_DIST_LIST() function to report their distribution files. See
-# the bottom of src/app-utils/test/CMakeLists.txt for an example.
+# the bottom of libgnucash/app-utils/test/CMakeLists.txt for an example.
 #
 # A non leaf directories uses the SET_LOCAL_DIST() function to specify its distribution files local that dir,
 # then uses a (SET ${foo_DIST} ${locals....} PARENT_SCOPE) command to report up. See the bottom of
-# src/app-utils/CMakeLists.txt for an example of this.
+# libgnucash/app-utils/CMakeLists.txt for an example of this.
 
-SET(ALL_DIST ${accounts_DIST} ${checks_DIST} ${cmake_DIST} ${doc_DIST} ${lib_DIST} ${macros_DIST} ${packaging_DIST}
-        ${po_DIST} ${src_DIST} ${gnucash_DIST} ${test_templates_DIST} ${util_DIST})
+SET(ALL_DIST ${accounts_DIST} ${bindings_DIST} ${checks_DIST} ${cmake_DIST} ${common_DIST}
+    ${doc_DIST} ${gnucash_DIST} ${lib_DIST} ${libgnucash_DIST} ${macros_DIST} ${packaging_DIST}
+    ${po_DIST} ${test_templates_DIST} ${toplvl_DIST} ${util_DIST})
 
 
 IF (BUILDING_FROM_VCS)
@@ -738,7 +737,7 @@ ELSE()
   IF(AUTOTOOLS_IN_DIST)
     # Include autotools generated file in the dist
     LIST(APPEND ALL_DIST compile config.guess config.sub configure depcomp install-sh missing
-            src/doc/design/mdate-sh src/doc/design/texinfo.tex)
+            libgnucash/doc/design/mdate-sh libgnucash/doc/design/texinfo.tex)
     IF (EXISTS ${CMAKE_SOURCE_DIR}/test-driver)  # test-driver only created for automake 1.12+.
       LIST(APPEND ALL_DIST test-driver)
     ENDIF()
@@ -757,14 +756,14 @@ ENDFOREACH()
 
 ADD_CUSTOM_COMMAND(OUTPUT ${DIST_FILE}.gz ${DIST_FILE}.bz2
         COMMAND ${CMAKE_COMMAND}
-           -D CMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/src/cmake_modules
+           -D CMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/common/cmake_modules
            -D PACKAGE_PREFIX=${PACKAGE_PREFIX}
            -D GNUCASH_SOURCE_DIR=${CMAKE_SOURCE_DIR}
            -D BUILD_SOURCE_DIR=${BUILD_SOURCE_DIR}
            -D BUILDING_FROM_VCS=${BUILDING_FROM_VCS}
            -D SHELL=${SHELL}
            -D AUTOTOOLS_IN_DIST=${AUTOTOOLS_IN_DIST}
-           -P ${CMAKE_SOURCE_DIR}/src/cmake_modules/MakeDist.cmake
+           -P ${CMAKE_SOURCE_DIR}/common/cmake_modules/MakeDist.cmake
 
         DEPENDS
           ${ALL_DIST} ${DIST_GENERATED_FILES2} gnc-vcs-info iso-4217-c gnc-warnings-c build-config-scm gnucash-design-info ChangeLog
@@ -774,13 +773,13 @@ ADD_CUSTOM_TARGET(dist DEPENDS ${DIST_FILE}.gz ${DIST_FILE}.bz2)
 
 ADD_CUSTOM_TARGET(distcheck DEPENDS dist
         COMMAND ${CMAKE_COMMAND}
-            -D CMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/src/cmake_modules
+            -D CMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/common/cmake_modules
             -D CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
             -D PACKAGE_PREFIX=${PACKAGE_PREFIX}
             -D CMAKE_C_FLAGS=${CMAKE_C_FLAGS}
             -D CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
             -D AUTOTOOLS_IN_DIST=${AUTOTOOLS_IN_DIST}
-            -P ${CMAKE_SOURCE_DIR}/src/cmake_modules/MakeDistCheck.cmake
+            -P ${CMAKE_SOURCE_DIR}/common/cmake_modules/MakeDistCheck.cmake
         )
 
 

Makefile.am

@@ -1,5 +1,9 @@
-
-SUBDIRS = . doc lib src packaging po accounts checks
+if GNUCASH_ENABLE_GUI
+  GNUCASH_SUBDIR = gnucash
+else
+  GNUCASH_SUBDIR =
+endif
+SUBDIRS = . doc lib common libgnucash bindings ${GNUCASH_SUBDIR} packaging po accounts checks
 
 GNC_CTAGS_FILE = @GNC_CTAGS_FILE@
 GNC_ETAGS_FILE = @GNC_ETAGS_FILE@
@@ -125,9 +129,9 @@ DISTCLEANFILES = \
   make-gnucash-potfiles po/.intltool-merge-cache
 
 cscope.files:
-	find src lib -name '*.[ch]' > cscope.files
+	find bindings common libgnucash gnucash lib -name '*.[ch]' > cscope.files
 if GNUCASH_SEPARATE_BUILDDIR
-	find ${srcdir}/src ${srcdir}/lib -name '*.[ch]' >> cscope.files
+	find ${srcdir}/bindings ${srcdir}/common ${srcdir}/libgnucash ${srcdir}/gnucash ${srcdir}/lib -name '*.[ch]' >> cscope.files
 endif
 
 ${srcdir}/cscope.out: cscope.files
@@ -243,10 +247,10 @@ endif
 ASTYLE = /usr/bin/astyle
 .PHONY: indent
 indent:
-	$(ASTYLE) --indent=spaces=4 --brackets=break --suffix=none `find ${srcdir}/src -name '*.[hc]'`
+	$(ASTYLE) --indent=spaces=4 --brackets=break --suffix=none `find ${srcdir}/{bindings,common,libgnucash,gnucash} -name '*.[hc]'`
 # Use the following line if you've got astyle-1.24, but don't use
 # --pad=oper with astyle 1.22 as it will reformat e.g. "return +1;" in
 # a very ugly way.
-#	$(ASTYLE) --indent=spaces=4 --brackets=break --pad-oper -pad-header --suffix=none `find ${srcdir}/src -name '*.[hc]'`
+#	$(ASTYLE) --indent=spaces=4 --brackets=break --pad-oper -pad-header --suffix=none `find ${srcdir}/{bindings,common,libgnucash,gnucash} -name '*.[hc]'`
 	@echo "### GnuCash development hint: The above command might have re-indented much more files than what you intended. Please commit only those which you really want to have changed, and revert the changes in the others so that other devevelopers do not have unnecessary merge conflicts. Thanks! ###"
 

bindings/CMakeLists.txt

@@ -0,0 +1,4 @@
+ADD_SUBDIRECTORY(python)
+
+SET_LOCAL_DIST(bindings_DIST_local CMakeLists.txt Makefile.am)
+SET(bindings_DIST ${bindings_DIST_local} ${python_bindings_DIST} PARENT_SCOPE)

bindings/Makefile.am

@@ -0,0 +1,6 @@
+if WITH_PYTHON
+    PYTHON_DIR = python
+endif
+SUBDIRS = ${PYTHON_DIR}
+
+EXTRA_DIST = CMakeLists.txt

bindings/python/CMakeLists.txt

@@ -4,43 +4,43 @@ ADD_SUBDIRECTORY(tests)
 IF (BUILDING_FROM_VCS)
   SET(SWIG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/gnucash_core.i ${CMAKE_CURRENT_SOURCE_DIR}/timespec.i)
   SET(GNUCASH_CORE_C_INCLUDES
-    ${CMAKE_BINARY_DIR}/src/config.h
-    ${CMAKE_SOURCE_DIR}/src/engine/qofsession.h
-    ${CMAKE_SOURCE_DIR}/src/engine/qofbook.h
-    ${CMAKE_SOURCE_DIR}/src/engine/qofbackend.h
-    ${CMAKE_SOURCE_DIR}/src/engine/qoflog.h
-    ${CMAKE_SOURCE_DIR}/src/engine/qofutil.h
-    ${CMAKE_SOURCE_DIR}/src/engine/qofid.h
-    ${CMAKE_SOURCE_DIR}/src/engine/guid.h
-    ${CMAKE_SOURCE_DIR}/src/gnc-module/gnc-module.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gnc-engine.h
-    ${CMAKE_SOURCE_DIR}/src/engine/Transaction.h
-    ${CMAKE_SOURCE_DIR}/src/engine/Split.h
-    ${CMAKE_SOURCE_DIR}/src/engine/Account.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gnc-commodity.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gnc-lot.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gnc-numeric.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncCustomer.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncEmployee.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncVendor.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncAddress.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncBillTerm.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncOwner.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncInvoice.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncJob.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncEntry.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncTaxTable.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gncIDSearch.h
-    ${CMAKE_SOURCE_DIR}/src/engine/gnc-pricedb.h
-    ${CMAKE_SOURCE_DIR}/src/app-utils/gnc-prefs-utils.h
+    ${CONFIG_H}
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/qofsession.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/qofbook.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/qofbackend.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/qoflog.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/qofutil.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/qofid.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/guid.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module/gnc-module.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gnc-engine.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/Transaction.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/Split.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/Account.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gnc-commodity.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gnc-lot.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gnc-numeric.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncCustomer.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncEmployee.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncVendor.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncAddress.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncBillTerm.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncOwner.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncInvoice.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncJob.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncEntry.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncTaxTable.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gncIDSearch.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/gnc-pricedb.h
+    ${CMAKE_SOURCE_DIR}/libgnucash/app-utils/gnc-prefs-utils.h
   )
 
   SET (SWIG_GNUCASH_CORE_C ${CMAKE_CURRENT_BINARY_DIR}/gnucash_core.c)
 
   GNC_ADD_SWIG_PYTHON_COMMAND (swig-gnucash-core ${SWIG_GNUCASH_CORE_C}
     ${SWIG_FILES}
-    ${CMAKE_SOURCE_DIR}/src/base-typemaps.i
-    ${CMAKE_SOURCE_DIR}/src/engine/engine-common.i
+    ${CMAKE_SOURCE_DIR}/common/base-typemaps.i
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine/engine-common.i
     ${GNUCASH_CORE_C_INCLUDES}
   )
 ELSE()
@@ -50,14 +50,14 @@ ENDIF()
 IF(WITH_PYTHON)
 
   SET(gnucash_core_c_INCLUDE_DIRS
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_SOURCE_DIR}/src/engine
-    ${CMAKE_SOURCE_DIR}/src/gnome-utils
-    ${CMAKE_SOURCE_DIR}/src/app-utils
-    ${CMAKE_SOURCE_DIR}/src/gnc-module
-    ${CMAKE_SOURCE_DIR}/src/gnome
-    ${CMAKE_SOURCE_DIR}/src/core-utils
-    ${CMAKE_SOURCE_DIR}/src/gnc-module
+    ${CMAKE_SOURCE_DIR}/libgnucash
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine
+    ${CMAKE_SOURCE_DIR}/gnucash/gnome-utils
+    ${CMAKE_SOURCE_DIR}/libgnucash/app-utils
+    ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
+    ${CMAKE_SOURCE_DIR}/gnucash/gnome
+    ${CMAKE_SOURCE_DIR}/libgnucash/core-utils
+    ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
     ${GLIB_INCLUDE_DIRS}
     ${PYTHON_INCLUDE_DIRS}
   )

bindings/python/Makefile.am

@@ -17,14 +17,14 @@ _gnucash_core_c_la_SOURCES = \
 _gnucash_core_c_la_CPPFLAGS = \
   $(PYTHON_CPPFLAGS) \
   $(GLIB_CFLAGS) \
-  -I$(top_srcdir)/src  \
-  -I$(top_srcdir)/src/engine \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module
+  -I$(top_srcdir)/common  \
+  -I$(top_srcdir)/libgnucash/engine \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/gnucash/gnome \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module
 
 # Suppress all warnings for now, but we really only need to -Wno-implicit
 AM_CFLAGS = -w
@@ -33,46 +33,46 @@ _gnucash_core_c_la_LDFLAGS = -avoid-version -module
 
 _gnucash_core_c_la_LIBADD = \
   ${GLIB_LIBS} \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la
 if BUILDING_FROM_VCS
 _gnucash_core_c_includes= \
 	${top_builddir}/config.h \
-	${top_srcdir}/src/engine/qofsession.h \
-	${top_srcdir}/src/engine/qofbook.h \
-	${top_srcdir}/src/engine/qofbackend.h \
-	${top_srcdir}/src/engine/qoflog.h \
-	${top_srcdir}/src/engine/qofutil.h \
-	${top_srcdir}/src/engine/qofid.h \
-	${top_srcdir}/src/engine/guid.h \
-	${top_srcdir}/src/gnc-module/gnc-module.h \
-	${top_srcdir}/src/engine/gnc-engine.h \
-	${top_srcdir}/src/engine/Transaction.h \
-	${top_srcdir}/src/engine/Split.h \
-	${top_srcdir}/src/engine/Account.h \
-	${top_srcdir}/src/engine/gnc-commodity.h \
-	${top_srcdir}/src/engine/gnc-lot.h \
-	${top_srcdir}/src/engine/gnc-numeric.h \
-	${top_srcdir}/src/engine/gncCustomer.h \
-	${top_srcdir}/src/engine/gncEmployee.h \
-	${top_srcdir}/src/engine/gncVendor.h \
-	${top_srcdir}/src/engine/gncAddress.h \
-	${top_srcdir}/src/engine/gncBillTerm.h \
-	${top_srcdir}/src/engine/gncOwner.h \
-	${top_srcdir}/src/engine/gncInvoice.h \
-	${top_srcdir}/src/engine/gncJob.h \
-	${top_srcdir}/src/engine/gncEntry.h \
-	${top_srcdir}/src/engine/gncTaxTable.h \
-	${top_srcdir}/src/engine/gncIDSearch.h \
-	${top_srcdir}/src/engine/gnc-pricedb.h \
-	${top_srcdir}/src/app-utils/gnc-prefs-utils.h
+	${top_srcdir}/libgnucash/engine/qofsession.h \
+	${top_srcdir}/libgnucash/engine/qofbook.h \
+	${top_srcdir}/libgnucash/engine/qofbackend.h \
+	${top_srcdir}/libgnucash/engine/qoflog.h \
+	${top_srcdir}/libgnucash/engine/qofutil.h \
+	${top_srcdir}/libgnucash/engine/qofid.h \
+	${top_srcdir}/libgnucash/engine/guid.h \
+	${top_srcdir}/libgnucash/gnc-module/gnc-module.h \
+	${top_srcdir}/libgnucash/engine/gnc-engine.h \
+	${top_srcdir}/libgnucash/engine/Transaction.h \
+	${top_srcdir}/libgnucash/engine/Split.h \
+	${top_srcdir}/libgnucash/engine/Account.h \
+	${top_srcdir}/libgnucash/engine/gnc-commodity.h \
+	${top_srcdir}/libgnucash/engine/gnc-lot.h \
+	${top_srcdir}/libgnucash/engine/gnc-numeric.h \
+	${top_srcdir}/libgnucash/engine/gncCustomer.h \
+	${top_srcdir}/libgnucash/engine/gncEmployee.h \
+	${top_srcdir}/libgnucash/engine/gncVendor.h \
+	${top_srcdir}/libgnucash/engine/gncAddress.h \
+	${top_srcdir}/libgnucash/engine/gncBillTerm.h \
+	${top_srcdir}/libgnucash/engine/gncOwner.h \
+	${top_srcdir}/libgnucash/engine/gncInvoice.h \
+	${top_srcdir}/libgnucash/engine/gncJob.h \
+	${top_srcdir}/libgnucash/engine/gncEntry.h \
+	${top_srcdir}/libgnucash/engine/gncTaxTable.h \
+	${top_srcdir}/libgnucash/engine/gncIDSearch.h \
+	${top_srcdir}/libgnucash/engine/gnc-pricedb.h \
+	${top_srcdir}/libgnucash/app-utils/gnc-prefs-utils.h
 
 
-gnucash_core.c: $(SWIG_FILES) ${top_srcdir}/src/base-typemaps.i ${top_srcdir}/src/engine/engine-common.i $(_gnucash_core_c_includes)
+gnucash_core.c: $(SWIG_FILES) ${top_srcdir}/common/base-typemaps.i ${top_srcdir}/libgnucash/engine/engine-common.i $(_gnucash_core_c_includes)
 	$(SWIG) -python -Wall -Werror \
-	-I$(top_srcdir)/src -I$(top_srcdir)/src/engine \
-	-I$(top_srcdir)/src/app-utils -o $@ $<
+	-I$(top_srcdir)/common -I$(top_srcdir)/libgnucash/engine \
+	-I$(top_srcdir)/libgnucash/app-utils -o $@ $<
 
 gnucash_core_c.py: gnucash_core.c $(SWIG_FILES)
 endif

bindings/python/gnucash_core.i

@@ -56,8 +56,8 @@
 #include "guid.h"
 #include "qofquery.h"
 #include "qofquerycore.h"
-#include "gnc-module/gnc-module.h"
-#include "engine/gnc-engine.h"
+#include "gnc-module.h"
+#include "gnc-engine.h"
 #include "Transaction.h"
 #include "Split.h"
 #include "Account.h"
@@ -79,8 +79,8 @@
 #include "gncEntry.h"
 #include "gncTaxTable.h"
 #include "gncIDSearch.h"
-#include "engine/gnc-pricedb.h"
-#include "app-utils/gnc-prefs-utils.h"
+#include "gnc-pricedb.h"
+#include "gnc-prefs-utils.h"
 #include "cap-gains.h"
 #include "Scrub3.h"
 %}

bindings/python/tests/Makefile.am

@@ -0,0 +1,53 @@
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/libgnucash/engine \
+  --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/core-utils \
+  --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
+  --guile-load-dir ${top_builddir}/libgnucash/engine \
+  --guile-load-dir ${top_builddir}/libgnucash/scm \
+  --guile-load-dir ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/libgnucash/core-utils \
+  --library-dir    ${top_builddir}/libgnucash/gnc-module \
+  --library-dir    ${top_builddir}/libgnucash/engine \
+  --library-dir    ${top_builddir}/libgnucash/backend/xml \
+  --library-dir    ${top_builddir}/libgnucash/backend/sql \
+  --library-dir    ${top_builddir}/libgnucash/app-utils \
+  --library-dir    ${top_builddir}/common/test-core
+  
+TESTS_ENVIRONMENT = \
+  GNC_BUILDDIR="${abs_top_builddir}" \
+  PYTHON=${PYTHON} \
+  PYTHONPATH=$$PYTHONPATH:$(top_builddir)/bindings/python \
+  PYTHONPATH=$$PYTHONPATH:$(top_builddir)/bindings/python/.libs \
+  PYTHONPATH=$$PYTHONPATH:$(top_srcdir)/bindings/python/tests \
+  PYTHONPATH=$$PYTHONPATH:$(top_builddir)/common/test-core/ \
+  PYTHONPATH=$$PYTHONPATH:$(top_srcdir)/common/test-core/ \
+  PYTHONPATH=$$PYTHONPATH:$(top_builddir)/common/test-core/.libs \
+  $(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
+  
+## We borrow guile's convention and use @-...-@ as the substitution
+## brackets below, instead of the usual @...@.  This prevents autoconf
+## from substituting the values directly into the left-hand sides of
+## the sed substitutions.  *sigh*
+
+runTests.py: runTests.py.in ${top_builddir}/config.status Makefile
+	rm -f $@.tmp
+	sed < $< > $@.tmp \
+	    -e 's#@-PYTHON-@#${PYTHON}#'
+	mv $@.tmp $@
+	chmod u+x $@
+
+CLEANFILES = runTests.py
+
+TESTS = runTests.py
+
+clean-local:
+	rm -f translog.*
+
+EXTRA_DIST = \
+  runTests.py.in \
+  test_account.py \
+  test_book.py \
+  test_split.py \
+  test_transaction.py \
+  test_business.py \
+  CMakeLists.txt

common/CMakeLists.txt

@@ -0,0 +1,25 @@
+# CMakeLists.txt for common/
+
+# The subdirectories
+ADD_SUBDIRECTORY (cmake_modules)
+ADD_SUBDIRECTORY (debug)
+ADD_SUBDIRECTORY (test-core)
+
+SET(common_EXTRA_DIST
+        base-typemaps.i
+        config.h.cmake.in
+        gnc-test-env.pl
+        guile-mappings.h
+        platform.h
+	swig-utf8.patch)
+
+IF (BUILDING_FROM_VCS)
+  SET (SWIG_RUNTIME_H ${CMAKE_CURRENT_BINARY_DIR}/swig-runtime.h PARENT_SCOPE)
+ELSE()
+  SET (SWIG_RUNTIME_H ${CMAKE_CURRENT_SOURCE_DIR}/swig-runtime.h PARENT_SCOPE)
+ENDIF()
+
+
+SET_LOCAL_DIST(common_DIST_local CMakeLists.txt Makefile.am ${common_EXTRA_DIST})
+
+SET(common_DIST ${common_DIST_local} ${cmake_modules_DIST} ${debug_DIST} ${test_core_DIST} PARENT_SCOPE)

common/Makefile.am

@@ -0,0 +1,43 @@
+# These directories do not contain any gtk dependencies
+# Note the unusual ordering of some test directories. This is
+# because test-core depends on engine and the test directories
+# in turn depend on test-core.
+SUBDIRS = \
+  . \
+  debug
+# Note normally SUBDIRS should also include test-core. That directory
+# however depends on libgnucash/engine and hence is included in
+# libgnucash/Makefile.am for proper build oldering. This would not
+# be needed if our Makefiles were structured to be included one
+# in the other instead of for a recursive make invocation.
+
+noinst_HEADERS = \
+  swig-runtime.h
+
+if BUILDING_FROM_VCS
+swig-runtime.h:
+	$(SWIG) -guile -external-runtime $@
+endif
+MAINTAINERCLEANFILES = swig-runtime.h
+
+EXTRA_DIST = \
+  base-typemaps.i \
+  cmake_modules/MacroAppendForeach.cmake \
+  cmake_modules/GncAddSwigCommand.cmake \
+  cmake_modules/GncAddTest.cmake \
+  cmake_modules/MakeDist.cmake \
+  cmake_modules/COPYING-CMAKE-SCRIPTS.txt \
+  cmake_modules/MakeDistFiles.cmake \
+  cmake_modules/MacroAddSourceFileCompileFlags.cmake \
+  cmake_modules/MakeDistCheck.cmake \
+  cmake_modules/GncConfigure.cmake \
+  cmake_modules/GncAddSchemeTargets.cmake \
+  cmake_modules/GncAddGSchemaTargets.cmake \
+  cmake_modules/GncFindPkgConfig.cmake \
+  cmake_modules/CMakeLists.txt \
+  config.h.cmake.in \
+  gnc-test-env.pl \
+  guile-mappings.h \
+  platform.h \
+  swig-utf8.patch \
+  CMakeLists.txt

common/cmake_modules/GncAddSchemeTargets.cmake

@@ -90,7 +90,7 @@ FUNCTION(GNC_ADD_SCHEME_TARGETS _TARGET _SOURCE_FILES _OUTPUT_DIR
     # Construct the guile source and compiled load paths
 
     SET(_GUILE_LOAD_PATH "${current_srcdir}"
-        "${current_bindir}" "${CMAKE_BINARY_DIR}/src/scm")  # to pick up generated build-config.scm
+        "${current_bindir}" "${CMAKE_BINARY_DIR}/libgnucash/scm")  # to pick up generated build-config.scm
     SET(_GUILE_LOAD_COMPILED_PATH "${current_bindir}")
     FOREACH (load_item ${_GUILE_LOAD_DIRS})
       LIST(APPEND _GUILE_LOAD_PATH "${CMAKE_SOURCE_DIR}/${load_item}")

common/cmake_modules/GncAddSwigCommand.cmake

@@ -8,8 +8,8 @@ MACRO (GNC_ADD_SWIG_COMMAND _target _output _input)
 
 ADD_CUSTOM_COMMAND (
   OUTPUT ${_output}
-  DEPENDS ${_input} ${CMAKE_SOURCE_DIR}/src/base-typemaps.i ${ARGN}
-COMMAND ${SWIG_EXECUTABLE} -guile ${SWIG_ARGS} -Linkage module -I${CMAKE_SOURCE_DIR}/src/engine -I${CMAKE_SOURCE_DIR}/src  -o ${_output} ${_input}
+  DEPENDS ${_input} ${CMAKE_SOURCE_DIR}/common/base-typemaps.i ${ARGN}
+COMMAND ${SWIG_EXECUTABLE} -guile ${SWIG_ARGS} -Linkage module -I${CMAKE_SOURCE_DIR}/libgnucash/engine -I${CMAKE_SOURCE_DIR}/common  -o ${_output} ${_input}
 )
 
 ADD_CUSTOM_TARGET(${_target} DEPENDS ${_output})
@@ -22,10 +22,10 @@ MACRO (GNC_ADD_SWIG_PYTHON_COMMAND _target _output _input)
   ADD_CUSTOM_COMMAND(OUTPUT ${_output}
 
     COMMAND ${SWIG_EXECUTABLE} -python -Wall -Werror ${SWIG_ARGS}
-       -I${CMAKE_SOURCE_DIR}/src
-       -I${CMAKE_SOURCE_DIR}/src/engine -I${CMAKE_SOURCE_DIR}/src/app-utils
+       -I${CMAKE_SOURCE_DIR}/common
+       -I${CMAKE_SOURCE_DIR}/libgnucash/engine -I${CMAKE_SOURCE_DIR}/libgnucash/app-utils
        -o ${_output} ${_input}
-    DEPENDS ${_input} ${CMAKE_SOURCE_DIR}/src/base-typemaps.i ${ARGN}
+    DEPENDS ${_input} ${CMAKE_SOURCE_DIR}/common/base-typemaps.i ${ARGN}
   )
-  ADD_CUSTOM_TARGET(${_target} ALL DEPENDS ${_output} ${CMAKE_SOURCE_DIR}/src/base-typemaps.i ${_input} ${ARGN})
+  ADD_CUSTOM_TARGET(${_target} ALL DEPENDS ${_output} ${CMAKE_SOURCE_DIR}/common/base-typemaps.i ${_input} ${ARGN})
 ENDMACRO()

common/cmake_modules/GncAddTest.cmake

@@ -132,7 +132,7 @@ FUNCTION(GNC_GTEST_CONFIGURE)
       UNSET(GTEST_SRC_DIR CACHE)
     ELSE()
       SET(GTEST_SRC "${GTEST_SRC_DIR}/src/gtest_main.cc" PARENT_SCOPE)
-      SET(GTEST_LIB "${CMAKE_BINARY_DIR}/src/test-core/libgtest.a" PARENT_SCOPE)
+      SET(GTEST_LIB "${CMAKE_BINARY_DIR}/common/test-core/libgtest.a" PARENT_SCOPE)
     ENDIF()
   ELSE()
     MESSAGE(FATAL_ERROR "GTEST not found. Please install it or set GTEST_ROOT or GMOCK_ROOT")
@@ -156,7 +156,7 @@ FUNCTION(GNC_GTEST_CONFIGURE)
   if (GMOCK_INCLUDE_DIR AND GMOCK_SRC_DIR)
     SET(GMOCK_FOUND YES PARENT_SCOPE)
     SET(GMOCK_SRC "${GMOCK_MAIN_SRC_DIR}/gmock-all.cc" PARENT_SCOPE)
-    SET(GMOCK_LIB "${CMAKE_BINARY_DIR}/src/test-core/libgmock.a" PARENT_SCOPE)
+    SET(GMOCK_LIB "${CMAKE_BINARY_DIR}/common/test-core/libgmock.a" PARENT_SCOPE)
   ELSE()
     MESSAGE(FATAL_ERROR "GMOCK not found. Please install it or set GMOCK_ROOT")
   ENDIF()

common/cmake_modules/MakeDist.cmake

@@ -153,7 +153,7 @@ FUNCTION(MAKE_DIST PACKAGE_PREFIX GNUCASH_SOURCE_DIR BUILD_SOURCE_DIR BUILDING_F
                 FILE(COPY ${realpath} DESTINATION ${PACKAGE_PREFIX})
             ENDFOREACH(link)
 
-            FOREACH(link src/doc/design/mdate-sh src/doc/design/texinfo.tex)
+            FOREACH(link libgnucash/doc/design/mdate-sh libgnucash/doc/design/texinfo.tex)
                 GET_FILENAME_COMPONENT(dir ${link} DIRECTORY)
                 GET_FILENAME_COMPONENT(realpath ${PACKAGE_PREFIX}/${link} REALPATH)
                 FILE(REMOVE ${PACKAGE_PREFIX}/${link})

common/cmake_modules/MakeDistFiles.cmake

@@ -0,0 +1,110 @@
+
+IF (${CMAKE_VERSION} VERSION_LESS 3.3)
+    INCLUDE(CMakeParseArguments)
+ENDIF()
+
+
+FUNCTION(SET_LOCAL_DIST output)
+    SET(dist_files "")
+    FOREACH(file ${ARGN})
+        FILE(RELATIVE_PATH relative ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${file})
+        LIST(APPEND dist_files ${relative})
+    ENDFOREACH()
+    SET (${output} ${dist_files} PARENT_SCOPE)
+ENDFUNCTION()
+
+MACRO(SET_DIST_LIST output)
+    SET_LOCAL_DIST(${output}_TMP ${ARGN})
+    SET(${output} ${${output}_TMP} PARENT_SCOPE)
+ENDMACRO()
+
+FUNCTION(EXECUTE_PROCESS_AND_CHECK_RESULT)
+    cmake_parse_arguments(VARS "" "WORKING_DIRECTORY;ERROR_MSG" "COMMAND" ${ARGN})
+    EXECUTE_PROCESS(
+            COMMAND ${VARS_COMMAND}
+            WORKING_DIRECTORY ${VARS_WORKING_DIRECTORY}
+            RESULT_VARIABLE RESULT
+    )
+    IF (NOT "${RESULT}" STREQUAL "0")
+        MESSAGE(FATAL_ERROR ${VARS_ERROR_MSG})
+    ENDIF()
+ENDFUNCTION()
+
+
+# This is a list of files generated at build time that
+# should be copied into the dist tarball. An item in
+# this list should be a file, not a directory or glob.
+# File in this list become dependenices of the 'dist'
+# target.
+
+
+SET(COPY_FROM_BUILD
+  ChangeLog
+  libgnucash/app-utils/migratable-prefs.xml
+  libgnucash/app-utils/swig-app-utils-guile.c
+  libgnucash/app-utils/swig-app-utils-python.c
+  libgnucash/app-utils/test/test-load-module
+  libgnucash/backend/xml/test/test-real-data.sh
+  gnucash/bin/gnucash.rc
+  gnucash/bin/overrides/gnucash-make-guids
+  gnucash/bin/test/test-version
+  libgnucash/core-utils/gnc-vcs-info.h
+  libgnucash/core-utils/swig-core-utils-guile.c
+  libgnucash/core-utils/swig-core-utils-python.c
+  libgnucash/doc/design/gnucash-design.info
+  libgnucash/engine/iso-4217-currencies.c
+  libgnucash/engine/swig-engine.c
+  libgnucash/engine/test/test-create-account
+  libgnucash/engine/test/test-scm-query-import
+  libgnucash/gnc-module/swig-gnc-module.c
+  libgnucash/gnc-module/test/mod-bar/swig-bar.c
+  libgnucash/gnc-module/test/mod-baz/swig-baz.c
+  libgnucash/gnc-module/test/mod-foo/swig-foo.c
+  libgnucash/gnc-module/test/test-gwrapped-c
+  libgnucash/gnc-module/test/test-load-deps
+  libgnucash/gnc-module/test/test-load-scm
+  libgnucash/gnc-module/test/test-scm-dynload
+  libgnucash/gnc-module/test/test-scm-init
+  libgnucash/gnc-module/test/test-scm-module
+  libgnucash/gnc-module/test/test-scm-multi
+  gnucash/gnome/gnucash.desktop.in
+  gnucash/gnome/swig-gnome.c
+  gnucash/gnome-utils/gnc-warnings.c
+  gnucash/gnome-utils/swig-gnome-utils.c
+  gnucash/gnome-utils/test/test-load-module
+  gnucash/html/swig-gnc-html.c
+  bindings/python/gnucash_core.c
+  gnucash/report/report-gnome/swig-report-gnome.c
+  gnucash/report/report-gnome/test/test-load-module
+  gnucash/report/report-system/swig-report-system.c
+  gnucash/report/report-system/test/test-load-module
+  gnucash/report/stylesheets/test/test-load-module
+  libgnucash/scm/build-config.scm
+  common/swig-runtime.h
+  common/test-core/swig-unittest-support-guile.c
+  common/test-core/swig-unittest-support-python.c
+)
+
+# This list is similiar to the COPY_FROM_BUILD list
+# above, except that we don't create an explicit
+# dependency on this for the 'dist' target. I need
+# to fix the creation of these files so that we
+# can add the as dependencies for 'dist'. These
+# file are not generated using CONFIGURE_FILE(),
+# so CMake does not realize these are generated files.
+
+# Items marked with GNC_CONFIGURE can be
+# properly generated when we drop autotools, because
+# then the source file can use the @XXX@ convention
+# instead of @-XXX-@
+
+SET(COPY_FROM_BUILD_2
+        doc/gnucash.1  # Uses GNC_CONFIGURE
+        packaging/gnucash.spec # Uses GNC_CONFIGURE
+        po/gnucash.pot
+        libgnucash/doc/design/stamp-vti
+        libgnucash/doc/design/version.texi
+        bindings/python/gnucash_core_c.py
+        common/test-core/unittest_support.py
+
+        )

common/test-core/CMakeLists.txt

@@ -9,10 +9,10 @@ SET(test_core_noinst_HEADERS
 )
 
 INCLUDE_DIRECTORIES(
-  ${CMAKE_BINARY_DIR}/src
-  ${CMAKE_SOURCE_DIR}/src
-  ${CMAKE_SOURCE_DIR}/src/engine
-  ${CMAKE_SOURCE_DIR}/src/test-core
+  ${CMAKE_BINARY_DIR}/common
+  ${CMAKE_SOURCE_DIR}/common
+  ${CMAKE_SOURCE_DIR}/libgnucash/engine
+  ${CMAKE_SOURCE_DIR}/common/test-core
 
   ${GLIB2_INCLUDE_DIRS}
   ${GUILE_INCLUDE_DIRS}
@@ -54,7 +54,7 @@ SET(test_core_SCHEME unittest-support.scm)
 SET(GUILE_OUTPUT_DIR   gnucash)
 SET(GUILE_MODULES      "")
 SET(GUILE_LOAD_DIRS    "")
-SET(GUILE_LIBRARY_DIRS src/test-core src/engine)
+SET(GUILE_LIBRARY_DIRS common/test-core libgnucash/engine)
 SET(GUILE_DEPENDS      test-core-guile)
 
 
@@ -78,4 +78,4 @@ ADD_LIBRARY(gmock STATIC  ${lib_gmock_SOURCES})
 TARGET_INCLUDE_DIRECTORIES(gmock PUBLIC
   ${GTEST_INCLUDE_DIR} ${GTEST_SRC_DIR}
   ${GMOCK_INCLUDE_DIR} ${GMOCK_SRC_DIR})
-INSTALL(FILES unittest-support.h DESTINATION libexec/gnucash/src/engine/test)
+INSTALL(FILES unittest-support.h DESTINATION libexec/gnucash/libgnucash/engine/test)

common/test-core/Makefile.am

@@ -8,7 +8,7 @@ libtest_core_la_SOURCES = \
 	unittest-support.c
 
 libtest_core_la_LIBADD = \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
   ${GLIB_LIBS}
 
 noinst_HEADERS = \
@@ -16,29 +16,29 @@ noinst_HEADERS = \
 	unittest-support.h
 
 libtest_core_la_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_srcdir}/src/engine \
+  -I${top_srcdir}/common \
+  -I${top_srcdir}/libgnucash/engine \
   ${GLIB_CFLAGS}
 
 libtest_core_la_LDFLAGS = \
   -rpath ${exec-prefix}/lib
 
 if BUILDING_FROM_VCS
-swig-unittest-support-guile.c: unittest-support.i $(top_srcdir)/src/base-typemaps.i
+swig-unittest-support-guile.c: unittest-support.i $(top_srcdir)/common/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src \
+	-I${top_srcdir}/common \
 	${AM_CPPFLAGS} -o $@ $<
 if ! OS_WIN32
 if ! SWIG_DIST_FAIL
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
-	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
+	  patch $@ $(top_srcdir)/common/swig-utf8.patch; \
 	fi
 endif
 endif
 
-swig-unittest-support-python.c: unittest-support.i $(top_srcdir)/src/base-typemaps.i
+swig-unittest-support-python.c: unittest-support.i $(top_srcdir)/common/base-typemaps.i
 	$(SWIG) -python  -Wall -Werror $(SWIG_ARGS) \
-	-I${top_srcdir}/src \
+	-I${top_srcdir}/common \
 	${AM_CPPFLAGS} -o $@ $<
 
 unittest-support.py: swig-unittest-support-python.c ${SWIG_FILES}
@@ -112,13 +112,13 @@ endif
 
 if GNC_HAVE_GUILE_2
 GUILE_COMPILE_ENV = \
-  --library-dir    ${top_builddir}/src/test-core \
-  --library-dir    ${top_builddir}/src/engine
+  --library-dir    ${top_builddir}/common/test-core \
+  --library-dir    ${top_builddir}/libgnucash/engine
 
 %.go : %.scm .scm-links $(noinst_LTLIBRARIES)
 	GNC_UNINSTALLED=yes \
 	GNC_BUILDDIR=${top_builddir} \
-	$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
+	$(shell ${abs_top_srcdir}/common/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \
 	$(GUILD) compile -o $@ $<
 
 gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash

common/test-core/unittest_support.py

@@ -0,0 +1,166 @@
+# This file was automatically generated by SWIG (http://www.swig.org).
+# Version 3.0.10
+#
+# Do not make changes to this file unless you know what you are doing--modify
+# the SWIG interface file instead.
+
+
+
+
+
+from sys import version_info as _swig_python_version_info
+if _swig_python_version_info >= (2, 7, 0):
+    def swig_import_helper():
+        import importlib
+        pkg = __name__.rpartition('.')[0]
+        mname = '.'.join((pkg, '_unittest_support')).lstrip('.')
+        try:
+            return importlib.import_module(mname)
+        except ImportError:
+            return importlib.import_module('_unittest_support')
+    _unittest_support = swig_import_helper()
+    del swig_import_helper
+elif _swig_python_version_info >= (2, 6, 0):
+    def swig_import_helper():
+        from os.path import dirname
+        import imp
+        fp = None
+        try:
+            fp, pathname, description = imp.find_module('_unittest_support', [dirname(__file__)])
+        except ImportError:
+            import _unittest_support
+            return _unittest_support
+        if fp is not None:
+            try:
+                _mod = imp.load_module('_unittest_support', fp, pathname, description)
+            finally:
+                fp.close()
+            return _mod
+    _unittest_support = swig_import_helper()
+    del swig_import_helper
+else:
+    import _unittest_support
+del _swig_python_version_info
+try:
+    _swig_property = property
+except NameError:
+    pass  # Python < 2.2 doesn't have 'property'.
+
+try:
+    import builtins as __builtin__
+except ImportError:
+    import __builtin__
+
+def _swig_setattr_nondynamic(self, class_type, name, value, static=1):
+    if (name == "thisown"):
+        return self.this.own(value)
+    if (name == "this"):
+        if type(value).__name__ == 'SwigPyObject':
+            self.__dict__[name] = value
+            return
+    method = class_type.__swig_setmethods__.get(name, None)
+    if method:
+        return method(self, value)
+    if (not static):
+        if _newclass:
+            object.__setattr__(self, name, value)
+        else:
+            self.__dict__[name] = value
+    else:
+        raise AttributeError("You cannot add attributes to %s" % self)
+
+
+def _swig_setattr(self, class_type, name, value):
+    return _swig_setattr_nondynamic(self, class_type, name, value, 0)
+
+
+def _swig_getattr(self, class_type, name):
+    if (name == "thisown"):
+        return self.this.own()
+    method = class_type.__swig_getmethods__.get(name, None)
+    if method:
+        return method(self)
+    raise AttributeError("'%s' object has no attribute '%s'" % (class_type.__name__, name))
+
+
+def _swig_repr(self):
+    try:
+        strthis = "proxy of " + self.this.__repr__()
+    except __builtin__.Exception:
+        strthis = ""
+    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+
+try:
+    _object = object
+    _newclass = 1
+except __builtin__.Exception:
+    class _object:
+        pass
+    _newclass = 0
+
+class TestErrorStruct(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, TestErrorStruct, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, TestErrorStruct, name)
+    __repr__ = _swig_repr
+    __swig_setmethods__["log_level"] = _unittest_support.TestErrorStruct_log_level_set
+    __swig_getmethods__["log_level"] = _unittest_support.TestErrorStruct_log_level_get
+    if _newclass:
+        log_level = _swig_property(_unittest_support.TestErrorStruct_log_level_get, _unittest_support.TestErrorStruct_log_level_set)
+    __swig_setmethods__["log_domain"] = _unittest_support.TestErrorStruct_log_domain_set
+    __swig_getmethods__["log_domain"] = _unittest_support.TestErrorStruct_log_domain_get
+    if _newclass:
+        log_domain = _swig_property(_unittest_support.TestErrorStruct_log_domain_get, _unittest_support.TestErrorStruct_log_domain_set)
+    __swig_setmethods__["msg"] = _unittest_support.TestErrorStruct_msg_set
+    __swig_getmethods__["msg"] = _unittest_support.TestErrorStruct_msg_get
+    if _newclass:
+        msg = _swig_property(_unittest_support.TestErrorStruct_msg_get, _unittest_support.TestErrorStruct_msg_set)
+
+    def __init__(self):
+        this = _unittest_support.new_TestErrorStruct()
+        try:
+            self.this.append(this)
+        except __builtin__.Exception:
+            self.this = this
+    __swig_destroy__ = _unittest_support.delete_TestErrorStruct
+    __del__ = lambda self: None
+TestErrorStruct_swigregister = _unittest_support.TestErrorStruct_swigregister
+TestErrorStruct_swigregister(TestErrorStruct)
+
+G_LOG_FLAG_RECURSION = _unittest_support.G_LOG_FLAG_RECURSION
+G_LOG_FLAG_FATAL = _unittest_support.G_LOG_FLAG_FATAL
+G_LOG_LEVEL_ERROR = _unittest_support.G_LOG_LEVEL_ERROR
+G_LOG_LEVEL_CRITICAL = _unittest_support.G_LOG_LEVEL_CRITICAL
+G_LOG_LEVEL_WARNING = _unittest_support.G_LOG_LEVEL_WARNING
+G_LOG_LEVEL_MESSAGE = _unittest_support.G_LOG_LEVEL_MESSAGE
+G_LOG_LEVEL_INFO = _unittest_support.G_LOG_LEVEL_INFO
+G_LOG_LEVEL_DEBUG = _unittest_support.G_LOG_LEVEL_DEBUG
+G_LOG_LEVEL_MASK = _unittest_support.G_LOG_LEVEL_MASK
+
+def test_add_error(error):
+    return _unittest_support.test_add_error(error)
+test_add_error = _unittest_support.test_add_error
+
+def test_clear_error_list():
+    return _unittest_support.test_clear_error_list()
+test_clear_error_list = _unittest_support.test_clear_error_list
+
+def test_set_checked_handler(domain, level, data):
+    return _unittest_support.test_set_checked_handler(domain, level, data)
+test_set_checked_handler = _unittest_support.test_set_checked_handler
+
+def test_set_list_handler(domain, level, data):
+    return _unittest_support.test_set_list_handler(domain, level, data)
+test_set_list_handler = _unittest_support.test_set_list_handler
+
+def test_set_null_handler(domain, level, data):
+    return _unittest_support.test_set_null_handler(domain, level, data)
+test_set_null_handler = _unittest_support.test_set_null_handler
+
+def g_log_remove_handler(log_domain, handler):
+    return _unittest_support.g_log_remove_handler(log_domain, handler)
+g_log_remove_handler = _unittest_support.g_log_remove_handler
+# This file is compatible with both classic and new-style classes.
+
+

configure.ac

@@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.60)
 AC_INIT([GnuCash], [2.6.99], [gnucash-devel@gnucash.org])
 AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_SRCDIR(src/engine/Transaction.h)
+AC_CONFIG_SRCDIR(libgnucash/engine/Transaction.h)
 AC_CONFIG_MACRO_DIR([macros])
 
 #Change this in development versions when changing anything that
@@ -31,7 +31,7 @@ GNUCASH_NANO_VERSION=0
 #This should be the earliest version in the form XXMMUUNN (XX=MAJOR,
 #MM=MINOR, UU=MICRO, NN=NANO) or SVN revision if before 2.4.1 which is
 #storage-compatible with the current version. See the comments in
-#src/backend/dbi/gnc-backend-dbi.c:gnc_dbi_load.
+#libgnucash/backend/dbi/gnc-backend-dbi.c:gnc_dbi_load.
 GNUCASH_RESAVE_VERSION=19920
 # Initialize automake -- make sure we have at least version 1.9 Note:
 # Automake 1.14 & 1.15 issue a ton of warnings about subdir-objects, which
@@ -42,7 +42,7 @@ GNUCASH_RESAVE_VERSION=19920
 # http://lists.gnu.org/archive/html/automake/2014-04/msg00002.html and
 # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928 for details.
 # In the meantime the best option is to use Automake 1.13 or earlier.
-AM_INIT_AUTOMAKE([1.9 dist-bzip2])
+AM_INIT_AUTOMAKE([1.9 tar-ustar dist-bzip2])
 
 # Parse out the version number
 GNUCASH_VERSION_STRING=AC_PACKAGE_VERSION
@@ -276,7 +276,7 @@ else
   VCS_TYPE=
 
   # Make sure we've got swig-runtime.h and gnc-vcs-info.h
-  AC_CHECK_FILE(${srcdir}/src/swig-runtime.h, [],
+  AC_CHECK_FILE(${srcdir}/common/swig-runtime.h, [],
     [AC_MSG_ERROR([
 
 It looks like you are NOT building from Subversion, svk, git or bzr
@@ -286,7 +286,7 @@ Either that or contact gnucash-devel@gnucash.org because
 the tarball you downloaded is broken.
 
     ])])
-  AC_CHECK_FILE(${srcdir}/src/core-utils/gnc-vcs-info.h, [],
+  AC_CHECK_FILE(${srcdir}/libgnucash/core-utils/gnc-vcs-info.h, [],
     [AC_MSG_ERROR([
 
 It looks like you are NOT building from Subversion, svk, git or bzr
@@ -941,7 +941,7 @@ if test "x$ac_cv_have_gtest_libs" = xyes; then
 else
 dnl Google test requires pthreads and this seems the easiest way to check.
     AX_PTHREAD([
-    ac_cv_gtest_libs="\$(top_builddir)/src/test-core/libgtest.a $PTHREAD_CFLAGS"
+    ac_cv_gtest_libs="\$(top_builddir)/common/test-core/libgtest.a $PTHREAD_CFLAGS"
     ],[
     AC_MSG_ERROR(
       [GTest requires pthreads, but this wasn't found.])
@@ -1000,7 +1000,7 @@ fi
 MIGRATABLE_PREFS_OFX="/dev/null"
 if test x${have_ofx} = xyes ; then
   _COMPONENTS="$_COMPONENTS ofx"
-  MIGRATABLE_PREFS_OFX="$srcdir/src/import-export/ofx/migratable-prefs-ofx.xml"
+  MIGRATABLE_PREFS_OFX="$srcdir/gnucash/import-export/ofx/migratable-prefs-ofx.xml"
 fi
 
 ofx_has_bug_39=no
@@ -1087,7 +1087,7 @@ then
   AC_SUBST(AQBANKING_LIBS)
   AC_SUBST(AQBANKING_CFLAGS)
   _COMPONENTS="$_COMPONENTS aqbanking"
-  MIGRATABLE_PREFS_AQBANKING="$srcdir/src/import-export/aqb/migratable-prefs-aqbanking.xml"
+  MIGRATABLE_PREFS_AQBANKING="$srcdir/gnucash/import-export/aqb/migratable-prefs-aqbanking.xml"
 fi
 AM_CONDITIONAL([WITH_AQBANKING], [test x${want_aqbanking} = xyes])
 AC_SUBST_FILE([MIGRATABLE_PREFS_AQBANKING])
@@ -1587,7 +1587,7 @@ AC_MSG_RESULT($warnFLAGS)
 ### makefiles, so that we don't have an opportunity to adjust them
 ### there.
 
-chmod u+x ${srcdir}/src/bin/generate-gnc-script
+chmod u+x ${srcdir}/gnucash/bin/generate-gnc-script
 
 ### --------------------------------------------------------------------------
 ### Makefile creation
@@ -1637,188 +1637,188 @@ AC_CONFIG_FILES(
   accounts/zh_CN/Makefile
   accounts/zh_HK/Makefile
   accounts/zh_TW/Makefile
+  bindings/Makefile
+  bindings/python/Makefile
+  bindings/python/tests/Makefile
   checks/Makefile
+  common/Makefile
+  common/debug/Makefile
+  common/debug/valgrind/Makefile
+  common/test-core/Makefile
   doc/Makefile
   doc/examples/Makefile
+  gnucash/Makefile
+  gnucash/bin/Makefile
+  gnucash/bin/overrides/Makefile
+  gnucash/bin/test/Makefile
+  gnucash/gnome/Makefile
+  gnucash/gnome/gtkbuilder/Makefile
+  gnucash/gnome/gschemas/Makefile
+  gnucash/gnome/ui/Makefile
+  gnucash/gnome-utils/Makefile
+  gnucash/gnome-utils/gtkbuilder/Makefile
+  gnucash/gnome-utils/gschemas/Makefile
+  gnucash/gnome-utils/test/Makefile
+  gnucash/gnome-utils/ui/Makefile
+  gnucash/gnome-search/Makefile
+  gnucash/html/Makefile
+  gnucash/import-export/Makefile
+  gnucash/import-export/test/Makefile
+  gnucash/import-export/ofx/gschemas/Makefile
+  gnucash/import-export/qif-imp/Makefile
+  gnucash/import-export/qif/Makefile
+  gnucash/import-export/qif/test/Makefile
+  gnucash/import-export/qif-imp/gschemas/Makefile
+  gnucash/import-export/qif-imp/test/Makefile
+  gnucash/import-export/gschemas/Makefile
+  gnucash/import-export/ofx/Makefile
+  gnucash/import-export/ofx/test/Makefile
+  gnucash/import-export/csv-imp/Makefile
+  gnucash/import-export/csv-imp/gschemas/Makefile
+  gnucash/import-export/csv-imp/test/Makefile
+  gnucash/import-export/csv-exp/Makefile
+  gnucash/import-export/csv-exp/gschemas/Makefile
+  gnucash/import-export/log-replay/Makefile
+  gnucash/import-export/aqb/Makefile
+  gnucash/import-export/aqb/gschemas/Makefile
+  gnucash/import-export/aqb/test/Makefile
+  gnucash/plugins/Makefile
+  gnucash/plugins/bi_import/Makefile
+  gnucash/plugins/bi_import/gtkbuilder/Makefile
+  gnucash/plugins/bi_import/ui/Makefile
+  gnucash/plugins/customer_import/Makefile
+  gnucash/plugins/customer_import/gtkbuilder/Makefile
+  gnucash/plugins/customer_import/ui/Makefile
+  gnucash/python/Makefile
+  gnucash/python/pycons/Makefile
+  gnucash/register/Makefile
+  gnucash/register/ledger-core/Makefile
+  gnucash/register/ledger-core/test/Makefile
+  gnucash/register/register-core/Makefile
+  gnucash/register/register-core/test/Makefile
+  gnucash/register/register-gnome/Makefile
+  gnucash/register/register-gnome/test/Makefile
+  gnucash/report/Makefile
+  gnucash/report/report-gnome/Makefile
+  gnucash/report/report-gnome/test/Makefile
+  gnucash/report/report-system/Makefile
+  gnucash/report/report-system/test/Makefile
+  gnucash/report/standard-reports/Makefile
+  gnucash/report/standard-reports/test/Makefile
+  gnucash/report/business-reports/Makefile
+  gnucash/report/locale-specific/Makefile
+  gnucash/report/locale-specific/us/Makefile
+  gnucash/report/locale-specific/us/test/Makefile
+  gnucash/report/stylesheets/Makefile
+  gnucash/report/stylesheets/test/Makefile
+  gnucash/report/utility-reports/Makefile
+  gnucash/report/jqplot/Makefile
   lib/Makefile
   lib/goffice/Makefile
   lib/libc/Makefile
+  libgnucash/Makefile
+  libgnucash/app-utils/Makefile
+  libgnucash/app-utils/test/Makefile
+  libgnucash/backend/Makefile
+  libgnucash/backend/dbi/Makefile
+  libgnucash/backend/dbi/test/Makefile
+  libgnucash/backend/xml/Makefile
+  libgnucash/backend/xml/test/Makefile
+  libgnucash/backend/xml/test/test-files/Makefile
+  libgnucash/backend/xml/test/test-files/xml2/Makefile
+  libgnucash/backend/sql/Makefile
+  libgnucash/backend/sql/test/Makefile
+  libgnucash/core-utils/Makefile
+  libgnucash/core-utils/test/Makefile
+  libgnucash/doc/Makefile
+  libgnucash/doc/design/Makefile
+  libgnucash/doc/xml/Makefile
+  libgnucash/engine/Makefile
+  libgnucash/engine/test/Makefile
+  libgnucash/engine/test-core/Makefile
+  libgnucash/gnc-module/Makefile
+  libgnucash/gnc-module/test/Makefile
+  libgnucash/gnc-module/test/mod-foo/Makefile
+  libgnucash/gnc-module/test/mod-bar/Makefile
+  libgnucash/gnc-module/test/mod-baz/Makefile
+  libgnucash/gnc-module/test/misc-mods/Makefile
+  libgnucash/pixmaps/Makefile
+  libgnucash/quotes/Makefile
+  libgnucash/scm/Makefile
+  libgnucash/scm/gnumeric/Makefile
+  libgnucash/tax/Makefile
+  libgnucash/tax/us/Makefile
+  libgnucash/tax/us/test/Makefile
   packaging/Makefile
-  src/Makefile
-  src/app-utils/Makefile
-  src/app-utils/test/Makefile
-  src/backend/Makefile
-  src/backend/dbi/Makefile
-  src/backend/dbi/test/Makefile
-  src/backend/xml/Makefile
-  src/backend/xml/test/Makefile
-  src/backend/xml/test/test-files/Makefile
-  src/backend/xml/test/test-files/xml2/Makefile
-  src/backend/sql/Makefile
-  src/backend/sql/test/Makefile
-  src/bin/Makefile
-  src/bin/overrides/Makefile
-  src/bin/test/Makefile
-  src/core-utils/Makefile
-  src/core-utils/test/Makefile
-  src/debug/Makefile
-  src/debug/valgrind/Makefile
-  src/doc/Makefile
-  src/doc/design/Makefile
-  src/doc/xml/Makefile
-  src/engine/Makefile
-  src/engine/test/Makefile
-  src/engine/test-core/Makefile
-  src/gnc-module/Makefile
-  src/gnc-module/test/Makefile
-  src/gnc-module/test/mod-foo/Makefile
-  src/gnc-module/test/mod-bar/Makefile
-  src/gnc-module/test/mod-baz/Makefile
-  src/gnc-module/test/misc-mods/Makefile
-  src/gnome/Makefile
-  src/gnome/gtkbuilder/Makefile
-  src/gnome/gschemas/Makefile
-  src/gnome/ui/Makefile
-  src/gnome-utils/Makefile
-  src/gnome-utils/gtkbuilder/Makefile
-  src/gnome-utils/gschemas/Makefile
-  src/gnome-utils/test/Makefile
-  src/gnome-utils/ui/Makefile
-  src/gnome-search/Makefile
-  src/html/Makefile
-  src/import-export/Makefile
-  src/import-export/test/Makefile
-  src/import-export/ofx/gschemas/Makefile
-  src/import-export/qif-imp/Makefile
-  src/import-export/qif/Makefile
-  src/import-export/qif/test/Makefile
-  src/import-export/qif-imp/gschemas/Makefile
-  src/import-export/qif-imp/test/Makefile
-  src/import-export/gschemas/Makefile
-  src/import-export/ofx/Makefile
-  src/import-export/ofx/test/Makefile
-  src/import-export/csv-imp/Makefile
-  src/import-export/csv-imp/gschemas/Makefile
-  src/import-export/csv-imp/test/Makefile
-  src/import-export/csv-exp/Makefile
-  src/import-export/csv-exp/gschemas/Makefile
-  src/import-export/log-replay/Makefile
-  src/import-export/aqb/Makefile
-  src/import-export/aqb/gschemas/Makefile
-  src/import-export/aqb/test/Makefile
-  src/optional/Makefile
-  src/optional/python-bindings/Makefile
-  src/optional/python-bindings/tests/Makefile
-  src/pixmaps/Makefile
-  src/python/Makefile
-  src/python/pycons/Makefile
-  src/quotes/Makefile
-  src/register/Makefile
-  src/register/ledger-core/Makefile
-  src/register/ledger-core/test/Makefile
-  src/register/register-core/Makefile
-  src/register/register-core/test/Makefile
-  src/register/register-gnome/Makefile
-  src/register/register-gnome/test/Makefile
-  src/report/Makefile
-  src/report/report-gnome/Makefile
-  src/report/report-gnome/test/Makefile
-  src/report/report-system/Makefile
-  src/report/report-system/test/Makefile
-  src/report/standard-reports/Makefile
-  src/report/standard-reports/test/Makefile
-  src/report/business-reports/Makefile
-  src/report/locale-specific/Makefile
-  src/report/locale-specific/us/Makefile
-  src/report/locale-specific/us/test/Makefile
-  src/report/stylesheets/Makefile
-  src/report/stylesheets/test/Makefile
-  src/report/utility-reports/Makefile
-  src/report/jqplot/Makefile
-  src/scm/Makefile
-  src/scm/gnumeric/Makefile
-  src/tax/Makefile
-  src/tax/us/Makefile
-  src/tax/us/test/Makefile
-  src/test-core/Makefile
-  dnl # Stuff for bill/invoice import plugin
-  src/plugins/Makefile
-  src/plugins/bi_import/Makefile
-  src/plugins/bi_import/gtkbuilder/Makefile
-  src/plugins/bi_import/ui/Makefile
-  dnl # Stuff for customer import.
-  src/plugins/customer_import/Makefile
-  src/plugins/customer_import/gtkbuilder/Makefile
-  src/plugins/customer_import/ui/Makefile
   dnl # non-makefiles
-  src/bin/gnucash.rc
-  src/app-utils/migratable-prefs.xml
-  src/gnome/gnucash.desktop.in
+  gnucash/bin/gnucash.rc
+  libgnucash/app-utils/migratable-prefs.xml
+  gnucash/gnome/gnucash.desktop.in
   dnl # GSettings schema files
-  src/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in
-  src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in
-  src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in
-  src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in
-  src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in
-  src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in
-  src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in
-  src/gnome/gschemas/org.gnucash.gschema.xml.in
-  src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in
-  src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in
-  src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in
-  src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in
-  src/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in
-  src/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
-  src/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
-  src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
-  src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in
-  src/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in
+  gnucash/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in
+  gnucash/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in
+  gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in
+  gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in
+  gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
+  gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
+  gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
+  gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in
+  gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
   dnl # Please read doc/build-system before adding *anything* here
   ,
   dnl # init-commands go here
 )
 dnl # Shell scripts, to have their shells set
-AC_CONFIG_FILES([src/app-utils/test/test-load-module],
-                [chmod +x src/app-utils/test/test-load-module])
-AC_CONFIG_FILES([src/backend/xml/test/test-real-data.sh],
-                [chmod +x src/backend/xml/test/test-real-data.sh])
-AC_CONFIG_FILES([src/bin/test/test-version],
-                [chmod +x src/bin/test/test-version])
-AC_CONFIG_FILES([src/engine/test/test-create-account],
-                [chmod +x src/engine/test/test-create-account])
-AC_CONFIG_FILES([src/engine/test/test-scm-query-import],
-                [chmod +x src/engine/test/test-scm-query-import])
-AC_CONFIG_FILES([src/gnc-module/test/test-gwrapped-c],
-                [chmod +x src/gnc-module/test/test-gwrapped-c])
-AC_CONFIG_FILES([src/gnc-module/test/test-load-deps],
-                [chmod +x src/gnc-module/test/test-load-deps])
-AC_CONFIG_FILES([src/gnc-module/test/test-load-scm],
-                [chmod +x src/gnc-module/test/test-load-scm])
-AC_CONFIG_FILES([src/gnc-module/test/test-scm-dynload],
-                [chmod +x src/gnc-module/test/test-scm-dynload])
-AC_CONFIG_FILES([src/gnc-module/test/test-scm-init],
-                [chmod +x src/gnc-module/test/test-scm-init])
-AC_CONFIG_FILES([src/gnc-module/test/test-scm-module],
-                [chmod +x src/gnc-module/test/test-scm-module])
-AC_CONFIG_FILES([src/gnc-module/test/test-scm-multi],
-                [chmod +x src/gnc-module/test/test-scm-multi])
-AC_CONFIG_FILES([src/gnome-utils/test/test-load-module],
-                [chmod +x src/gnome-utils/test/test-load-module])
-AC_CONFIG_FILES([src/report/locale-specific/us/test/test-load-module],
-                [chmod +x src/report/locale-specific/us/test/test-load-module])
-AC_CONFIG_FILES([src/report/report-gnome/test/test-load-module],
-                [chmod +x src/report/report-gnome/test/test-load-module])
-AC_CONFIG_FILES([src/report/report-system/test/test-load-module],
-                [chmod +x src/report/report-system/test/test-load-module])
-AC_CONFIG_FILES([src/report/stylesheets/test/test-load-module],
-                [chmod +x src/report/stylesheets/test/test-load-module])
-AC_CONFIG_FILES([src/tax/us/test/test-load-module],
-                [chmod +x src/tax/us/test/test-load-module])
+AC_CONFIG_FILES([libgnucash/app-utils/test/test-load-module],
+                [chmod +x libgnucash/app-utils/test/test-load-module])
+AC_CONFIG_FILES([libgnucash/backend/xml/test/test-real-data.sh],
+                [chmod +x libgnucash/backend/xml/test/test-real-data.sh])
+AC_CONFIG_FILES([gnucash/bin/test/test-version],
+                [chmod +x gnucash/bin/test/test-version])
+AC_CONFIG_FILES([libgnucash/engine/test/test-create-account],
+                [chmod +x libgnucash/engine/test/test-create-account])
+AC_CONFIG_FILES([libgnucash/engine/test/test-scm-query-import],
+                [chmod +x libgnucash/engine/test/test-scm-query-import])
+AC_CONFIG_FILES([libgnucash/gnc-module/test/test-gwrapped-c],
+                [chmod +x libgnucash/gnc-module/test/test-gwrapped-c])
+AC_CONFIG_FILES([libgnucash/gnc-module/test/test-load-deps],
+                [chmod +x libgnucash/gnc-module/test/test-load-deps])
+AC_CONFIG_FILES([libgnucash/gnc-module/test/test-load-scm],
+                [chmod +x libgnucash/gnc-module/test/test-load-scm])
+AC_CONFIG_FILES([libgnucash/gnc-module/test/test-scm-dynload],
+                [chmod +x libgnucash/gnc-module/test/test-scm-dynload])
+AC_CONFIG_FILES([libgnucash/gnc-module/test/test-scm-init],
+                [chmod +x libgnucash/gnc-module/test/test-scm-init])
+AC_CONFIG_FILES([libgnucash/gnc-module/test/test-scm-module],
+                [chmod +x libgnucash/gnc-module/test/test-scm-module])
+AC_CONFIG_FILES([libgnucash/gnc-module/test/test-scm-multi],
+                [chmod +x libgnucash/gnc-module/test/test-scm-multi])
+AC_CONFIG_FILES([gnucash/gnome-utils/test/test-load-module],
+                [chmod +x gnucash/gnome-utils/test/test-load-module])
+AC_CONFIG_FILES([gnucash/report/locale-specific/us/test/test-load-module],
+                [chmod +x gnucash/report/locale-specific/us/test/test-load-module])
+AC_CONFIG_FILES([gnucash/report/report-gnome/test/test-load-module],
+                [chmod +x gnucash/report/report-gnome/test/test-load-module])
+AC_CONFIG_FILES([gnucash/report/report-system/test/test-load-module],
+                [chmod +x gnucash/report/report-system/test/test-load-module])
+AC_CONFIG_FILES([gnucash/report/stylesheets/test/test-load-module],
+                [chmod +x gnucash/report/stylesheets/test/test-load-module])
+AC_CONFIG_FILES([libgnucash/tax/us/test/test-load-module],
+                [chmod +x libgnucash/tax/us/test/test-load-module])
 
 # A few files need extra actions at creation time
-AC_CONFIG_FILES([src/bin/overrides/gnucash-make-guids], [chmod u+x src/bin/overrides/gnucash-make-guids])
+AC_CONFIG_FILES([gnucash/bin/overrides/gnucash-make-guids], [chmod u+x gnucash/bin/overrides/gnucash-make-guids])
 #Link (copy on Windows) test data files:
-AC_CONFIG_LINKS([src/import-export/csv-imp/test/sample1.csv:src/import-export/csv-imp/test/sample1.csv])
+AC_CONFIG_LINKS([gnucash/import-export/csv-imp/test/sample1.csv:gnucash/import-export/csv-imp/test/sample1.csv])
 LDFLAGS="${LDFLAGS} ${NOUNDEF}"
 AC_OUTPUT
 

gnucash/CMakeLists.txt

@@ -0,0 +1,21 @@
+# CMakeLists.txt for gnucash/
+
+# The subdirectories
+ADD_SUBDIRECTORY (bin)
+ADD_SUBDIRECTORY (gnome)
+ADD_SUBDIRECTORY (gnome-utils)
+ADD_SUBDIRECTORY (gnome-search)
+ADD_SUBDIRECTORY (html)
+ADD_SUBDIRECTORY (import-export)
+ADD_SUBDIRECTORY (plugins)
+ADD_SUBDIRECTORY (python)
+ADD_SUBDIRECTORY (register)
+ADD_SUBDIRECTORY(report)
+
+ADD_DEFINITIONS (-DHAVE_CONFIG_H)
+
+SET_LOCAL_DIST(gnucash_DIST_local CMakeLists.txt Makefile.am ${gnucash_EXTRA_DIST})
+
+SET(gnucash_DIST ${gnucash_DIST_local} ${bin_DIST} ${gnome_DIST} ${gnome_search_DIST}
+             ${gnome_utils_DIST} ${html_DIST} ${import_export_DIST} ${plugins_DIST} ${python_DIST}
+             ${register_DIST} ${report_DIST} PARENT_SCOPE)

gnucash/Makefile.am

@@ -0,0 +1,15 @@
+if WITH_PYTHON
+   PYTHON_DIR = python
+endif
+
+SUBDIRS = \
+  ${PYTHON_DIR} \
+  gnome-utils \
+  html \
+  gnome-search \
+  report \
+  register \
+  gnome \
+  import-export \
+  plugins \
+  bin

gnucash/bin/Makefile.am

@@ -8,17 +8,17 @@ endif
 AM_CPPFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
   -DPKGSYSCONFDIR=\"${GNC_CONFIGDIR}\" \
   -DPKGDATADIR=\"${GNC_SHAREDIR}\" \
-  -I${top_srcdir}/src \
-  -I${top_builddir}/src \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/gnome \
-  -I${top_builddir}/src \
-  -I${top_builddir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/report/report-system \
+  -I${top_srcdir}/common \
+  -I${top_builddir}/common \
+  -I${top_srcdir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/app-utils \
+  -I${top_srcdir}/gnucash/gnome-utils \
+  -I${top_srcdir}/libgnucash/engine \
+  -I${top_srcdir}/gnucash/gnome \
+  -I${top_builddir}/common \
+  -I${top_builddir}/libgnucash/core-utils \
+  -I${top_srcdir}/libgnucash/gnc-module \
+  -I${top_srcdir}/gnucash/report/report-system \
   ${GUILE_CFLAGS} \
   ${GTK_MAC_CFLAGS}
 
@@ -34,7 +34,7 @@ GNUCASH_RESOURCE_FILE = gnucash.rc
 dist_noinst_DATA = gnucash.rc
 
 .rc.o:
-	$(AM_V_GEN)$(RC) -I${top_srcdir}/src/pixmaps -i '$<' --input-format=rc -o '$@' -O coff
+	$(AM_V_GEN)$(RC) -I${top_srcdir}/libgnucash/pixmaps -i '$<' --input-format=rc -o '$@' -O coff
 
 else !PLATFORM_WIN32
 # All other platforms use these settings:
@@ -46,15 +46,15 @@ BIN_NAME = gnucash
 bin_PROGRAMS = ${BIN_NAME}
 gnucash_SOURCES = gnucash-bin.c ${GNUCASH_RESOURCE_FILE}
 gnucash_LDADD = \
-  ${top_builddir}/src/register/ledger-core/libgncmod-ledger-core.la \
-  ${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \
-  ${top_builddir}/src/gnome/libgnc-gnome.la \
-  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/report/report-system/libgncmod-report-system.la \
+  ${top_builddir}/gnucash/register/ledger-core/libgncmod-ledger-core.la \
+  ${top_builddir}/gnucash/report/report-gnome/libgncmod-report-gnome.la \
+  ${top_builddir}/gnucash/gnome/libgnc-gnome.la \
+  ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
+  ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
+  ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/gnucash/report/report-system/libgncmod-report-system.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS} \
   ${GTK_LIBS}

gnucash/bin/gnucash-bin.c

@@ -33,7 +33,7 @@
 #include "gnc-path.h"
 #include "binreloc.h"
 #include "gnc-locale-utils.h"
-#include "core-utils/gnc-version.h"
+#include "gnc-version.h"
 #include "gnc-engine.h"
 #include "gnc-environment.h"
 #include "gnc-filepath-utils.h"