Move string.scm to qif-imp, the only place it's used.

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

@@ -38,6 +38,10 @@ INSTALL(TARGETS gncmod-qif-import
 
 # Scheme
 
+SET (qif_import_SCHEME_0
+  string.scm
+  )
+
 SET (qif_import_SCHEME
   qif-dialog-utils.scm
   qif-file.scm
@@ -65,6 +69,13 @@ SET(GUILE_DEPENDS
   scm-gnome-utils
   )
 
+GNC_ADD_SCHEME_TARGETS(scm-qif-import-0
+  "${qif_import_SCHEME_0}"
+  "gnucash/import-export"
+  "${GUILE_DEPENDS}"
+  FALSE
+)
+
 GNC_ADD_SCHEME_TARGETS(scm-qif-import-2
   "${qif_import_SCHEME_2}"
   "gnucash/import-export"
@@ -75,7 +86,7 @@ GNC_ADD_SCHEME_TARGETS(scm-qif-import-2
 GNC_ADD_SCHEME_TARGETS(scm-qif-import
   "${qif_import_SCHEME}"
   "qif-import"
-  "${GUILE_DEPENDS}"
+  "${GUILE_DEPENDS};scm-qif-import-0"
   FALSE
 )
 

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

@@ -24,6 +24,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(use-modules (gnucash import-export 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,6 +26,7 @@
 
 
 (use-modules (gnucash core-utils))
+(use-modules (gnucash import-export string))
 (use-modules (ice-9 regex))
 (use-modules (srfi srfi-13))
 (use-modules (ice-9 rdelim))

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

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

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

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

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

@@ -15,6 +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))
 (use-modules (srfi srfi-13))
 
 

libgnucash/scm/CMakeLists.txt

@@ -1,9 +1,8 @@
 SET(GUILE_DEPENDS      scm-core-utils scm-gnc-module)
-SET(scm_SCHEME   string.scm utilities.scm)
 
 
 GNC_ADD_SCHEME_TARGETS(scm-scm
-  "${scm_SCHEME}"
+  "utilities.scm"
   gnucash
   "${GUILE_DEPENDS}"
   FALSE
@@ -17,7 +16,7 @@ GNC_ADD_SCHEME_TARGETS(price-quotes
   FALSE)
 
 
-SET_LOCAL_DIST(scm_DIST_local CMakeLists.txt ${scm_SCHEME} price-quotes.scm)
+SET_LOCAL_DIST(scm_DIST_local CMakeLists.txt utilities.scm price-quotes.scm)
 SET(scm_DIST ${scm_DIST_local} ${scm_gnumeric_DIST} PARENT_SCOPE)
 
 

libgnucash/scm/utilities.scm

@@ -34,8 +34,6 @@
 
 (use-modules (gnucash gnc-module))
 
-(load-from-path "gnucash/string")
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Exports
 
@@ -44,7 +42,6 @@
 (export gnc:error)
 (export gnc:msg)
 (export gnc:debug)
-(export gnc:safe-strcmp) ;; only used by aging.scm atm...
 
 ;; Do this stuff very early -- but other than that, don't add any
 ;; executable code until the end of the file if you can help it.

po/POTFILES.in

@@ -354,6 +354,7 @@ gnucash/import-export/qif-imp/qif-objects.scm
 gnucash/import-export/qif-imp/qif-parse.scm
 gnucash/import-export/qif-imp/qif-to-gnc.scm
 gnucash/import-export/qif-imp/qif-utils.scm
+gnucash/import-export/qif-imp/string.scm
 gnucash/python/gncmod-python.c
 gnucash/register/ledger-core/gncEntryLedger.c
 gnucash/register/ledger-core/gncEntryLedgerControl.c
@@ -695,7 +696,6 @@ libgnucash/gnc-module/example/gncmod-example.c
 libgnucash/gnc-module/gnc-module.c
 libgnucash/gnc-module/gnc-module.scm
 libgnucash/scm/price-quotes.scm
-libgnucash/scm/string.scm
 libgnucash/scm/utilities.scm
 libgnucash/tax/us/de_DE.scm
 libgnucash/tax/us/gncmod-tax-us.c