Move business-gnome subdirectory to higher level

This is a first step in integrating it into the rest of the gnome directory
and already allows us to drop the business intermediate directory

configure.ac

@@ -1781,11 +1781,10 @@ AC_CONFIG_FILES(
   src/tax/us/Makefile
   src/tax/us/test/Makefile
   src/test-core/Makefile
-  src/business/Makefile
-  src/business/business-gnome/Makefile
-  src/business/business-gnome/gtkbuilder/Makefile
-  src/business/business-gnome/gschemas/Makefile
-  src/business/business-gnome/ui/Makefile
+  src/gnome-business/Makefile
+  src/gnome-business/gtkbuilder/Makefile
+  src/gnome-business/gschemas/Makefile
+  src/gnome-business/ui/Makefile
   dnl # Stuff for bill/invoice import plugin
   src/plugins/Makefile
   src/plugins/bi_import/Makefile
@@ -1800,7 +1799,7 @@ AC_CONFIG_FILES(
   src/app-utils/migratable-prefs.xml
   src/gnome/gnucash.desktop.in
   dnl # GSettings schema files
-  src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in
+  src/gnome-business/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

po/POTFILES.in

@@ -110,38 +110,6 @@ src/backend/xml/sixtp-stack.cpp
 src/backend/xml/sixtp-to-dom-parser.cpp
 src/backend/xml/sixtp-utils.cpp
 src/bin/gnucash-bin.c
-src/business/business-gnome/business-gnome.scm
-src/business/business-gnome/business-gnome-utils.c
-src/business/business-gnome/business-options-gnome.c
-src/business/business-gnome/business-urls.c
-src/business/business-gnome/dialog-billterms.c
-src/business/business-gnome/dialog-choose-owner.c
-src/business/business-gnome/dialog-customer.c
-src/business/business-gnome/dialog-date-close.c
-src/business/business-gnome/dialog-employee.c
-src/business/business-gnome/dialog-invoice.c
-src/business/business-gnome/dialog-job.c
-src/business/business-gnome/dialog-order.c
-src/business/business-gnome/dialog-payment.c
-src/business/business-gnome/dialog-vendor.c
-src/business/business-gnome/gncmod-business-gnome.c
-src/business/business-gnome/gnc-plugin-business.c
-src/business/business-gnome/gnc-plugin-page-invoice.c
-src/business/business-gnome/gnc-plugin-page-owner-tree.c
-[type: gettext/gsettings]src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in
-src/business/business-gnome/gtkbuilder/business-options-gnome.glade
-src/business/business-gnome/gtkbuilder/business-prefs.glade
-src/business/business-gnome/gtkbuilder/dialog-billterms.glade
-src/business/business-gnome/gtkbuilder/dialog-choose-owner.glade
-src/business/business-gnome/gtkbuilder/dialog-customer.glade
-src/business/business-gnome/gtkbuilder/dialog-date-close.glade
-src/business/business-gnome/gtkbuilder/dialog-employee.glade
-src/business/business-gnome/gtkbuilder/dialog-invoice.glade
-src/business/business-gnome/gtkbuilder/dialog-job.glade
-src/business/business-gnome/gtkbuilder/dialog-order.glade
-src/business/business-gnome/gtkbuilder/dialog-payment.glade
-src/business/business-gnome/gtkbuilder/dialog-vendor.glade
-src/business/business-gnome/search-owner.c
 src/core-utils/binreloc.c
 src/core-utils/core-utils.scm
 src/core-utils/gnc-environment.c
@@ -277,6 +245,38 @@ src/gnome/top-level.c
 src/gnome/window-autoclear.c
 src/gnome/window-reconcile2.c
 src/gnome/window-reconcile.c
+src/gnome-business/business-gnome.scm
+src/gnome-business/business-gnome-utils.c
+src/gnome-business/business-options-gnome.c
+src/gnome-business/business-urls.c
+src/gnome-business/dialog-billterms.c
+src/gnome-business/dialog-choose-owner.c
+src/gnome-business/dialog-customer.c
+src/gnome-business/dialog-date-close.c
+src/gnome-business/dialog-employee.c
+src/gnome-business/dialog-invoice.c
+src/gnome-business/dialog-job.c
+src/gnome-business/dialog-order.c
+src/gnome-business/dialog-payment.c
+src/gnome-business/dialog-vendor.c
+src/gnome-business/gncmod-business-gnome.c
+src/gnome-business/gnc-plugin-business.c
+src/gnome-business/gnc-plugin-page-invoice.c
+src/gnome-business/gnc-plugin-page-owner-tree.c
+[type: gettext/gsettings]src/gnome-business/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in
+src/gnome-business/gtkbuilder/business-options-gnome.glade
+src/gnome-business/gtkbuilder/business-prefs.glade
+src/gnome-business/gtkbuilder/dialog-billterms.glade
+src/gnome-business/gtkbuilder/dialog-choose-owner.glade
+src/gnome-business/gtkbuilder/dialog-customer.glade
+src/gnome-business/gtkbuilder/dialog-date-close.glade
+src/gnome-business/gtkbuilder/dialog-employee.glade
+src/gnome-business/gtkbuilder/dialog-invoice.glade
+src/gnome-business/gtkbuilder/dialog-job.glade
+src/gnome-business/gtkbuilder/dialog-order.glade
+src/gnome-business/gtkbuilder/dialog-payment.glade
+src/gnome-business/gtkbuilder/dialog-vendor.glade
+src/gnome-business/search-owner.c
 src/gnome-search/dialog-search.c
 src/gnome-search/dialog-search.glade
 src/gnome-search/gnc-general-search.c

src/CMakeLists.txt

@@ -151,11 +151,11 @@ ADD_SUBDIRECTORY (import-export)
 
 IF (WITH_GNUCASH)
   ADD_SUBDIRECTORY (bin)
-  ADD_SUBDIRECTORY (business)
   ADD_SUBDIRECTORY (cmake_modules)
   ADD_SUBDIRECTORY (debug)
   ADD_SUBDIRECTORY (doc)
   ADD_SUBDIRECTORY (gnome)
+  ADD_SUBDIRECTORY (gnome-business)
   ADD_SUBDIRECTORY (gnome-utils)
   ADD_SUBDIRECTORY (gnome-search)
   ADD_SUBDIRECTORY (html)

src/Makefile.am

@@ -32,8 +32,8 @@ GUI_SUBDIRS = \
   report \
   register \
   gnome \
+  gnome-business \
   import-export \
-  business \
   optional \
   plugins \
   bin

src/bin/overrides/gnucash-build-env.in

@@ -53,7 +53,7 @@ eval `${top_srcdir}/src/gnc-test-env.pl \
   --gnc-module-dir ${top_builddir}/src/import-export/ofx \
   --gnc-module-dir ${top_builddir}/src/import-export/hbci \
   --gnc-module-dir ${top_builddir}/src/import-export/log-replay \
-  --gnc-module-dir ${top_builddir}/src/business/business-gnome \
+  --gnc-module-dir ${top_builddir}/src/gnome-business \
   --guile-load-dir ${top_builddir}/src/core-utils \
   --guile-load-dir ${top_builddir}/src/gnc-module \
   --guile-load-dir ${top_builddir}/src/engine \
@@ -69,7 +69,7 @@ eval `${top_srcdir}/src/gnc-test-env.pl \
   --guile-load-dir ${top_builddir}/src/report/report-gnome \
   --guile-load-dir ${top_builddir}/src/report/stylesheets \
   --guile-load-dir ${top_builddir}/src/import-export/qif-import \
-  --guile-load-dir ${top_builddir}/src/business/business-gnome \
+  --guile-load-dir ${top_builddir}/src/gnome-business \
   --library-dir    ${top_builddir}/src/test-core \
   --library-dir    ${top_builddir}/src/libqof/qof \
   --library-dir    ${top_builddir}/src/core-utils \

src/business/CMakeLists.txt

@@ -1,4 +0,0 @@
-ADD_SUBDIRECTORY(business-gnome)
-
-SET_LOCAL_DIST(business_DIST_local CMakeLists.txt Makefile.am)
-SET(business_DIST ${business_DIST_local} ${business_gnome_DIST} ${business_ledger_DIST} PARENT_SCOPE)

src/business/Makefile.am

@@ -1,4 +0,0 @@
-SUBDIRS = \
-  business-gnome
-
-EXTRA_DIST = CMakeLists.txt

src/plugins/bi_import/CMakeLists.txt

@@ -33,6 +33,11 @@ TARGET_LINK_LIBRARIES(gncmod-bi_import
   gnc-qof
 )
 
+TARGET_INCLUDE_DIRECTORIES(gncmod-bi_import
+  PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+  PRIVATE ${CMAKE_SOURCE_DIR}/src/gnome-business
+)
+
 TARGET_COMPILE_DEFINITIONS(gncmod-bi_import PRIVATE -DG_LOG_DOMAIN=\"gnc.plugin.bi-import\")
 
 INSTALL(TARGETS gncmod-bi_import
@@ -42,4 +47,4 @@ INSTALL(TARGETS gncmod-bi_import
 # No headers to install.
 
 SET_LOCAL_DIST(bi_import_DIST_local CMakeLists.txt Makefile.am README ${bi_import_SOURCES} ${bi_import_noinst_HEADERS})
-SET(bi_import_DIST ${bi_import_DIST_local} ${bi_import_ui_DIST} ${bi_import_glade_DIST} PARENT_SCOPE)
+SET(bi_import_DIST ${bi_import_DIST_local} ${bi_import_ui_DIST} ${bi_import_glade_DIST} PARENT_SCOPE)

src/plugins/bi_import/Makefile.am

@@ -18,7 +18,7 @@ noinst_HEADERS = \
 libgncmod_bi_import_la_LDFLAGS = -avoid-version
 
 libgncmod_bi_import_la_LIBADD = \
-  ${top_builddir}/src/business/business-gnome/libgncmod-business-gnome.la \
+  ${top_builddir}/src/gnome-business/libgncmod-business-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 \
@@ -33,7 +33,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_builddir}/src \
   -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/business/business-gnome/ \
+  -I${top_srcdir}/src/gnome-business \
   -I${top_srcdir}/src/report/report-gnome \
   -I${top_srcdir}/src/gnome-search/ \
   -I${top_srcdir}/src/register/ledger-core \

src/plugins/bi_import/dialog-bi-import.c

@@ -59,9 +59,9 @@
 #include <gnc-gdate-utils.h>
 
 // To open the invoices for editing
-#include "business/business-gnome/gnc-plugin-page-invoice.h"
-#include "business/business-gnome/dialog-invoice.h"
-#include "business/business-gnome/business-gnome-utils.h"
+#include "gnc-plugin-page-invoice.h"
+#include "dialog-invoice.h"
+#include "business-gnome-utils.h"
 
 // this helper macro takes a regexp match and fills the model
 #define FILL_IN_HELPER(match_name,column) \

src/plugins/customer_import/CMakeLists.txt

@@ -23,6 +23,11 @@ ADD_LIBRARY(gncmod-customer_import ${customer_import_SOURCES} ${customer_input_n
 TARGET_LINK_LIBRARIES(gncmod-customer_import gncmod-business-gnome gncmod-gnome-utils gncmod-app-utils
      gncmod-engine gnc-core-utils gnc-module gnc-qof ${GLIB2_LDFLAGS})
 
+TARGET_INCLUDE_DIRECTORIES(gncmod-bi_import
+  PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+  PRIVATE ${CMAKE_SOURCE_DIR}/src/gnome-business
+)
+
 TARGET_COMPILE_DEFINITIONS(gncmod-customer_import PRIVATE -DG_LOG_DOMAIN=\"gnc.plugin.customer_import\")
 
 INSTALL(TARGETS gncmod-customer_import
@@ -32,4 +37,4 @@ INSTALL(TARGETS gncmod-customer_import
 # No headers to install.
 
 SET_LOCAL_DIST(customer_import_DIST_local CMakeLists.txt Makefile.am ${customer_import_SOURCES} ${customer_import_noinst_HEADERS})
-SET(customer_import_DIST ${customer_import_DIST_local} ${customer_import_glade_DIST} ${customer_import_ui_DIST} PARENT_SCOPE)
+SET(customer_import_DIST ${customer_import_DIST_local} ${customer_import_glade_DIST} ${customer_import_ui_DIST} PARENT_SCOPE)

src/plugins/customer_import/Makefile.am

@@ -16,7 +16,7 @@ noinst_HEADERS = \
 libgncmod_customer_import_la_LDFLAGS = -avoid-version
 
 libgncmod_customer_import_la_LIBADD = \
-  ${top_builddir}/src/business/business-gnome/libgncmod-business-gnome.la \
+  ${top_builddir}/src/gnome-business/libgncmod-business-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 \
@@ -31,7 +31,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_builddir}/src \
   -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/business/business-gnome/ \
+  -I${top_srcdir}/src/gnome-business/ \
   -I${top_srcdir}/src/report/report-gnome \
   -I${top_srcdir}/src/gnome-search/ \
   -I${top_srcdir}/src/register/ledger-core \

src/report/report-gnome/window-report.h

@@ -36,7 +36,7 @@ typedef struct gnc_report_window_s gnc_report_window;
 GtkWidget * gnc_report_window_default_params_editor(SCM options, SCM report);
 
 // called from multiple places
-// [business-gnome/dialog-invoice.c;gnome/window-register.c]; and
+// [gnome-business/dialog-invoice.c;gnome/window-register.c]; and
 // scm-exposed; 3-liner which calls gnc_main_window_open_report after handling busy-cursor.
 void       reportWindow(int id);
 gboolean   gnc_report_edit_options(SCM report);