gnucash master: Multiple changes pushed

Geert Janssens gjanssens at code.gnucash.org
Thu Aug 17 09:27:10 EDT 2017 

Updated	 via  https://github.com/Gnucash/gnucash/commit/4d5a37d2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f943ba61 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/a25001df (commit)
	from  https://github.com/Gnucash/gnucash/commit/7fd38c88 (commit)



commit 4d5a37d292308aa3c1bafbbb2dc26d18ead00225
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Aug 17 15:26:54 2017 +0200

    Minor cleanupus in .gitignore

diff --git a/.gitignore b/.gitignore
index cf3d045..50cc70c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,7 +51,6 @@ intltool-merge
 intltool-merge.in
 intltool-update
 intltool-update.in
-lib/guile-www/www
 libtool
 ltmain.sh
 macros/intltool.m4
@@ -138,6 +137,7 @@ libgnucash/doc/html/
 libgnucash/engine/gncla-dir.h
 libgnucash/engine/gnucash
 libgnucash/engine/iso-4217-currencies.c
+libgnucash/engine/test/gnucash
 libgnucash/engine/test/test-account-object
 libgnucash/engine/test/test-address
 libgnucash/engine/test/test-book-merge

commit f943ba61aefd8fda2288ebf2a465689762243c9c
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Aug 17 15:25:41 2017 +0200

    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'.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5cd985..6bd90a0 100644
--- a/CMakeLists.txt
+++ b/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})
 
 
diff --git a/Makefile.am b/Makefile.am
index 99b6cb1..bba65bb 100644
--- a/Makefile.am
+++ b/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@
diff --git a/borrowed/CMakeLists.txt b/borrowed/CMakeLists.txt
new file mode 100644
index 0000000..e3a702b
--- /dev/null
+++ b/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)
diff --git a/lib/Makefile.am b/borrowed/Makefile.am
similarity index 100%
rename from lib/Makefile.am
rename to borrowed/Makefile.am
diff --git a/lib/README b/borrowed/README
similarity index 100%
rename from lib/README
rename to borrowed/README
diff --git a/lib/goffice/CMakeLists.txt b/borrowed/goffice/CMakeLists.txt
similarity index 100%
rename from lib/goffice/CMakeLists.txt
rename to borrowed/goffice/CMakeLists.txt
diff --git a/lib/goffice/Makefile.am b/borrowed/goffice/Makefile.am
similarity index 100%
rename from lib/goffice/Makefile.am
rename to borrowed/goffice/Makefile.am
diff --git a/lib/goffice/README b/borrowed/goffice/README
similarity index 100%
rename from lib/goffice/README
rename to borrowed/goffice/README
diff --git a/lib/goffice/go-charmap-sel.c b/borrowed/goffice/go-charmap-sel.c
similarity index 100%
rename from lib/goffice/go-charmap-sel.c
rename to borrowed/goffice/go-charmap-sel.c
diff --git a/lib/goffice/go-charmap-sel.h b/borrowed/goffice/go-charmap-sel.h
similarity index 100%
rename from lib/goffice/go-charmap-sel.h
rename to borrowed/goffice/go-charmap-sel.h
diff --git a/lib/goffice/go-glib-extras.c b/borrowed/goffice/go-glib-extras.c
similarity index 100%
rename from lib/goffice/go-glib-extras.c
rename to borrowed/goffice/go-glib-extras.c
diff --git a/lib/goffice/go-glib-extras.h b/borrowed/goffice/go-glib-extras.h
similarity index 100%
rename from lib/goffice/go-glib-extras.h
rename to borrowed/goffice/go-glib-extras.h
diff --git a/lib/goffice/go-optionmenu.c b/borrowed/goffice/go-optionmenu.c
similarity index 100%
rename from lib/goffice/go-optionmenu.c
rename to borrowed/goffice/go-optionmenu.c
diff --git a/lib/goffice/go-optionmenu.h b/borrowed/goffice/go-optionmenu.h
similarity index 100%
rename from lib/goffice/go-optionmenu.h
rename to borrowed/goffice/go-optionmenu.h
diff --git a/lib/libc/CMakeLists.txt b/borrowed/libc/CMakeLists.txt
similarity index 100%
rename from lib/libc/CMakeLists.txt
rename to borrowed/libc/CMakeLists.txt
diff --git a/lib/libc/Makefile.am b/borrowed/libc/Makefile.am
similarity index 100%
rename from lib/libc/Makefile.am
rename to borrowed/libc/Makefile.am
diff --git a/lib/libc/libc-missing-noop.c b/borrowed/libc/libc-missing-noop.c
similarity index 100%
rename from lib/libc/libc-missing-noop.c
rename to borrowed/libc/libc-missing-noop.c
diff --git a/lib/libc/pow.h b/borrowed/libc/pow.h
similarity index 100%
rename from lib/libc/pow.h
rename to borrowed/libc/pow.h
diff --git a/lib/libc/setenv.c b/borrowed/libc/setenv.c
similarity index 100%
rename from lib/libc/setenv.c
rename to borrowed/libc/setenv.c
diff --git a/lib/libc/setenv.h b/borrowed/libc/setenv.h
similarity index 100%
rename from lib/libc/setenv.h
rename to borrowed/libc/setenv.h
diff --git a/lib/libc/strfmon.c b/borrowed/libc/strfmon.c
similarity index 100%
rename from lib/libc/strfmon.c
rename to borrowed/libc/strfmon.c
diff --git a/lib/libc/strfmon.h b/borrowed/libc/strfmon.h
similarity index 100%
rename from lib/libc/strfmon.h
rename to borrowed/libc/strfmon.h
diff --git a/lib/libc/strptime.c b/borrowed/libc/strptime.c
similarity index 100%
rename from lib/libc/strptime.c
rename to borrowed/libc/strptime.c
diff --git a/lib/libc/strptime.h b/borrowed/libc/strptime.h
similarity index 100%
rename from lib/libc/strptime.h
rename to borrowed/libc/strptime.h
diff --git a/configure.ac b/configure.ac
index c7e298d..49fa326 100644
--- a/configure.ac
+++ b/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
diff --git a/gnucash/gnome-utils/Makefile.am b/gnucash/gnome-utils/Makefile.am
index d92bb93..c2ea84f 100644
--- a/gnucash/gnome-utils/Makefile.am
+++ b/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} \
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index bc32f49..b1c1670 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/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})
diff --git a/gnucash/gnome/Makefile.am b/gnucash/gnome/Makefile.am
index de44696..e47054e 100644
--- a/gnucash/gnome/Makefile.am
+++ b/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} \
diff --git a/gnucash/html/Makefile.am b/gnucash/html/Makefile.am
index 94f0137..9f78dae 100644
--- a/gnucash/html/Makefile.am
+++ b/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} \
diff --git a/gnucash/import-export/bi-import/Makefile.am b/gnucash/import-export/bi-import/Makefile.am
index 6219392..e6c5eb0 100644
--- a/gnucash/import-export/bi-import/Makefile.am
+++ b/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}
 
diff --git a/gnucash/import-export/csv-exp/Makefile.am b/gnucash/import-export/csv-exp/Makefile.am
index 4635918..328535d 100644
--- a/gnucash/import-export/csv-exp/Makefile.am
+++ b/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} \
diff --git a/gnucash/import-export/csv-imp/CMakeLists.txt b/gnucash/import-export/csv-imp/CMakeLists.txt
index cf6796e..a8a719c 100644
--- a/gnucash/import-export/csv-imp/CMakeLists.txt
+++ b/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)
\ No newline at end of file
+SET(csv_import_DIST ${csv_import_DIST_local} ${test_csv_import_DIST} ${csv_import_gschema_DIST} PARENT_SCOPE)
diff --git a/gnucash/import-export/csv-imp/Makefile.am b/gnucash/import-export/csv-imp/Makefile.am
index c718b03..06ef43f 100644
--- a/gnucash/import-export/csv-imp/Makefile.am
+++ b/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} \
diff --git a/gnucash/import-export/csv-imp/gnc-tokenizer.cpp b/gnucash/import-export/csv-imp/gnc-tokenizer.cpp
index cd7640c..f9f27e1 100644
--- a/gnucash/import-export/csv-imp/gnc-tokenizer.cpp
+++ b/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)
diff --git a/gnucash/import-export/csv-imp/test/Makefile.am b/gnucash/import-export/csv-imp/test/Makefile.am
index 7fd0e80..fdfed5b 100644
--- a/gnucash/import-export/csv-imp/test/Makefile.am
+++ b/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)
diff --git a/gnucash/import-export/customer-import/Makefile.am b/gnucash/import-export/customer-import/Makefile.am
index 3596dec..6ad8286 100644
--- a/gnucash/import-export/customer-import/Makefile.am
+++ b/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}
 
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
deleted file mode 100644
index 6c38b04..0000000
--- a/lib/CMakeLists.txt
+++ /dev/null
@@ -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)
diff --git a/libgnucash/app-utils/Makefile.am b/libgnucash/app-utils/Makefile.am
index 7b3f5df..a30b8a8 100644
--- a/libgnucash/app-utils/Makefile.am
+++ b/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 \
diff --git a/libgnucash/backend/dbi/Makefile.am b/libgnucash/backend/dbi/Makefile.am
index f6b6497..e90dbc6 100644
--- a/libgnucash/backend/dbi/Makefile.am
+++ b/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} \
diff --git a/libgnucash/backend/dbi/test/Makefile.am b/libgnucash/backend/dbi/test/Makefile.am
index 0cc447c..636e0c3 100644
--- a/libgnucash/backend/dbi/test/Makefile.am
+++ b/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 \
diff --git a/libgnucash/backend/sql/Makefile.am b/libgnucash/backend/sql/Makefile.am
index db29b11..cf95122 100644
--- a/libgnucash/backend/sql/Makefile.am
+++ b/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} \
diff --git a/libgnucash/backend/sql/test/Makefile.am b/libgnucash/backend/sql/test/Makefile.am
index 8eaa5ac..a1db927 100644
--- a/libgnucash/backend/sql/test/Makefile.am
+++ b/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 \
diff --git a/libgnucash/backend/xml/Makefile.am b/libgnucash/backend/xml/Makefile.am
index e16f33e..dc35b8d 100644
--- a/libgnucash/backend/xml/Makefile.am
+++ b/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} \
diff --git a/libgnucash/backend/xml/test/Makefile.am b/libgnucash/backend/xml/test/Makefile.am
index fd220718..11b2184 100644
--- a/libgnucash/backend/xml/test/Makefile.am
+++ b/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 \
diff --git a/libgnucash/engine/CMakeLists.txt b/libgnucash/engine/CMakeLists.txt
index b4c82ad..041ef20 100644
--- a/libgnucash/engine/CMakeLists.txt
+++ b/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)
 
diff --git a/libgnucash/engine/Makefile.am b/libgnucash/engine/Makefile.am
index b05e021..4943aef 100644
--- a/libgnucash/engine/Makefile.am
+++ b/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 \
diff --git a/libgnucash/gnc-module/Makefile.am b/libgnucash/gnc-module/Makefile.am
index eb24ed5..5701472 100644
--- a/libgnucash/gnc-module/Makefile.am
+++ b/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}
 
diff --git a/make-gnucash-potfiles.in b/make-gnucash-potfiles.in
index ad75a39..6571fe5 100644
--- a/make-gnucash-potfiles.in
+++ b/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' \\
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 7fc3091..6b7ec7b 100644
--- a/po/CMakeLists.txt
+++ b/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})
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c8d33ed..8068953 100644
--- a/po/POTFILES.in
+++ b/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

commit a25001dfe62002c14aa91b74192c9bfd8b08db17
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Aug 17 13:05:02 2017 +0200

    Win32: drop goffice directory from path
    
    Gnucash is not using goffice any more

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 361d34a..e2db9a0 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -148,7 +148,7 @@ INSTALL(FILES ${ENVIRONMENT_FILE_DIR}/environment DESTINATION etc/gnucash)
 IF (WIN32)
   # Write out a command script for windows
   SET(lib_directories boost enchant libsoup mysql pgsql libxslt)
-  SET(bin_directories mingw gnutls goffice libgsf pcre gnome guile webkit regex aqbanking gwenhywfar libofx opensp
+  SET(bin_directories mingw gnutls libgsf pcre gnome guile webkit regex aqbanking gwenhywfar libofx opensp
     libdbi sqlite3 mysql pgsql enchant libsoup libxslt)
 
   SET(CMD_LINES "")



Summary of changes:
 .gitignore                                        |  2 +-
 CMakeLists.txt                                    |  6 +++---
 Makefile.am                                       |  2 +-
 borrowed/CMakeLists.txt                           |  5 +++++
 {lib => borrowed}/Makefile.am                     |  0
 {lib => borrowed}/README                          |  0
 {lib => borrowed}/goffice/CMakeLists.txt          |  0
 {lib => borrowed}/goffice/Makefile.am             |  0
 {lib => borrowed}/goffice/README                  |  0
 {lib => borrowed}/goffice/go-charmap-sel.c        |  0
 {lib => borrowed}/goffice/go-charmap-sel.h        |  0
 {lib => borrowed}/goffice/go-glib-extras.c        |  0
 {lib => borrowed}/goffice/go-glib-extras.h        |  0
 {lib => borrowed}/goffice/go-optionmenu.c         |  0
 {lib => borrowed}/goffice/go-optionmenu.h         |  0
 {lib => borrowed}/libc/CMakeLists.txt             |  0
 {lib => borrowed}/libc/Makefile.am                |  0
 {lib => borrowed}/libc/libc-missing-noop.c        |  0
 {lib => borrowed}/libc/pow.h                      |  0
 {lib => borrowed}/libc/setenv.c                   |  0
 {lib => borrowed}/libc/setenv.h                   |  0
 {lib => borrowed}/libc/strfmon.c                  |  0
 {lib => borrowed}/libc/strfmon.h                  |  0
 {lib => borrowed}/libc/strptime.c                 |  0
 {lib => borrowed}/libc/strptime.h                 |  0
 configure.ac                                      |  6 +++---
 gnucash/CMakeLists.txt                            |  2 +-
 gnucash/gnome-utils/Makefile.am                   |  4 ++--
 gnucash/gnome/CMakeLists.txt                      |  2 +-
 gnucash/gnome/Makefile.am                         |  2 +-
 gnucash/html/Makefile.am                          |  4 ++--
 gnucash/import-export/bi-import/Makefile.am       |  4 ++--
 gnucash/import-export/csv-exp/Makefile.am         |  4 ++--
 gnucash/import-export/csv-imp/CMakeLists.txt      | 17 ++++++++---------
 gnucash/import-export/csv-imp/Makefile.am         |  9 ++++-----
 gnucash/import-export/csv-imp/gnc-tokenizer.cpp   |  2 +-
 gnucash/import-export/csv-imp/test/Makefile.am    |  3 +--
 gnucash/import-export/customer-import/Makefile.am |  4 ++--
 lib/CMakeLists.txt                                |  5 -----
 libgnucash/app-utils/Makefile.am                  |  2 +-
 libgnucash/backend/dbi/Makefile.am                |  2 +-
 libgnucash/backend/dbi/test/Makefile.am           |  4 ++--
 libgnucash/backend/sql/Makefile.am                |  2 +-
 libgnucash/backend/sql/test/Makefile.am           |  4 ++--
 libgnucash/backend/xml/Makefile.am                |  2 +-
 libgnucash/backend/xml/test/Makefile.am           |  4 ++--
 libgnucash/engine/CMakeLists.txt                  |  4 ++--
 libgnucash/engine/Makefile.am                     |  4 ++--
 libgnucash/gnc-module/Makefile.am                 |  4 ++--
 make-gnucash-potfiles.in                          |  2 +-
 po/CMakeLists.txt                                 |  2 +-
 po/POTFILES.in                                    | 14 +++++++-------
 52 files changed, 65 insertions(+), 68 deletions(-)
 create mode 100644 borrowed/CMakeLists.txt
 rename {lib => borrowed}/Makefile.am (100%)
 rename {lib => borrowed}/README (100%)
 rename {lib => borrowed}/goffice/CMakeLists.txt (100%)
 rename {lib => borrowed}/goffice/Makefile.am (100%)
 rename {lib => borrowed}/goffice/README (100%)
 rename {lib => borrowed}/goffice/go-charmap-sel.c (100%)
 rename {lib => borrowed}/goffice/go-charmap-sel.h (100%)
 rename {lib => borrowed}/goffice/go-glib-extras.c (100%)
 rename {lib => borrowed}/goffice/go-glib-extras.h (100%)
 rename {lib => borrowed}/goffice/go-optionmenu.c (100%)
 rename {lib => borrowed}/goffice/go-optionmenu.h (100%)
 rename {lib => borrowed}/libc/CMakeLists.txt (100%)
 rename {lib => borrowed}/libc/Makefile.am (100%)
 rename {lib => borrowed}/libc/libc-missing-noop.c (100%)
 rename {lib => borrowed}/libc/pow.h (100%)
 rename {lib => borrowed}/libc/setenv.c (100%)
 rename {lib => borrowed}/libc/setenv.h (100%)
 rename {lib => borrowed}/libc/strfmon.c (100%)
 rename {lib => borrowed}/libc/strfmon.h (100%)
 rename {lib => borrowed}/libc/strptime.c (100%)
 rename {lib => borrowed}/libc/strptime.h (100%)
 delete mode 100644 lib/CMakeLists.txt

More information about the gnucash-changes mailing list