From f34348a40cf770af69fe6401af69c5d2ea41faad Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Thu, 20 Jul 2017 18:18:48 +0200 Subject: [PATCH] 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 | 11 ++-- po/POTFILES.in | 64 +++++++++---------- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/bin/overrides/gnucash-build-env.in | 4 +- src/business/CMakeLists.txt | 4 -- src/business/Makefile.am | 4 -- .../CMakeLists.txt | 0 .../Makefile.am | 0 .../business-gnome-utils.c | 0 .../business-gnome-utils.h | 0 .../business-gnome.scm | 0 .../business-options-gnome.c | 0 .../business-options-gnome.h | 0 .../business-urls.c | 0 .../business-urls.h | 0 .../dialog-billterms.c | 0 .../dialog-billterms.h | 0 .../dialog-choose-owner.c | 0 .../dialog-choose-owner.h | 0 .../dialog-customer.c | 0 .../dialog-customer.h | 0 .../dialog-date-close.c | 0 .../dialog-date-close.h | 0 .../dialog-employee.c | 0 .../dialog-employee.h | 0 .../dialog-invoice.c | 0 .../dialog-invoice.h | 0 .../dialog-job.c | 0 .../dialog-job.h | 0 .../dialog-order.c | 0 .../dialog-order.h | 0 .../dialog-payment.c | 0 .../dialog-payment.h | 0 .../dialog-vendor.c | 0 .../dialog-vendor.h | 0 .../gnc-plugin-business.c | 0 .../gnc-plugin-business.h | 0 .../gnc-plugin-page-invoice.c | 0 .../gnc-plugin-page-invoice.h | 0 .../gnc-plugin-page-owner-tree.c | 0 .../gnc-plugin-page-owner-tree.h | 0 .../gncmod-business-gnome.c | 0 .../gschemas/CMakeLists.txt | 0 .../gschemas/Makefile.am | 0 ...gnucash.dialogs.business.gschema.xml.in.in | 0 .../gtkbuilder/CMakeLists.txt | 0 .../gtkbuilder/Makefile.am | 0 .../gtkbuilder/business-options-gnome.glade | 0 .../gtkbuilder/business-prefs.glade | 0 .../gtkbuilder/dialog-billterms.glade | 0 .../gtkbuilder/dialog-choose-owner.glade | 0 .../gtkbuilder/dialog-customer.glade | 0 .../gtkbuilder/dialog-date-close.glade | 0 .../gtkbuilder/dialog-employee.glade | 0 .../gtkbuilder/dialog-invoice.glade | 0 .../gtkbuilder/dialog-job.glade | 0 .../gtkbuilder/dialog-order.glade | 0 .../gtkbuilder/dialog-payment.glade | 0 .../gtkbuilder/dialog-vendor.glade | 0 .../search-owner.c | 0 .../search-owner.h | 0 .../ui/CMakeLists.txt | 0 .../ui/Makefile.am | 0 .../ui/gnc-plugin-business-ui.xml | 0 .../ui/gnc-plugin-page-invoice-ui.xml | 0 .../ui/gnc-plugin-page-owner-tree-ui.xml | 0 src/plugins/bi_import/CMakeLists.txt | 7 +- src/plugins/bi_import/Makefile.am | 4 +- src/plugins/bi_import/dialog-bi-import.c | 6 +- src/plugins/customer_import/CMakeLists.txt | 7 +- src/plugins/customer_import/Makefile.am | 4 +- src/report/report-gnome/window-report.h | 2 +- 73 files changed, 61 insertions(+), 60 deletions(-) delete mode 100644 src/business/CMakeLists.txt delete mode 100644 src/business/Makefile.am rename src/{business/business-gnome => gnome-business}/CMakeLists.txt (100%) rename src/{business/business-gnome => gnome-business}/Makefile.am (100%) rename src/{business/business-gnome => gnome-business}/business-gnome-utils.c (100%) rename src/{business/business-gnome => gnome-business}/business-gnome-utils.h (100%) rename src/{business/business-gnome => gnome-business}/business-gnome.scm (100%) rename src/{business/business-gnome => gnome-business}/business-options-gnome.c (100%) rename src/{business/business-gnome => gnome-business}/business-options-gnome.h (100%) rename src/{business/business-gnome => gnome-business}/business-urls.c (100%) rename src/{business/business-gnome => gnome-business}/business-urls.h (100%) rename src/{business/business-gnome => gnome-business}/dialog-billterms.c (100%) rename src/{business/business-gnome => gnome-business}/dialog-billterms.h (100%) rename src/{business/business-gnome => gnome-business}/dialog-choose-owner.c (100%) rename src/{business/business-gnome => gnome-business}/dialog-choose-owner.h (100%) rename src/{business/business-gnome => gnome-business}/dialog-customer.c (100%) rename src/{business/business-gnome => gnome-business}/dialog-customer.h (100%) rename src/{business/business-gnome => gnome-business}/dialog-date-close.c (100%) rename src/{business/business-gnome => gnome-business}/dialog-date-close.h (100%) rename src/{business/business-gnome => gnome-business}/dialog-employee.c (100%) rename src/{business/business-gnome => gnome-business}/dialog-employee.h (100%) rename src/{business/business-gnome => gnome-business}/dialog-invoice.c (100%) rename src/{business/business-gnome => gnome-business}/dialog-invoice.h (100%) rename src/{business/business-gnome => gnome-business}/dialog-job.c (100%) rename src/{business/business-gnome => gnome-business}/dialog-job.h (100%) rename src/{business/business-gnome => gnome-business}/dialog-order.c (100%) rename src/{business/business-gnome => gnome-business}/dialog-order.h (100%) rename src/{business/business-gnome => gnome-business}/dialog-payment.c (100%) rename src/{business/business-gnome => gnome-business}/dialog-payment.h (100%) rename src/{business/business-gnome => gnome-business}/dialog-vendor.c (100%) rename src/{business/business-gnome => gnome-business}/dialog-vendor.h (100%) rename src/{business/business-gnome => gnome-business}/gnc-plugin-business.c (100%) rename src/{business/business-gnome => gnome-business}/gnc-plugin-business.h (100%) rename src/{business/business-gnome => gnome-business}/gnc-plugin-page-invoice.c (100%) rename src/{business/business-gnome => gnome-business}/gnc-plugin-page-invoice.h (100%) rename src/{business/business-gnome => gnome-business}/gnc-plugin-page-owner-tree.c (100%) rename src/{business/business-gnome => gnome-business}/gnc-plugin-page-owner-tree.h (100%) rename src/{business/business-gnome => gnome-business}/gncmod-business-gnome.c (100%) rename src/{business/business-gnome => gnome-business}/gschemas/CMakeLists.txt (100%) rename src/{business/business-gnome => gnome-business}/gschemas/Makefile.am (100%) rename src/{business/business-gnome => gnome-business}/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in (100%) rename src/{business/business-gnome => gnome-business}/gtkbuilder/CMakeLists.txt (100%) rename src/{business/business-gnome => gnome-business}/gtkbuilder/Makefile.am (100%) rename src/{business/business-gnome => gnome-business}/gtkbuilder/business-options-gnome.glade (100%) rename src/{business/business-gnome => gnome-business}/gtkbuilder/business-prefs.glade (100%) rename src/{business/business-gnome => gnome-business}/gtkbuilder/dialog-billterms.glade (100%) rename src/{business/business-gnome => gnome-business}/gtkbuilder/dialog-choose-owner.glade (100%) rename src/{business/business-gnome => gnome-business}/gtkbuilder/dialog-customer.glade (100%) rename src/{business/business-gnome => gnome-business}/gtkbuilder/dialog-date-close.glade (100%) rename src/{business/business-gnome => gnome-business}/gtkbuilder/dialog-employee.glade (100%) rename src/{business/business-gnome => gnome-business}/gtkbuilder/dialog-invoice.glade (100%) rename src/{business/business-gnome => gnome-business}/gtkbuilder/dialog-job.glade (100%) rename src/{business/business-gnome => gnome-business}/gtkbuilder/dialog-order.glade (100%) rename src/{business/business-gnome => gnome-business}/gtkbuilder/dialog-payment.glade (100%) rename src/{business/business-gnome => gnome-business}/gtkbuilder/dialog-vendor.glade (100%) rename src/{business/business-gnome => gnome-business}/search-owner.c (100%) rename src/{business/business-gnome => gnome-business}/search-owner.h (100%) rename src/{business/business-gnome => gnome-business}/ui/CMakeLists.txt (100%) rename src/{business/business-gnome => gnome-business}/ui/Makefile.am (100%) rename src/{business/business-gnome => gnome-business}/ui/gnc-plugin-business-ui.xml (100%) rename src/{business/business-gnome => gnome-business}/ui/gnc-plugin-page-invoice-ui.xml (100%) rename src/{business/business-gnome => gnome-business}/ui/gnc-plugin-page-owner-tree-ui.xml (100%) diff --git a/configure.ac b/configure.ac index f4fbea189d..7b77d3d930 100644 --- a/configure.ac +++ b/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 diff --git a/po/POTFILES.in b/po/POTFILES.in index 47616ae94e..904aaec7fd 100644 --- a/po/POTFILES.in +++ b/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 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cb067fca73..32036d1d15 100644 --- a/src/CMakeLists.txt +++ b/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) diff --git a/src/Makefile.am b/src/Makefile.am index 520e33fa86..d11442bad9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,8 +32,8 @@ GUI_SUBDIRS = \ report \ register \ gnome \ + gnome-business \ import-export \ - business \ optional \ plugins \ bin diff --git a/src/bin/overrides/gnucash-build-env.in b/src/bin/overrides/gnucash-build-env.in index 0a8e29a937..111870a091 100644 --- a/src/bin/overrides/gnucash-build-env.in +++ b/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 \ diff --git a/src/business/CMakeLists.txt b/src/business/CMakeLists.txt deleted file mode 100644 index 4e2809ad1d..0000000000 --- a/src/business/CMakeLists.txt +++ /dev/null @@ -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) diff --git a/src/business/Makefile.am b/src/business/Makefile.am deleted file mode 100644 index 08fae702c1..0000000000 --- a/src/business/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = \ - business-gnome - -EXTRA_DIST = CMakeLists.txt diff --git a/src/business/business-gnome/CMakeLists.txt b/src/gnome-business/CMakeLists.txt similarity index 100% rename from src/business/business-gnome/CMakeLists.txt rename to src/gnome-business/CMakeLists.txt diff --git a/src/business/business-gnome/Makefile.am b/src/gnome-business/Makefile.am similarity index 100% rename from src/business/business-gnome/Makefile.am rename to src/gnome-business/Makefile.am diff --git a/src/business/business-gnome/business-gnome-utils.c b/src/gnome-business/business-gnome-utils.c similarity index 100% rename from src/business/business-gnome/business-gnome-utils.c rename to src/gnome-business/business-gnome-utils.c diff --git a/src/business/business-gnome/business-gnome-utils.h b/src/gnome-business/business-gnome-utils.h similarity index 100% rename from src/business/business-gnome/business-gnome-utils.h rename to src/gnome-business/business-gnome-utils.h diff --git a/src/business/business-gnome/business-gnome.scm b/src/gnome-business/business-gnome.scm similarity index 100% rename from src/business/business-gnome/business-gnome.scm rename to src/gnome-business/business-gnome.scm diff --git a/src/business/business-gnome/business-options-gnome.c b/src/gnome-business/business-options-gnome.c similarity index 100% rename from src/business/business-gnome/business-options-gnome.c rename to src/gnome-business/business-options-gnome.c diff --git a/src/business/business-gnome/business-options-gnome.h b/src/gnome-business/business-options-gnome.h similarity index 100% rename from src/business/business-gnome/business-options-gnome.h rename to src/gnome-business/business-options-gnome.h diff --git a/src/business/business-gnome/business-urls.c b/src/gnome-business/business-urls.c similarity index 100% rename from src/business/business-gnome/business-urls.c rename to src/gnome-business/business-urls.c diff --git a/src/business/business-gnome/business-urls.h b/src/gnome-business/business-urls.h similarity index 100% rename from src/business/business-gnome/business-urls.h rename to src/gnome-business/business-urls.h diff --git a/src/business/business-gnome/dialog-billterms.c b/src/gnome-business/dialog-billterms.c similarity index 100% rename from src/business/business-gnome/dialog-billterms.c rename to src/gnome-business/dialog-billterms.c diff --git a/src/business/business-gnome/dialog-billterms.h b/src/gnome-business/dialog-billterms.h similarity index 100% rename from src/business/business-gnome/dialog-billterms.h rename to src/gnome-business/dialog-billterms.h diff --git a/src/business/business-gnome/dialog-choose-owner.c b/src/gnome-business/dialog-choose-owner.c similarity index 100% rename from src/business/business-gnome/dialog-choose-owner.c rename to src/gnome-business/dialog-choose-owner.c diff --git a/src/business/business-gnome/dialog-choose-owner.h b/src/gnome-business/dialog-choose-owner.h similarity index 100% rename from src/business/business-gnome/dialog-choose-owner.h rename to src/gnome-business/dialog-choose-owner.h diff --git a/src/business/business-gnome/dialog-customer.c b/src/gnome-business/dialog-customer.c similarity index 100% rename from src/business/business-gnome/dialog-customer.c rename to src/gnome-business/dialog-customer.c diff --git a/src/business/business-gnome/dialog-customer.h b/src/gnome-business/dialog-customer.h similarity index 100% rename from src/business/business-gnome/dialog-customer.h rename to src/gnome-business/dialog-customer.h diff --git a/src/business/business-gnome/dialog-date-close.c b/src/gnome-business/dialog-date-close.c similarity index 100% rename from src/business/business-gnome/dialog-date-close.c rename to src/gnome-business/dialog-date-close.c diff --git a/src/business/business-gnome/dialog-date-close.h b/src/gnome-business/dialog-date-close.h similarity index 100% rename from src/business/business-gnome/dialog-date-close.h rename to src/gnome-business/dialog-date-close.h diff --git a/src/business/business-gnome/dialog-employee.c b/src/gnome-business/dialog-employee.c similarity index 100% rename from src/business/business-gnome/dialog-employee.c rename to src/gnome-business/dialog-employee.c diff --git a/src/business/business-gnome/dialog-employee.h b/src/gnome-business/dialog-employee.h similarity index 100% rename from src/business/business-gnome/dialog-employee.h rename to src/gnome-business/dialog-employee.h diff --git a/src/business/business-gnome/dialog-invoice.c b/src/gnome-business/dialog-invoice.c similarity index 100% rename from src/business/business-gnome/dialog-invoice.c rename to src/gnome-business/dialog-invoice.c diff --git a/src/business/business-gnome/dialog-invoice.h b/src/gnome-business/dialog-invoice.h similarity index 100% rename from src/business/business-gnome/dialog-invoice.h rename to src/gnome-business/dialog-invoice.h diff --git a/src/business/business-gnome/dialog-job.c b/src/gnome-business/dialog-job.c similarity index 100% rename from src/business/business-gnome/dialog-job.c rename to src/gnome-business/dialog-job.c diff --git a/src/business/business-gnome/dialog-job.h b/src/gnome-business/dialog-job.h similarity index 100% rename from src/business/business-gnome/dialog-job.h rename to src/gnome-business/dialog-job.h diff --git a/src/business/business-gnome/dialog-order.c b/src/gnome-business/dialog-order.c similarity index 100% rename from src/business/business-gnome/dialog-order.c rename to src/gnome-business/dialog-order.c diff --git a/src/business/business-gnome/dialog-order.h b/src/gnome-business/dialog-order.h similarity index 100% rename from src/business/business-gnome/dialog-order.h rename to src/gnome-business/dialog-order.h diff --git a/src/business/business-gnome/dialog-payment.c b/src/gnome-business/dialog-payment.c similarity index 100% rename from src/business/business-gnome/dialog-payment.c rename to src/gnome-business/dialog-payment.c diff --git a/src/business/business-gnome/dialog-payment.h b/src/gnome-business/dialog-payment.h similarity index 100% rename from src/business/business-gnome/dialog-payment.h rename to src/gnome-business/dialog-payment.h diff --git a/src/business/business-gnome/dialog-vendor.c b/src/gnome-business/dialog-vendor.c similarity index 100% rename from src/business/business-gnome/dialog-vendor.c rename to src/gnome-business/dialog-vendor.c diff --git a/src/business/business-gnome/dialog-vendor.h b/src/gnome-business/dialog-vendor.h similarity index 100% rename from src/business/business-gnome/dialog-vendor.h rename to src/gnome-business/dialog-vendor.h diff --git a/src/business/business-gnome/gnc-plugin-business.c b/src/gnome-business/gnc-plugin-business.c similarity index 100% rename from src/business/business-gnome/gnc-plugin-business.c rename to src/gnome-business/gnc-plugin-business.c diff --git a/src/business/business-gnome/gnc-plugin-business.h b/src/gnome-business/gnc-plugin-business.h similarity index 100% rename from src/business/business-gnome/gnc-plugin-business.h rename to src/gnome-business/gnc-plugin-business.h diff --git a/src/business/business-gnome/gnc-plugin-page-invoice.c b/src/gnome-business/gnc-plugin-page-invoice.c similarity index 100% rename from src/business/business-gnome/gnc-plugin-page-invoice.c rename to src/gnome-business/gnc-plugin-page-invoice.c diff --git a/src/business/business-gnome/gnc-plugin-page-invoice.h b/src/gnome-business/gnc-plugin-page-invoice.h similarity index 100% rename from src/business/business-gnome/gnc-plugin-page-invoice.h rename to src/gnome-business/gnc-plugin-page-invoice.h diff --git a/src/business/business-gnome/gnc-plugin-page-owner-tree.c b/src/gnome-business/gnc-plugin-page-owner-tree.c similarity index 100% rename from src/business/business-gnome/gnc-plugin-page-owner-tree.c rename to src/gnome-business/gnc-plugin-page-owner-tree.c diff --git a/src/business/business-gnome/gnc-plugin-page-owner-tree.h b/src/gnome-business/gnc-plugin-page-owner-tree.h similarity index 100% rename from src/business/business-gnome/gnc-plugin-page-owner-tree.h rename to src/gnome-business/gnc-plugin-page-owner-tree.h diff --git a/src/business/business-gnome/gncmod-business-gnome.c b/src/gnome-business/gncmod-business-gnome.c similarity index 100% rename from src/business/business-gnome/gncmod-business-gnome.c rename to src/gnome-business/gncmod-business-gnome.c diff --git a/src/business/business-gnome/gschemas/CMakeLists.txt b/src/gnome-business/gschemas/CMakeLists.txt similarity index 100% rename from src/business/business-gnome/gschemas/CMakeLists.txt rename to src/gnome-business/gschemas/CMakeLists.txt diff --git a/src/business/business-gnome/gschemas/Makefile.am b/src/gnome-business/gschemas/Makefile.am similarity index 100% rename from src/business/business-gnome/gschemas/Makefile.am rename to src/gnome-business/gschemas/Makefile.am diff --git a/src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in b/src/gnome-business/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in similarity index 100% rename from src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in rename to src/gnome-business/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in diff --git a/src/business/business-gnome/gtkbuilder/CMakeLists.txt b/src/gnome-business/gtkbuilder/CMakeLists.txt similarity index 100% rename from src/business/business-gnome/gtkbuilder/CMakeLists.txt rename to src/gnome-business/gtkbuilder/CMakeLists.txt diff --git a/src/business/business-gnome/gtkbuilder/Makefile.am b/src/gnome-business/gtkbuilder/Makefile.am similarity index 100% rename from src/business/business-gnome/gtkbuilder/Makefile.am rename to src/gnome-business/gtkbuilder/Makefile.am diff --git a/src/business/business-gnome/gtkbuilder/business-options-gnome.glade b/src/gnome-business/gtkbuilder/business-options-gnome.glade similarity index 100% rename from src/business/business-gnome/gtkbuilder/business-options-gnome.glade rename to src/gnome-business/gtkbuilder/business-options-gnome.glade diff --git a/src/business/business-gnome/gtkbuilder/business-prefs.glade b/src/gnome-business/gtkbuilder/business-prefs.glade similarity index 100% rename from src/business/business-gnome/gtkbuilder/business-prefs.glade rename to src/gnome-business/gtkbuilder/business-prefs.glade diff --git a/src/business/business-gnome/gtkbuilder/dialog-billterms.glade b/src/gnome-business/gtkbuilder/dialog-billterms.glade similarity index 100% rename from src/business/business-gnome/gtkbuilder/dialog-billterms.glade rename to src/gnome-business/gtkbuilder/dialog-billterms.glade diff --git a/src/business/business-gnome/gtkbuilder/dialog-choose-owner.glade b/src/gnome-business/gtkbuilder/dialog-choose-owner.glade similarity index 100% rename from src/business/business-gnome/gtkbuilder/dialog-choose-owner.glade rename to src/gnome-business/gtkbuilder/dialog-choose-owner.glade diff --git a/src/business/business-gnome/gtkbuilder/dialog-customer.glade b/src/gnome-business/gtkbuilder/dialog-customer.glade similarity index 100% rename from src/business/business-gnome/gtkbuilder/dialog-customer.glade rename to src/gnome-business/gtkbuilder/dialog-customer.glade diff --git a/src/business/business-gnome/gtkbuilder/dialog-date-close.glade b/src/gnome-business/gtkbuilder/dialog-date-close.glade similarity index 100% rename from src/business/business-gnome/gtkbuilder/dialog-date-close.glade rename to src/gnome-business/gtkbuilder/dialog-date-close.glade diff --git a/src/business/business-gnome/gtkbuilder/dialog-employee.glade b/src/gnome-business/gtkbuilder/dialog-employee.glade similarity index 100% rename from src/business/business-gnome/gtkbuilder/dialog-employee.glade rename to src/gnome-business/gtkbuilder/dialog-employee.glade diff --git a/src/business/business-gnome/gtkbuilder/dialog-invoice.glade b/src/gnome-business/gtkbuilder/dialog-invoice.glade similarity index 100% rename from src/business/business-gnome/gtkbuilder/dialog-invoice.glade rename to src/gnome-business/gtkbuilder/dialog-invoice.glade diff --git a/src/business/business-gnome/gtkbuilder/dialog-job.glade b/src/gnome-business/gtkbuilder/dialog-job.glade similarity index 100% rename from src/business/business-gnome/gtkbuilder/dialog-job.glade rename to src/gnome-business/gtkbuilder/dialog-job.glade diff --git a/src/business/business-gnome/gtkbuilder/dialog-order.glade b/src/gnome-business/gtkbuilder/dialog-order.glade similarity index 100% rename from src/business/business-gnome/gtkbuilder/dialog-order.glade rename to src/gnome-business/gtkbuilder/dialog-order.glade diff --git a/src/business/business-gnome/gtkbuilder/dialog-payment.glade b/src/gnome-business/gtkbuilder/dialog-payment.glade similarity index 100% rename from src/business/business-gnome/gtkbuilder/dialog-payment.glade rename to src/gnome-business/gtkbuilder/dialog-payment.glade diff --git a/src/business/business-gnome/gtkbuilder/dialog-vendor.glade b/src/gnome-business/gtkbuilder/dialog-vendor.glade similarity index 100% rename from src/business/business-gnome/gtkbuilder/dialog-vendor.glade rename to src/gnome-business/gtkbuilder/dialog-vendor.glade diff --git a/src/business/business-gnome/search-owner.c b/src/gnome-business/search-owner.c similarity index 100% rename from src/business/business-gnome/search-owner.c rename to src/gnome-business/search-owner.c diff --git a/src/business/business-gnome/search-owner.h b/src/gnome-business/search-owner.h similarity index 100% rename from src/business/business-gnome/search-owner.h rename to src/gnome-business/search-owner.h diff --git a/src/business/business-gnome/ui/CMakeLists.txt b/src/gnome-business/ui/CMakeLists.txt similarity index 100% rename from src/business/business-gnome/ui/CMakeLists.txt rename to src/gnome-business/ui/CMakeLists.txt diff --git a/src/business/business-gnome/ui/Makefile.am b/src/gnome-business/ui/Makefile.am similarity index 100% rename from src/business/business-gnome/ui/Makefile.am rename to src/gnome-business/ui/Makefile.am diff --git a/src/business/business-gnome/ui/gnc-plugin-business-ui.xml b/src/gnome-business/ui/gnc-plugin-business-ui.xml similarity index 100% rename from src/business/business-gnome/ui/gnc-plugin-business-ui.xml rename to src/gnome-business/ui/gnc-plugin-business-ui.xml diff --git a/src/business/business-gnome/ui/gnc-plugin-page-invoice-ui.xml b/src/gnome-business/ui/gnc-plugin-page-invoice-ui.xml similarity index 100% rename from src/business/business-gnome/ui/gnc-plugin-page-invoice-ui.xml rename to src/gnome-business/ui/gnc-plugin-page-invoice-ui.xml diff --git a/src/business/business-gnome/ui/gnc-plugin-page-owner-tree-ui.xml b/src/gnome-business/ui/gnc-plugin-page-owner-tree-ui.xml similarity index 100% rename from src/business/business-gnome/ui/gnc-plugin-page-owner-tree-ui.xml rename to src/gnome-business/ui/gnc-plugin-page-owner-tree-ui.xml diff --git a/src/plugins/bi_import/CMakeLists.txt b/src/plugins/bi_import/CMakeLists.txt index 95afc72ed5..2bdda50ef9 100644 --- a/src/plugins/bi_import/CMakeLists.txt +++ b/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) \ No newline at end of file +SET(bi_import_DIST ${bi_import_DIST_local} ${bi_import_ui_DIST} ${bi_import_glade_DIST} PARENT_SCOPE) diff --git a/src/plugins/bi_import/Makefile.am b/src/plugins/bi_import/Makefile.am index 9eab47dc57..66445526c2 100644 --- a/src/plugins/bi_import/Makefile.am +++ b/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 \ diff --git a/src/plugins/bi_import/dialog-bi-import.c b/src/plugins/bi_import/dialog-bi-import.c index dce91a2aa0..33a0944691 100644 --- a/src/plugins/bi_import/dialog-bi-import.c +++ b/src/plugins/bi_import/dialog-bi-import.c @@ -59,9 +59,9 @@ #include // 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) \ diff --git a/src/plugins/customer_import/CMakeLists.txt b/src/plugins/customer_import/CMakeLists.txt index 0d8fe0dc94..1200c70ea9 100644 --- a/src/plugins/customer_import/CMakeLists.txt +++ b/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) \ No newline at end of file +SET(customer_import_DIST ${customer_import_DIST_local} ${customer_import_glade_DIST} ${customer_import_ui_DIST} PARENT_SCOPE) diff --git a/src/plugins/customer_import/Makefile.am b/src/plugins/customer_import/Makefile.am index 65eede8613..e6f9499ad6 100644 --- a/src/plugins/customer_import/Makefile.am +++ b/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 \ diff --git a/src/report/report-gnome/window-report.h b/src/report/report-gnome/window-report.h index 96f33ce10a..ee7b9db147 100644 --- a/src/report/report-gnome/window-report.h +++ b/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);