Rename directory for code from external projects

'lib' is also being used by the cmake build, so there was a
theoretical risk for file conflicts. The new name is 'borrowed'.

CMakeLists.txt

@@ -680,9 +680,9 @@ 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})
 
 # The subdirectories
+ADD_SUBDIRECTORY (borrowed)
 ADD_SUBDIRECTORY (data)
 ADD_SUBDIRECTORY (doc)
-ADD_SUBDIRECTORY (lib)
 ADD_SUBDIRECTORY (macros)
 ADD_SUBDIRECTORY (po)
 ADD_SUBDIRECTORY (common)
@@ -723,8 +723,8 @@ SET_LOCAL_DIST(toplvl_DIST ${toplvl_DIST_local})
 # then uses a (SET ${foo_DIST} ${locals....} PARENT_SCOPE) command to report up. See the bottom of
 # libgnucash/app-utils/CMakeLists.txt for an example of this.
 
-SET(ALL_DIST ${bindings_DIST} ${cmake_DIST} ${common_DIST} ${data_DIST}
-    ${doc_DIST} ${gnucash_DIST} ${lib_DIST} ${libgnucash_DIST} ${macros_DIST} ${packaging_DIST}
+SET(ALL_DIST ${bindings_DIST} ${borrowed_DIST} ${cmake_DIST} ${common_DIST} ${data_DIST}
+    ${doc_DIST} ${gnucash_DIST} ${libgnucash_DIST} ${macros_DIST} ${packaging_DIST}
     ${po_DIST} ${test_templates_DIST} ${toplvl_DIST} ${util_DIST})
 
 

Makefile.am

@@ -3,7 +3,7 @@ if GNUCASH_ENABLE_GUI
 else
   GNUCASH_SUBDIR =
 endif
-SUBDIRS = . doc lib common libgnucash bindings ${GNUCASH_SUBDIR} po data
+SUBDIRS = . doc borrowed common libgnucash bindings ${GNUCASH_SUBDIR} po data
 
 GNC_CTAGS_FILE = @GNC_CTAGS_FILE@
 GNC_ETAGS_FILE = @GNC_ETAGS_FILE@

borrowed/CMakeLists.txt

@@ -0,0 +1,5 @@
+ADD_SUBDIRECTORY(libc)
+ADD_SUBDIRECTORY(goffice)
+
+SET_LOCAL_DIST(borrowed_DIST_local CMakeLists.txt Makefile.am README)
+SET(borrowed_DIST ${borrowed_DIST_local} ${libc_DIST} ${goffice_DIST} PARENT_SCOPE)

configure.ac

@@ -1643,6 +1643,9 @@ AC_CONFIG_FILES(
   bindings/Makefile
   bindings/python/Makefile
   bindings/python/tests/Makefile
+  borrowed/Makefile
+  borrowed/goffice/Makefile
+  borrowed/libc/Makefile
   common/Makefile
   common/debug/Makefile
   common/debug/valgrind/Makefile
@@ -1713,9 +1716,6 @@ AC_CONFIG_FILES(
   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

gnucash/gnome-utils/Makefile.am

@@ -13,7 +13,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/common \
   -I${top_builddir}/common \
   -I${top_builddir}/libgnucash/core-utils \
-  -I${top_srcdir}/lib/libc \
+  -I${top_srcdir}/borrowed/libc \
   ${GLIB_CFLAGS} \
   ${GTK_CFLAGS} \
   ${GNOME_KEYRING_CFLAGS} \
@@ -198,7 +198,7 @@ libgncmod_gnome_utils_la_LIBADD = \
   ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
   ${top_builddir}/libgnucash/backend/xml/libgnc-backend-xml-utils.la \
   ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
-  $(top_builddir)/lib/libc/libc-missing.la \
+  $(top_builddir)/borrowed/libc/libc-missing.la \
   ${GTK_LIBS} \
   ${GNOME_KEYRING_LIBS} \
   ${LIBSECRET_LIBS} \

gnucash/gnome/CMakeLists.txt

@@ -131,7 +131,7 @@ SET_SOURCE_FILES_PROPERTIES (${gnc_gnome_SOURCES} PROPERTIES OBJECT_DEPENDS ${CO
 SET_SOURCE_FILES_PROPERTIES (business-options-gnome.c PROPERTIES OBJECT_DEPENDS ${SWIG_RUNTIME_H})
 
 IF (WIN32)
-  SET (gnc_gnome_SOURCES ${gnc_gnome_SOURCES} ${CMAKE_SOURCE_DIR}/lib/libc/strfmon.c)
+  SET (gnc_gnome_SOURCES ${gnc_gnome_SOURCES} ${CMAKE_SOURCE_DIR}/borrowed/libc/strfmon.c)
 ENDIF(WIN32)
 
 ADD_LIBRARY (gnc-gnome ${gnc_gnome_SOURCES} ${gnc_gnome_noinst_HEADERS} ${SWIG_GNOME_C})

gnucash/gnome/Makefile.am

@@ -184,7 +184,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/gnucash/register/register-gnome \
   -I${top_srcdir}/gnucash/report/report-system \
   -I${top_srcdir}/gnucash/report/report-gnome \
-  -I${top_srcdir}/lib/libc \
+  -I${top_srcdir}/borrowed/libc \
   ${LIBXML2_CFLAGS} \
   ${GUILE_CFLAGS} \
   ${GTK_CFLAGS} \

gnucash/html/Makefile.am

@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/libgnucash/app-utils \
   -I${top_srcdir}/common \
   -I${top_builddir}/common \
-  -I${top_srcdir}/lib/libc \
+  -I${top_srcdir}/borrowed/libc \
   ${GLIB_CFLAGS} \
   ${GUILE_CFLAGS} \
   ${GTK_CFLAGS} \
@@ -44,7 +44,7 @@ libgncmod_html_la_LIBADD = \
   ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
   ${top_builddir}/gnucash/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/libgnucash/app-utils/libgncmod-app-utils.la \
-  $(top_builddir)/lib/libc/libc-missing.la \
+  $(top_builddir)/borrowed/libc/libc-missing.la \
   ${WEBKIT_LIBS} \
   ${GTK_LIBS} \
   ${GLIB_LIBS} \

gnucash/import-export/bi-import/Makefile.am

@@ -24,7 +24,7 @@ libgncmod_bi_import_la_LIBADD = \
   ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
   ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
   ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
-  ${top_builddir}/lib/libc/libc-missing.la \
+  ${top_builddir}/borrowed/libc/libc-missing.la \
   ${GLIB_LIBS}
 
 AM_CPPFLAGS = \
@@ -42,7 +42,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/libgnucash/engine \
   -I${top_srcdir}/libgnucash/core-utils \
   -I${top_srcdir}/libgnucash/gnc-module \
-  -I${top_srcdir}/lib/libc \
+  -I${top_srcdir}/borrowed/libc \
   ${GTK_CFLAGS} \
   ${GLIB_CFLAGS}
 

gnucash/import-export/csv-exp/Makefile.am

@@ -25,7 +25,7 @@ libgncmod_csv_export_la_LIBADD = \
   ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
   ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
   ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
-  ${top_builddir}/lib/libc/libc-missing.la \
+  ${top_builddir}/borrowed/libc/libc-missing.la \
   ${GTK_LIBS} \
   ${GLIB_LIBS}
 
@@ -41,7 +41,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/gnucash/register/register-core \
   -I${top_srcdir}/gnucash/register/register-gnome \
   -I${top_srcdir}/gnucash/import-export \
-  -I${top_srcdir}/lib/libc \
+  -I${top_srcdir}/borrowed/libc \
   -I${top_srcdir}/lib \
   ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS} \

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

@@ -2,9 +2,9 @@ ADD_SUBDIRECTORY(gschemas)
 ADD_SUBDIRECTORY(test)
 
 SET(csv_import_remote_SOURCES
-  ${CMAKE_SOURCE_DIR}/lib/goffice/go-charmap-sel.c
-  ${CMAKE_SOURCE_DIR}/lib/goffice/go-optionmenu.c
-  ${CMAKE_SOURCE_DIR}/lib/goffice/go-glib-extras.c
+  ${CMAKE_SOURCE_DIR}/borrowed/goffice/go-charmap-sel.c
+  ${CMAKE_SOURCE_DIR}/borrowed/goffice/go-optionmenu.c
+  ${CMAKE_SOURCE_DIR}/borrowed/goffice/go-glib-extras.c
 )
 
 SET(csv_import_SOURCES
@@ -28,9 +28,9 @@ SET(csv_import_SOURCES
 SET_SOURCE_FILES_PROPERTIES (${csv_import_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
 SET(csv_import_remote_HEADERS
-  ${CMAKE_SOURCE_DIR}/lib/goffice/go-charmap-sel.h
-  ${CMAKE_SOURCE_DIR}/lib/goffice/go-optionmenu.h
-  ${CMAKE_SOURCE_DIR}/lib/goffice/go-glib-extras.h
+  ${CMAKE_SOURCE_DIR}/borrowed/goffice/go-charmap-sel.h
+  ${CMAKE_SOURCE_DIR}/borrowed/goffice/go-optionmenu.h
+  ${CMAKE_SOURCE_DIR}/borrowed/goffice/go-glib-extras.h
 )
 
 SET(csv_import_noinst_HEADERS
@@ -69,8 +69,7 @@ TARGET_COMPILE_DEFINITIONS(gncmod-csv-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import
 
 TARGET_INCLUDE_DIRECTORIES(gncmod-csv-import PRIVATE
      ${ICU4C_I18N_INCLUDE_DIRS}
-     ${CMAKE_SOURCE_DIR}/lib
-     ${CMAKE_SOURCE_DIR}/lib/goffice
+     ${CMAKE_SOURCE_DIR}/borrowed/goffice
 )
 
 INSTALL(TARGETS gncmod-csv-import
@@ -97,4 +96,4 @@ FILE(COPY ${csv_import_GLADE}
 SET_LOCAL_DIST(csv_import_DIST_local CMakeLists.txt Makefile.am
         ${csv_import_SOURCES} ${csv_import_noinst_HEADERS}
         ${csv_import_GLADE} ${csv_import_UI})
-SET(csv_import_DIST ${csv_import_DIST_local} ${test_csv_import_DIST} ${csv_import_gschema_DIST} PARENT_SCOPE)
+SET(csv_import_DIST ${csv_import_DIST_local} ${test_csv_import_DIST} ${csv_import_gschema_DIST} PARENT_SCOPE)

gnucash/import-export/csv-imp/Makefile.am

@@ -42,8 +42,8 @@ libgncmod_csv_import_la_LIBADD = \
   ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
   ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
   ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
-  ${top_builddir}/lib/goffice/libgnc-goffice.la \
-  ${top_builddir}/lib/libc/libc-missing.la \
+  ${top_builddir}/borrowed/goffice/libgnc-goffice.la \
+  ${top_builddir}/borrowed/libc/libc-missing.la \
   ${GLIB_LIBS} \
   ${GTK_LIBS} \
   ${ICU4C_I18N_LIBS} \
@@ -60,9 +60,8 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/gnucash/gnome \
   -I${top_srcdir}/gnucash/gnome-utils \
   -I${top_srcdir}/gnucash/import-export \
-  -I${top_srcdir}/lib/libc \
-  -I${top_srcdir}/lib/goffice \
-  -I${top_srcdir}/lib \
+  -I${top_srcdir}/borrowed/libc \
+  -I${top_srcdir}/borrowed/goffice \
   ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${GTK_CFLAGS} \

gnucash/import-export/csv-imp/gnc-tokenizer.cpp

@@ -14,7 +14,7 @@
 #include <boost/locale.hpp>
 
 extern "C" {
-#include <goffice/go-glib-extras.h>
+#include <go-glib-extras.h>
 }
 
 std::unique_ptr<GncTokenizer> gnc_tokenizer_factory(GncImpFileFormat fmt)

gnucash/import-export/csv-imp/test/Makefile.am

@@ -48,8 +48,7 @@ IMP_TEST_CPPFLAGS =  \
   -I${top_srcdir}/libgnucash/engine \
   -I${top_srcdir}/libgnucash/core-utils \
   -I${top_srcdir}/libgnucash/gnc-module \
-  -I${top_srcdir}/lib/libc \
-  -I${top_srcdir}/lib \
+  -I${top_srcdir}/borrowed/libc \
   ${GTK_CFLAGS} \
   ${GLIB_CFLAGS} \
   $(BOOST_CPPFLAGS)

gnucash/import-export/customer-import/Makefile.am

@@ -22,7 +22,7 @@ libgncmod_customer_import_la_LIBADD = \
   ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
   ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
   ${top_builddir}/libgnucash/gnc-module/libgnc-module.la \
-  ${top_builddir}/lib/libc/libc-missing.la \
+  ${top_builddir}/borrowed/libc/libc-missing.la \
   ${GLIB_LIBS}
 
 AM_CPPFLAGS = \
@@ -39,7 +39,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/libgnucash/engine \
   -I${top_srcdir}/libgnucash/core-utils \
   -I${top_srcdir}/libgnucash/gnc-module \
-  -I${top_srcdir}/lib/libc \
+  -I${top_srcdir}/borrowed/libc \
   ${GTK_CFLAGS} \
   ${GLIB_CFLAGS}
 

lib/CMakeLists.txt

@@ -1,5 +0,0 @@
-ADD_SUBDIRECTORY(libc)
-ADD_SUBDIRECTORY(goffice)
-
-SET_LOCAL_DIST(lib_DIST_local CMakeLists.txt Makefile.am README)
-SET(lib_DIST ${lib_DIST_local} ${libc_DIST} ${goffice_DIST} PARENT_SCOPE)

libgnucash/app-utils/Makefile.am

@@ -21,7 +21,7 @@ pkglib_LTLIBRARIES = libgncmod-app-utils.la
 
 AM_CPPFLAGS = \
   -Wno-error=deprecated-declarations \
-  -I$(top_srcdir)/lib/libc \
+  -I$(top_srcdir)/borrowed/libc \
   -I${top_srcdir}/common \
   -I${top_builddir}/common \
   -I${top_srcdir}/libgnucash/gnc-module \

libgnucash/backend/dbi/Makefile.am

@@ -13,7 +13,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/common/debug \
   -I${top_srcdir}/libgnucash/engine \
   -I${top_srcdir}/libgnucash/core-utils \
-  -I${top_srcdir}/lib/libc \
+  -I${top_srcdir}/borrowed/libc \
   -I${top_srcdir}/common \
   ${GLIB_CFLAGS} \
   ${BOOST_CPPFLAGS} \

libgnucash/backend/dbi/test/Makefile.am

@@ -3,7 +3,7 @@
 include $(top_srcdir)/test-templates/Makefile.decl
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/lib/libc \
+-I${top_srcdir}/borrowed/libc \
   -I${top_srcdir}/common \
   -I${top_srcdir}/libgnucash/core-utils \
   -I${top_srcdir}/libgnucash/gnc-module \
@@ -24,7 +24,7 @@ LDADD = ${top_builddir}/common/test-core/libtest-core.la \
         ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
         ${top_builddir}/libgnucash/backend/sql/libgnc-backend-sql.la \
         ${top_builddir}/libgnucash/backend/xml/libgnc-backend-xml-utils.la \
-        ${top_builddir}/lib/libc/libc-missing.la
+        ${top_builddir}/borrowed/libc/libc-missing.la
 
 GNC_TEST_DEPS = \
   --gnc-module-dir ${top_builddir}/libgnucash/engine \

libgnucash/backend/sql/Makefile.am

@@ -13,7 +13,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/common/debug \
   -I${top_srcdir}/libgnucash/engine \
   -I${top_srcdir}/libgnucash/core-utils\
-  -I${top_srcdir}/lib/libc\
+  -I${top_srcdir}/borrowed/libc\
   ${GLIB_CFLAGS} \
   ${GUILE_CFLAGS} \
   ${WARN_CFLAGS} \

libgnucash/backend/sql/test/Makefile.am

@@ -31,10 +31,10 @@ LDADD = ${top_builddir}/common/test-core/libtest-core.la \
         ${top_builddir}/libgnucash/engine/libgncmod-engine.la \
         ${top_builddir}/libgnucash/engine/test-core/libgncmod-test-engine.la \
         ${top_builddir}/libgnucash/core-utils/libgnc-core-utils.la \
-        ${top_builddir}/lib/libc/libc-missing.la
+        ${top_builddir}/borrowed/libc/libc-missing.la
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/lib/libc \
+-I${top_srcdir}/borrowed/libc \
   -I${top_srcdir}/common \
   -I${top_srcdir}/libgnucash/core-utils \
   -I${top_srcdir}/libgnucash/gnc-module \

libgnucash/backend/xml/Makefile.am

@@ -12,7 +12,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/libgnucash/engine \
   -I${top_srcdir}/libgnucash/core-utils \
   -I${top_srcdir}/libgnucash/gnc-module \
-  -I${top_srcdir}/lib/libc\
+  -I${top_srcdir}/borrowed/libc\
   -I$(top_srcdir)/common \
   ${LIBXML2_CFLAGS} \
   ${GLIB_CFLAGS} \

libgnucash/backend/xml/test/Makefile.am

@@ -257,10 +257,10 @@ LDADD = \
         ./libgnc-test-file-stuff.la \
         ${LIBXML2_LIBS} \
         ${ZLIB_LIBS} \
-        ${top_builddir}/lib/libc/libc-missing.la
+        ${top_builddir}/borrowed/libc/libc-missing.la
 
 AM_CPPFLAGS = \
-  -I${top_srcdir}/lib/libc \
+  -I${top_srcdir}/borrowed/libc \
   -I${top_srcdir}/common \
   -I${top_srcdir}/libgnucash/core-utils \
   -I${top_srcdir}/libgnucash/gnc-module \

libgnucash/engine/CMakeLists.txt

@@ -237,7 +237,7 @@ TARGET_INCLUDE_DIRECTORIES (gncmod-engine
         ${GLIB2_INCLUDE_DIRS}
         ${LIBINTL_INCLUDE_PATH}
         ${REGEX_INCLUDE_PATH}
-        ${CMAKE_SOURCE_DIR}/lib/libc # for strptime.h
+        ${CMAKE_SOURCE_DIR}/borrowed/libc # for strptime.h
 )
 
 INSTALL(TARGETS gncmod-engine
@@ -274,7 +274,7 @@ IF (WIN32)
   ADD_DEFINITIONS (-DOS_WIN32)
   SET (engine_SOURCES ${engine_SOURCES}
   qof-win32.cpp
-  ../../lib/libc/strptime.c
+  ../../borrowed/libc/strptime.c
   )
 ENDIF (WIN32)
 

libgnucash/engine/Makefile.am

@@ -6,7 +6,7 @@ SUBDIRS = . test-core
 pkglib_LTLIBRARIES = libgncmod-engine.la
 
 AM_CPPFLAGS = \
-	-I${top_srcdir}/lib/libc \
+	-I${top_srcdir}/borrowed/libc \
 	-I${top_srcdir}/libgnucash/core-utils \
 	-I${top_srcdir}/common \
 	-I${top_builddir}/common \
@@ -224,7 +224,7 @@ libgncmod_engine_la_LIBADD = \
   ${REGEX_LIBS} \
   ${GLIB_LIBS} \
   ${BOOST_LDFLAGS} -lboost_regex \
-  ${top_builddir}/lib/libc/libc-missing.la
+  ${top_builddir}/borrowed/libc/libc-missing.la
 
 gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
 gncscmmod_DATA = engine.scm \

libgnucash/gnc-module/Makefile.am

@@ -3,7 +3,7 @@
 # it's dependency on src/engine
 
 AM_CPPFLAGS = \
-   -I${top_srcdir}/lib/libc \
+   -I${top_srcdir}/borrowed/libc \
    -I${top_srcdir}/common \
    -I${top_srcdir}/libgnucash/core-utils \
    ${GLIB_CFLAGS} \
@@ -15,7 +15,7 @@ libgnc_module_la_SOURCES = gnc-module.c swig-gnc-module.c
 
 libgnc_module_la_LIBADD = \
   ../core-utils/libgnc-core-utils.la \
-  ${top_builddir}/lib/libc/libc-missing.la \
+  ${top_builddir}/borrowed/libc/libc-missing.la \
   ${GLIB_LIBS} \
   ${GUILE_LIBS}
 

make-gnucash-potfiles.in

@@ -37,7 +37,7 @@ close IN;
 # in order to use the same algorithm in both cmake and autools based builds
 
 my @possible_files = `cd @-SRCDIR-@ && \\
-                      find bindings common libgnucash gnucash lib -name '*.c' \\
+                      find bindings borrowed common libgnucash gnucash -name '*.c' \\
                       -o -name '*.cpp' -o -name '*.glade' \\
                       -o -name '*.desktop.in' -o -name '*.keys.in' \\
                       -o -name '*.gschema.xml.in.in' -o -name '*.scm' \\

po/CMakeLists.txt

@@ -76,7 +76,7 @@ FUNCTION(MAKE_GNUCASH_POTFILES)
   # Only consider files in the common, libgnucash, and gnucash/ directories. Also check against list of ignore patterns
   SET(FILES "")
   FOREACH(path ${FILES_IN})
-    STRING(REGEX MATCH "^(common/|lib|gnucash|bindings)" IS_SRC ${path})
+    STRING(REGEX MATCH "^(bindings/|common/|borrowed/|libgnucash/|gnucash/)" IS_SRC ${path})
     IF (IS_SRC)
       SET(IS_IGNORED FALSE)
       FOREACH(pattern ${IGNORE_PATTERNS})

po/POTFILES.in

@@ -1,5 +1,12 @@
 # This is a list of files which contain translatable strings.
 # This file was generated by ../make-gnucash-potfiles.
+borrowed/goffice/go-charmap-sel.c
+borrowed/goffice/go-glib-extras.c
+borrowed/goffice/go-optionmenu.c
+borrowed/libc/libc-missing-noop.c
+borrowed/libc/setenv.c
+borrowed/libc/strfmon.c
+borrowed/libc/strptime.c
 gnucash/gnome/assistant-acct-period.c
 gnucash/gnome/assistant-hierarchy.c
 gnucash/gnome/assistant-loan.c
@@ -459,13 +466,6 @@ gnucash/report/utility-reports/hello-world.scm
 gnucash/report/utility-reports/utility-reports.scm
 gnucash/report/utility-reports/view-column.scm
 gnucash/report/utility-reports/welcome-to-gnucash.scm
-lib/goffice/go-charmap-sel.c
-lib/goffice/go-glib-extras.c
-lib/goffice/go-optionmenu.c
-lib/libc/libc-missing-noop.c
-lib/libc/setenv.c
-lib/libc/strfmon.c
-lib/libc/strptime.c
 libgnucash/app-utils/app-utils.scm
 libgnucash/app-utils/business-helpers.c
 libgnucash/app-utils/business-options.c