RptCleanup - Restructure installation of gnucash scm files

These files were installed fairly ad-hoc into the share/gnucash/scm directory making
it hard to get an idea of where each file comes from.
The files are now structured as follows:
- any scm file authored by gnucash should go in share/gnucash/scm/gnucash or below
- most scm modules will be directly in that directory
- each module that comes with support files will get a subdirectory named after the
  module's base name. For example next to engine.scm there will be directory
  named engine for all support files of the engine module
- scm files that are not modules, but are loaded by modules go into
  <module-dir>. For example gnc-utils.scm loads gnc-menu-extensions.scm
  so that file will be installed in gnc-utils/gnc-menu-extensions.scm
- the report system is our largest module and only part of the restructuring
  is done at this point. It will be refined further in future commits.

The same restructuring is also done for the compiled files.

gnucash/gnome-utils/CMakeLists.txt

@@ -264,9 +264,9 @@ gnc_add_scheme_targets(scm-gnome-utils-1
 
 gnc_add_scheme_targets(scm-gnome-utils-2
   gnc-menu-extensions.scm
-  ""
+  "gnucash/gnome-utils"
   "${GUILE_DEPENDS}"
-  FALSE
+  TRUE
 )
 
 add_custom_target(scm-gnome-utils ALL DEPENDS scm-gnome-utils-2 scm-gnome-utils-1)

gnucash/gnome-utils/gnome-utils.scm

@@ -39,7 +39,7 @@
 (export gnc:make-menu)
 (export gnc:make-separator)
 
-(load-from-path "gnc-menu-extensions")
+(load-from-path "gnucash/gnome-utils/gnc-menu-extensions")
 
 ;; this function will receive 1 boolean argument, and can be used for
 ;; any UI init/shutdown routines. For now it will set the

gnucash/import-export/qif-imp/CMakeLists.txt

@@ -71,23 +71,23 @@ set(GUILE_DEPENDS
 
 gnc_add_scheme_targets(scm-qif-import-0
   "${qif_import_SCHEME_0}"
-  "gnucash/import-export"
+  "gnucash"
   "${GUILE_DEPENDS}"
   FALSE
 )
 
 gnc_add_scheme_targets(scm-qif-import-2
   "${qif_import_SCHEME_2}"
-  "gnucash/import-export"
+  "gnucash"
   "${GUILE_DEPENDS}"
   FALSE
 )
 
 gnc_add_scheme_targets(scm-qif-import
   "${qif_import_SCHEME}"
-  "qif-import"
+  "gnucash/qif-import"
   "${GUILE_DEPENDS};scm-qif-import-0"
-  FALSE
+  TRUE
 )
 
 set_local_dist(qif_import_DIST_local CMakeLists.txt file-format.txt ${qif_import_SOURCES} ${qif_import_noinst_HEADERS}

gnucash/import-export/qif-imp/gncmod-qif-import.c

@@ -86,7 +86,7 @@ libgncmod_qif_import_gnc_module_init(int refcount)
         ((void (*)())gnc_file_qif_import);
     }
 
-    scm_c_eval_string("(use-modules (gnucash import-export qif-import))");
+    scm_c_eval_string("(use-modules (gnucash qif-import))");
 
     gnc_plugin_qif_import_create_plugin();
 

gnucash/import-export/qif-imp/qif-dialog-utils.scm

@@ -24,7 +24,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash import-export string))
+(use-modules (gnucash string))
 
 (define (default-stock-acct brokerage security)
   (string-append brokerage (gnc-get-account-separator-string) security))

gnucash/import-export/qif-imp/qif-file.scm

@@ -26,7 +26,7 @@
 
 
 (use-modules (gnucash core-utils))
-(use-modules (gnucash import-export string))
+(use-modules (gnucash string))
 (use-modules (ice-9 regex))
 (use-modules (srfi srfi-13))
 (use-modules (ice-9 rdelim))

gnucash/import-export/qif-imp/qif-import.scm

@@ -24,7 +24,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-(define-module (gnucash import-export qif-import))
+(define-module (gnucash qif-import))
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash app-utils))
 
@@ -46,14 +46,14 @@
 (gnc:module-load "gnucash/app-utils" 0)
 (gnc:module-load "gnucash/gnome-utils" 0)
 
-(load-from-path "qif-import/qif-objects")      ;; class definitions
-(load-from-path "qif-import/qif-parse")        ;; string-to-value
-(load-from-path "qif-import/qif-utils")
-(load-from-path "qif-import/qif-file")         ;; actual file reading
-(load-from-path "qif-import/qif-dialog-utils") ;; build displays
-(load-from-path "qif-import/qif-guess-map")    ;; build acct mappings
-(load-from-path "qif-import/qif-to-gnc")       ;; conv QIF xtns to GNC
-(load-from-path "qif-import/qif-merge-groups") ;; merge into user's acct
+(load-from-path "gnucash/qif-import/qif-objects")      ;; class definitions
+(load-from-path "gnucash/qif-import/qif-parse")        ;; string-to-value
+(load-from-path "gnucash/qif-import/qif-utils")
+(load-from-path "gnucash/qif-import/qif-file")         ;; actual file reading
+(load-from-path "gnucash/qif-import/qif-dialog-utils") ;; build displays
+(load-from-path "gnucash/qif-import/qif-guess-map")    ;; build acct mappings
+(load-from-path "gnucash/qif-import/qif-to-gnc")       ;; conv QIF xtns to GNC
+(load-from-path "gnucash/qif-import/qif-merge-groups") ;; merge into user's acct
 
 (export make-qif-file)
 (export make-ticker-map)

gnucash/import-export/qif-imp/qif-objects.scm

@@ -23,7 +23,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(load-from-path "qif-import/simple-obj")
+(load-from-path "gnucash/qif-import/simple-obj")
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;  qif-file class 

gnucash/import-export/qif-imp/qif-parse.scm

@@ -23,7 +23,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash import-export string))
+(use-modules (gnucash string))
 
 (define qif-category-compiled-rexp
   (make-regexp "^ *(\\[)?([^]/|]*)(]?)(/?)([^|]*)(\\|(\\[)?([^]/]*)(]?)(/?)(.*))? *$"))

gnucash/import-export/qif-imp/qif-to-gnc.scm

@@ -26,7 +26,7 @@
 
 
 (use-modules (srfi srfi-13))
-(use-modules (gnucash import-export string))
+(use-modules (gnucash string))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;  qif-import:find-or-make-acct

gnucash/import-export/qif-imp/string.scm

@@ -15,7 +15,7 @@
 ;; 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 
-(define-module (gnucash import-export string))
+(define-module (gnucash string))
 (use-modules (srfi srfi-13))
 
 

gnucash/report/CMakeLists.txt

@@ -50,9 +50,6 @@ install(FILES ${report_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
 
 set (report_SCHEME
     report.scm
-    eguile-gnc.scm
-    eguile-utilities.scm
-    eguile-html-utilities.scm
 )
 
 set (report_SCHEME_2
@@ -78,6 +75,12 @@ set (report_SCHEME_2
     trep-engine.scm
 )
 
+set (report_SCHEME_3
+    eguile-gnc.scm
+    eguile-utilities.scm
+    eguile-html-utilities.scm
+)
+
 set(GUILE_DEPENDS
   gncmod-html
   scm-gnome-utils
@@ -89,7 +92,7 @@ set(GUILE_DEPENDS
 
 gnc_add_scheme_targets(scm-report-1
   "${report_SCHEME}"
-  "gnucash/report"
+  "gnucash"
   "${GUILE_DEPENDS}"
   FALSE
 )
@@ -101,13 +104,20 @@ gnc_add_scheme_targets(scm-report-2
   TRUE
 )
 
-add_custom_target(scm-report ALL DEPENDS scm-report-2)
+gnc_add_scheme_targets(scm-report-3
+  "${report_SCHEME_3}"
+  "gnucash/report"
+  scm-report-1
+  FALSE
+)
+
+add_custom_target(scm-report ALL DEPENDS scm-report-3)
 
 set_local_dist(report_DIST_local CMakeLists.txt
   report.i
   ${report_HEADERS} ${report_SOURCES}
   ${report_SCHEME} ${report_SCHEME_1}
-  ${report_SCHEME_2})
+  ${report_SCHEME_2} ${report_SCHEME_3})
 
 set(report_DIST ${report_DIST_local} ${jqplot_DIST} ${locale_specific_DIST}
                 ${reports_DIST} ${stylesheets_DIST} ${test_report_DIST} PARENT_SCOPE)

gnucash/report/gncmod-report.c

@@ -72,7 +72,7 @@ libgncmod_report_gnc_module_init(int refcount)
     }
     scm_init_sw_report_module();
 
-    scm_c_eval_string("(use-modules (gnucash report report))");
+    scm_c_eval_string("(use-modules (gnucash report))");
 
     /* if this is the first time the module's being loaded, initialize
      * the relative date system */

gnucash/report/html-barchart.scm

@@ -21,7 +21,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 
 (define <html-barchart>
   (make-record-type "<html-barchart>"

gnucash/report/html-linechart.scm

@@ -24,7 +24,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 
 (define <html-linechart>
   (make-record-type "<html-linechart>"

gnucash/report/html-piechart.scm

@@ -21,7 +21,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 
 (define <html-piechart>
   (make-record-type "<html-piechart>"

gnucash/report/html-scatter.scm

@@ -24,7 +24,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 
 (define <html-scatter>
   (make-record-type "<html-scatter>"

gnucash/report/report.scm

@@ -24,7 +24,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-(define-module (gnucash report report))
+(define-module (gnucash report))
 (use-modules (gnucash utilities)) 
 (use-modules (ice-9 regex))
 (use-modules (srfi srfi-1))

gnucash/report/reports/reports.scm

@@ -28,7 +28,7 @@
 (use-modules (srfi srfi-13))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash core-utils))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 (use-modules (gnucash utilities))
 
 (export gnc:register-report-create)

gnucash/report/reports/standard/test/test-average-balance.scm

@@ -3,7 +3,7 @@
 (gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash report reports example average-balance))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 (use-modules (gnucash report reports standard budget))
 (use-modules (tests test-report-extras))
 (use-modules (gnucash report stylesheets))

gnucash/report/reports/standard/test/test-balsheet-pnl.scm

@@ -4,7 +4,7 @@
 (use-modules (gnucash report reports standard balance-sheet))
 (use-modules (gnucash report reports standard income-statement))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 (use-modules (tests test-report-extras))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))

gnucash/report/reports/standard/test/test-budget.scm

@@ -26,7 +26,7 @@
 (gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 
 (use-modules (gnucash utilities))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))

gnucash/report/reports/standard/test/test-cash-flow.scm

@@ -4,7 +4,7 @@
 
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash report reports standard cash-flow))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 
 (define (run-test)
   (and (test test-one-tx-in-cash-flow)

gnucash/report/reports/standard/test/test-cashflow-barchart.scm

@@ -26,7 +26,7 @@
 (use-modules (sw_engine))
 (use-modules (tests test-engine-extras))
 (use-modules (tests srfi64-extras))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 (use-modules (tests test-report-extras))
 (use-modules (gnucash report reports standard cashflow-barchart))
 (use-modules (gnucash report stylesheets))

gnucash/report/reports/standard/test/test-charts.scm

@@ -8,7 +8,7 @@
 (use-modules (gnucash report reports standard price-scatter))
 (use-modules (gnucash report reports example daily-reports))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 (use-modules (tests test-report-extras))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))

gnucash/report/reports/standard/test/test-income-gst.scm

@@ -3,7 +3,7 @@
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash report reports standard income-gst-statement))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 (use-modules (tests test-report-extras))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))

gnucash/report/reports/standard/test/test-invoice.scm

@@ -3,7 +3,7 @@
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash report reports standard invoice))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 (use-modules (tests test-report-extras))
 (use-modules (srfi srfi-1))
 (use-modules (srfi srfi-64))

gnucash/report/reports/standard/test/test-register.scm

@@ -31,7 +31,7 @@
 (gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 
 (use-modules (gnucash utilities))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))

gnucash/report/reports/standard/test/test-standard-category-report.scm

@@ -31,7 +31,7 @@
 (gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 
 (use-modules (gnucash utilities)) 
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))

gnucash/report/reports/standard/test/test-stress-options.scm

@@ -8,7 +8,7 @@
 (use-modules (gnucash report reports standard view-column))
 (use-modules (gnucash report stylesheets))
 (use-modules (gnucash report reports standard taxinvoice))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 (use-modules (tests test-report-extras))
 (use-modules (srfi srfi-64))
 (use-modules (srfi srfi-98))

gnucash/report/reports/standard/test/test-transaction.scm

@@ -4,7 +4,7 @@
 (use-modules (gnucash report reports standard transaction))
 (use-modules (gnucash report reports standard reconcile-report))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 (use-modules (tests test-report-extras))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))

gnucash/report/test/test-commodity-utils.scm

@@ -29,7 +29,7 @@
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
 (use-modules (sw_app_utils))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 (use-modules (system vm coverage))
 
 (setlocale LC_ALL "C")

gnucash/report/test/test-html-chart.scm

@@ -7,7 +7,7 @@
 (use-modules (tests srfi64-extras))
 (use-modules (tests test-engine-extras))
 (use-modules (tests test-report-extras))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 
 (define (run-test)
   (test-runner-factory gnc:test-runner)

gnucash/report/test/test-html-utilities-srfi64.scm

@@ -5,7 +5,7 @@
 
 (use-modules (tests test-engine-extras))
 (use-modules (tests test-report-extras))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 (use-modules (tests srfi64-extras))
 (use-modules (srfi srfi-64))
 

gnucash/report/test/test-report-extras.scm

@@ -21,7 +21,7 @@
 
 (use-modules (gnucash gnc-module))
 (use-modules (tests test-engine-extras))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 (use-modules (sxml simple))
 (use-modules (sxml xpath))
 

gnucash/report/test/test-report-html.scm

@@ -3,7 +3,7 @@
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 
 (use-modules (tests test-engine-extras))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
 

gnucash/report/test/test-report-utilities.scm

@@ -7,7 +7,7 @@
 (use-modules (tests srfi64-extras))
 (use-modules (tests test-engine-extras))
 (use-modules (tests test-report-extras))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 
 (setlocale LC_ALL "C")
 

gnucash/report/test/test-report.scm

@@ -3,7 +3,7 @@
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 
 (use-modules (tests test-engine-extras))
-(use-modules (gnucash report report))
+(use-modules (gnucash report))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
 

libgnucash/app-utils/CMakeLists.txt

@@ -151,12 +151,9 @@ install(FILES ${app_utils_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnuca
 
 # And now handle scheme files
 
-set (app_utils_SCHEME_2
-    app-utils.scm
-)
-
 set (app_utils_SCHEME_1
     business-options.scm
+    business-prefs.scm
     c-interface.scm
     date-utilities.scm
     options.scm
@@ -164,8 +161,8 @@ set (app_utils_SCHEME_1
     fin.scm
 )
 
-set(app_utils_SCHEME_3
-    business-prefs.scm
+set (app_utils_SCHEME_2
+    app-utils.scm
 )
 
 set(GUILE_DEPENDS
@@ -180,14 +177,14 @@ gnc_add_scheme_targets(scm-gettext
   gettext.scm
   gnucash
   gncmod-app-utils
-  FALSE
+  TRUE
 )
 
 gnc_add_scheme_targets(scm-app-utils-1
   "${app_utils_SCHEME_1}"
-  ""
+  "gnucash/app-utils"
   "scm-gettext;${GUILE_DEPENDS}"
-  FALSE
+  TRUE
 )
 
 gnc_add_scheme_targets(scm-app-utils-2
@@ -197,14 +194,7 @@ gnc_add_scheme_targets(scm-app-utils-2
   FALSE
 )
 
-gnc_add_scheme_targets(scm-app-utils-3
-  "${app_utils_SCHEME_3}"
-  ""
-  "scm-app-utils-2"
-  FALSE
-)
-
-add_custom_target(scm-app-utils ALL DEPENDS scm-app-utils-3 scm-app-utils-2 scm-app-utils-1 scm-gettext)
+add_custom_target(scm-app-utils ALL DEPENDS scm-app-utils-2 scm-app-utils-1 scm-gettext)
 
 set_local_dist(app_utils_DIST_local
         ${app_utils_ALL_SOURCES} gettext.scm ${app_utils_SCHEME_1} ${app_utils_SCHEME_2} ${app_utils_SCHEME_3}

libgnucash/app-utils/app-utils.scm

@@ -266,10 +266,10 @@
 (define gnc:*kvp-option-path* (list KVP-OPTION-PATH))
 (export gnc:*kvp-option-path*)
 
-(load-from-path "c-interface")
-(load-from-path "options")
-(load-from-path "prefs")
-(load-from-path "date-utilities")
+(load-from-path "gnucash/app-utils/c-interface")
+(load-from-path "gnucash/app-utils/options")
+(load-from-path "gnucash/app-utils/prefs")
+(load-from-path "gnucash/app-utils/date-utilities")
 
 ;; Business options
 (define gnc:*business-label* (N_ "Business"))
@@ -318,5 +318,5 @@
 
 (export gnc:*option-section-budgeting* gnc:*option-name-default-budget*)
 
-(load-from-path "business-options")
-(load-from-path "business-prefs")
+(load-from-path "gnucash/app-utils/business-options")
+(load-from-path "gnucash/app-utils/business-prefs")

libgnucash/app-utils/business-prefs.scm

@@ -19,7 +19,7 @@
 ;; 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 
-(use-modules (gnucash app-utils))
+(use-modules (gnucash gettext))
 
 (define gnc:*option-section-counters* (N_ "Counters"))
 

libgnucash/app-utils/gnc-exp-parser.c

@@ -81,7 +81,7 @@ gnc_exp_parser_real_init ( gboolean addPredefined )
         gnc_exp_parser_shutdown ();
 
     /* The parser uses fin.scm for financial functions, so load it here. */
-    scm_primitive_load_path(scm_from_utf8_string("fin"));
+    scm_primitive_load_path(scm_from_utf8_string("gnucash/app-utils/fin"));
     variable_bindings = g_hash_table_new (g_str_hash, g_str_equal);
 
     /* This comes after the statics have been initialized. Not at the end! */

libgnucash/app-utils/test/test-c-interface.scm

@@ -19,7 +19,7 @@
 
 (setenv "GNC_UNINSTALLED" "1")
 (debug-set! stack 50000)
-(load-from-path "c-interface")
+(load-from-path "gnucash/app-utils/c-interface")
 (use-modules (tests test-engine-extras))
 
 (define (test-func a b)

libgnucash/engine/CMakeLists.txt

@@ -298,9 +298,9 @@ gnc_add_scheme_targets(scm-engine-0
 
 gnc_add_scheme_targets(scm-engine-1
   "${engine_SCHEME_1}"
-  ""
+  "gnucash/engine"
   "scm-engine-0;${GUILE_DEPENDS}"
-  FALSE
+  TRUE
 )
 
 add_custom_target(scm-engine ALL DEPENDS scm-engine-1 scm-engine-0)

libgnucash/engine/engine.scm

@@ -115,7 +115,7 @@
 (export trans-splits)
 (export gnc:transaction-scm-onto-transaction)
 
-(load-from-path "gnc-numeric")
-(load-from-path "commodity-table")
-(load-from-path "engine-interface")
-(load-from-path "engine-utilities")
+(load-from-path "gnucash/engine/gnc-numeric")
+(load-from-path "gnucash/engine/commodity-table")
+(load-from-path "gnucash/engine/engine-interface")
+(load-from-path "gnucash/engine/engine-utilities")

libgnucash/tax/us/CMakeLists.txt

@@ -23,26 +23,44 @@ install(TARGETS gncmod-tax-us
 
 # Scheme
 
-set(gncmod_tax_us_SCHEME_1 txf.scm txf-help.scm txf-de_DE.scm txf-help-de_DE.scm)
-set(gncmod_tax_us_SCHEME_2 de_DE.scm us.scm)
+set(gncmod_tax_us_SCHEME_1 txf.scm txf-help.scm)
+set(gncmod_tax_us_SCHEME_2 tax-us.scm)
 
-set(GUILE_DEPENDS      scm-app-utils scm-gnc-module)
+set(gncmod_tax_de_DE_SCHEME_1 txf-de_DE.scm txf-help-de_DE.scm)
+set(gncmod_tax_de_DE_SCHEME_2 tax-de_DE.scm)
+
+set(GUILE_DEPENDS scm-app-utils scm-gnc-module)
 
 gnc_add_scheme_targets(scm-tax-us-1
   "${gncmod_tax_us_SCHEME_1}"
-  ""
+  "gnucash/tax-us"
   "${GUILE_DEPENDS}"
-  FALSE
+  TRUE
   )
 gnc_add_scheme_targets(scm-tax-us-2
   "${gncmod_tax_us_SCHEME_2}"
-  gnucash/tax
+  gnucash
   "${GUILE_DEPENDS}"
   FALSE
   )
 
-add_custom_target(scm-tax-us ALL DEPENDS scm-tax-us-1 scm-tax-us-2)
+gnc_add_scheme_targets(scm-tax-de_DE-1
+  "${gncmod_tax_de_DE_SCHEME_1}"
+  "gnucash/tax-de_DE"
+  "${GUILE_DEPENDS}"
+  TRUE
+  )
+gnc_add_scheme_targets(scm-tax-de_DE-2
+  "${gncmod_tax_de_DE_SCHEME_2}"
+  gnucash
+  "${GUILE_DEPENDS}"
+  FALSE
+  )
 
-set_local_dist(tax_us_DIST_local CMakeLists.txt ${tax_us_SOURCES} ${gncmod_tax_us_SCHEME_1} ${gncmod_tax_us_SCHEME_2})
+add_custom_target(scm-tax-us ALL DEPENDS scm-tax-us-1 scm-tax-us-2 scm-tax-de_DE-1 scm-tax-de_DE-2 )
+
+set_local_dist(tax_us_DIST_local CMakeLists.txt ${tax_us_SOURCES}
+    ${gncmod_tax_us_SCHEME_1} ${gncmod_tax_us_SCHEME_2}
+    ${gncmod_tax_de_DE_SCHEME_1} ${gncmod_tax_de_DE_SCHEME_2})
 set(tax_us_DIST ${tax_us_DIST_local} ${test_tax_us_DIST} PARENT_SCOPE)
 

libgnucash/tax/us/gncmod-tax-us.c

@@ -91,9 +91,9 @@ libgncmod_tax_us_gnc_module_init(int refcount)
     gboolean is_de_DE = (strncmp(thislocale, "de_DE", 5) == 0);
 # endif /* G_OS_WIN32 */
     if (is_de_DE)
-        lmod("(gnucash tax de_DE)");
+        lmod("(gnucash tax-de_DE)");
     else
-        lmod("(gnucash tax us)");
+        lmod("(gnucash tax-us)");
     return TRUE;
 }
 

libgnucash/tax/us/tax-de_DE.scm

@@ -17,7 +17,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash tax de_DE))
+(define-module (gnucash tax-de_DE))
 
 (use-modules (gnucash gnc-module))
 (eval-when
@@ -54,5 +54,5 @@
 
 (export gnc:*tax-label* gnc:*tax-nr-label*)
 
-(load-from-path "txf-de_DE")
-(load-from-path "txf-help-de_DE")
+(load-from-path "gnucash/tax-de_DE/txf-de_DE")
+(load-from-path "gnucash/tax-de_DE/txf-help-de_DE")

libgnucash/tax/us/tax-us.scm

@@ -17,7 +17,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash tax us))
+(define-module (gnucash tax-us))
 
 (export gnc:txf-get-payer-name-source)
 (export gnc:txf-get-form)
@@ -40,5 +40,5 @@
 (export txf-asset-categories)
 (export txf-liab-eq-categories)
 
-(load-from-path "txf")
-(load-from-path "txf-help")
+(load-from-path "gnucash/tax-us/txf")
+(load-from-path "gnucash/tax-us/txf-help")

po/POTFILES.in

@@ -700,10 +700,10 @@ libgnucash/gnc-module/gnc-module.c
 libgnucash/gnc-module/gnc-module.scm
 libgnucash/scm/price-quotes.scm
 libgnucash/scm/utilities.scm
-libgnucash/tax/us/de_DE.scm
 libgnucash/tax/us/gncmod-tax-us.c
+libgnucash/tax/us/tax-de_DE.scm
+libgnucash/tax/us/tax-us.scm
 libgnucash/tax/us/txf-de_DE.scm
 libgnucash/tax/us/txf-help-de_DE.scm
 libgnucash/tax/us/txf-help.scm
 libgnucash/tax/us/txf.scm
-libgnucash/tax/us/us.scm