Move auxiliary business files to gnome directory

cmake/CMakeLists.txt

@@ -15,7 +15,7 @@ IF (${CMAKE_VERSION} VERSION_GREATER 3.1)
   SET(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
 ENDIF()
 
-SET(schema-targets business-gnome-gschema csv-exp-gschema csv-imp-gschema
+SET(schema-targets csv-exp-gschema csv-imp-gschema
     generic-import-gschema gnome-gschema gnome-utils-gschema ofx-gschema qif-imp-gschema)
 
 IF (WITH_AQBANKING)

configure.ac

@@ -1782,9 +1782,6 @@ AC_CONFIG_FILES(
   src/tax/us/test/Makefile
   src/test-core/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
@@ -1799,7 +1796,7 @@ AC_CONFIG_FILES(
   src/app-utils/migratable-prefs.xml
   src/gnome/gnucash.desktop.in
   dnl # GSettings schema files
-  src/gnome-business/gschemas/org.gnucash.dialogs.business.gschema.xml.in
+  src/gnome/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

@@ -210,6 +210,7 @@ src/gnome/gnc-plugin-register2.c
 src/gnome/gnc-plugin-register.c
 src/gnome/gnc-split-reg2.c
 src/gnome/gnc-split-reg.c
+[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in
 [type: gettext/gsettings]src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in
 [type: gettext/gsettings]src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in
 [type: gettext/gsettings]src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in
@@ -223,18 +224,30 @@ src/gnome/gtkbuilder/assistant-acct-period.glade
 src/gnome/gtkbuilder/assistant-hierarchy.glade
 src/gnome/gtkbuilder/assistant-loan.glade
 src/gnome/gtkbuilder/assistant-stock-split.glade
+src/gnome/gtkbuilder/business-options-gnome.glade
+src/gnome/gtkbuilder/business-prefs.glade
+src/gnome/gtkbuilder/dialog-billterms.glade
+src/gnome/gtkbuilder/dialog-choose-owner.glade
 src/gnome/gtkbuilder/dialog-commodities.glade
+src/gnome/gtkbuilder/dialog-customer.glade
+src/gnome/gtkbuilder/dialog-date-close.glade
+src/gnome/gtkbuilder/dialog-employee.glade
 src/gnome/gtkbuilder/dialog-fincalc.glade
 src/gnome/gtkbuilder/dialog-find-account.glade
 src/gnome/gtkbuilder/dialog-imap-editor.glade
+src/gnome/gtkbuilder/dialog-invoice.glade
+src/gnome/gtkbuilder/dialog-job.glade
 src/gnome/gtkbuilder/dialog-lot-viewer.glade
 src/gnome/gtkbuilder/dialog-new-user.glade
+src/gnome/gtkbuilder/dialog-order.glade
+src/gnome/gtkbuilder/dialog-payment.glade
 src/gnome/gtkbuilder/dialog-price.glade
 src/gnome/gtkbuilder/dialog-print-check.glade
 src/gnome/gtkbuilder/dialog-progress.glade
 src/gnome/gtkbuilder/dialog-sx.glade
 src/gnome/gtkbuilder/dialog-tax-info.glade
 src/gnome/gtkbuilder/dialog-trans-assoc.glade
+src/gnome/gtkbuilder/dialog-vendor.glade
 src/gnome/gtkbuilder/gnc-plugin-page-budget.glade
 src/gnome/gtkbuilder/gnc-plugin-page-register2.glade
 src/gnome/gtkbuilder/gnc-plugin-page-register.glade
@@ -263,19 +276,6 @@ 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-business/CMakeLists.txt

@@ -1,7 +1,3 @@
-ADD_SUBDIRECTORY(gschemas)
-ADD_SUBDIRECTORY(gtkbuilder)
-ADD_SUBDIRECTORY(ui)
-
 SET(business_gnome_SOURCES
   business-options-gnome.c
   business-urls.c

src/gnome-business/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = . gtkbuilder gschemas ui
+SUBDIRS = .
 
 pkglib_LTLIBRARIES = libgncmod-business-gnome.la
 

src/gnome-business/gschemas/CMakeLists.txt

@@ -1,6 +0,0 @@
-
-SET(business_gnome_GSCHEMA org.gnucash.dialogs.business.gschema.xml)
-
-ADD_GSCHEMA_TARGETS(business-gnome-gschema "${business_gnome_GSCHEMA}")
-
-SET_DIST_LIST(business_gnome_gschema_DIST CMakeLists.txt Makefile.am org.gnucash.dialogs.business.gschema.xml.in.in)

src/gnome-business/gschemas/Makefile.am

@@ -1,12 +0,0 @@
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gschema_in_files = \
-  org.gnucash.dialogs.business.gschema.xml.in
-
-gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml)
-
-@GSETTINGS_RULES@
-
-CLEANFILES = $(gsettings_SCHEMAS)
-
-EXTRA_DIST = CMakeLists.txt

src/gnome-business/gtkbuilder/CMakeLists.txt

@@ -1,16 +0,0 @@
-
-FILE(COPY .
-  DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
-  PATTERN Makefile.* EXCLUDE
-  PATTERN CMakeLists.txt EXCLUDE)
-
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  DESTINATION share/gnucash
-  PATTERN Makefile.* EXCLUDE
-  PATTERN CMakeLists.txt EXCLUDE)
-
-SET(business_gnome_GLADE business-options-gnome.glade business-prefs.glade dialog-billterms.glade dialog-choose-owner.glade
-        dialog-customer.glade dialog-date-close.glade dialog-employee.glade dialog-invoice.glade dialog-job.glade
-        dialog-order.glade dialog-payment.glade dialog-vendor.glade)
-
-SET_DIST_LIST(business_gnome_gtkbuilder_DIST CMakeLists.txt Makefile.am ${business_gnome_GLADE})

src/gnome-business/gtkbuilder/Makefile.am

@@ -1,18 +0,0 @@
-gtkbuilderdir = $(GNC_GTKBUILDER_DIR)
-gtkbuilder_DATA = \
-  business-options-gnome.glade \
-  business-prefs.glade \
-  dialog-billterms.glade \
-  dialog-choose-owner.glade \
-  dialog-customer.glade \
-  dialog-date-close.glade \
-  dialog-employee.glade \
-  dialog-invoice.glade \
-  dialog-job.glade \
-  dialog-order.glade \
-  dialog-payment.glade \
-  dialog-vendor.glade
-
-EXTRA_DIST = \
-  ${gtkbuilder_DATA} \
-  CMakeLists.txt

src/gnome-business/ui/CMakeLists.txt

@@ -1,12 +0,0 @@
-FILE(COPY .
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui
-  PATTERN Makefile.* EXCLUDE
-  PATTERN CMakeLists.txt EXCLUDE)
-
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  DESTINATION share/gnucash
-  PATTERN Makefile.* EXCLUDE
-  PATTERN CMakeLists.txt EXCLUDE)
-
-SET(business_gnome_UI gnc-plugin-business-ui.xml gnc-plugin-page-invoice-ui.xml gnc-plugin-page-owner-tree-ui.xml)
-SET_DIST_LIST(business_gnome_ui_DIST CMakeLists.txt Makefile.am ${business_gnome_UI})

src/gnome-business/ui/Makefile.am

@@ -1,7 +0,0 @@
-uidir = $(GNC_UI_DIR)
-ui_DATA = \
-	gnc-plugin-business-ui.xml \
-	gnc-plugin-page-invoice-ui.xml \
-	gnc-plugin-page-owner-tree-ui.xml
-
-EXTRA_DIST = $(ui_DATA) CMakeLists.txt

src/gnome/gschemas/CMakeLists.txt

@@ -1,6 +1,7 @@
 
 SET(gnome_GSCHEMA
   org.gnucash.dialogs.gschema.xml
+  org.gnucash.dialogs.business.gschema.xml
   org.gnucash.dialogs.commodities.gschema.xml
   org.gnucash.dialogs.checkprinting.gschema.xml
   org.gnucash.dialogs.reconcile.gschema.xml
@@ -22,4 +23,4 @@ SET(gnome_gschema_DIST_local "")
 FOREACH(file ${gnome_GSCHEMA})
     LIST(APPEND gnome_gschema_DIST_local ${file}.in.in)
 ENDFOREACH()
-SET_DIST_LIST(gnome_gschema_DIST CMakeLists.txt Makefile.am ${gnome_gschema_DIST_local})
+SET_DIST_LIST(gnome_gschema_DIST CMakeLists.txt Makefile.am ${gnome_gschema_DIST_local})

src/gnome/gschemas/Makefile.am

@@ -2,6 +2,7 @@
 
 gschema_in_files = \
   org.gnucash.dialogs.gschema.xml.in \
+  org.gnucash.dialogs.business.gschema.xml.in \
   org.gnucash.dialogs.commodities.gschema.xml.in \
   org.gnucash.dialogs.checkprinting.gschema.xml.in \
   org.gnucash.dialogs.reconcile.gschema.xml.in \

src/gnome/gtkbuilder/CMakeLists.txt

@@ -13,18 +13,30 @@ SET(gnome_GLADE
         assistant-hierarchy.glade
         assistant-loan.glade
         assistant-stock-split.glade
+        business-options-gnome.glade
+        business-prefs.glade
+        dialog-billterms.glade
+        dialog-choose-owner.glade
         dialog-commodities.glade
-        dialog-imap-editor.glade
+        dialog-customer.glade
+        dialog-date-close.glade
+        dialog-employee.glade
         dialog-fincalc.glade
         dialog-find-account.glade
+        dialog-imap-editor.glade
+        dialog-invoice.glade
+        dialog-job.glade
         dialog-lot-viewer.glade
         dialog-new-user.glade
+        dialog-order.glade
+        dialog-payment.glade
         dialog-price.glade
         dialog-print-check.glade
         dialog-progress.glade
         dialog-sx.glade
         dialog-tax-info.glade
         dialog-trans-assoc.glade
+        dialog-vendor.glade
         gnc-plugin-page-budget.glade
         gnc-plugin-page-register2.glade
         gnc-plugin-page-register.glade

src/gnome/gtkbuilder/Makefile.am

@@ -4,18 +4,30 @@ gtkbuilder_DATA = \
 	assistant-hierarchy.glade \
 	assistant-loan.glade \
 	assistant-stock-split.glade \
+	business-options-gnome.glade \
+	business-prefs.glade \
+	dialog-billterms.glade \
+	dialog-choose-owner.glade \
 	dialog-commodities.glade \
-	dialog-imap-editor.glade \
+	dialog-customer.glade \
+	dialog-date-close.glade \
+	dialog-employee.glade \
 	dialog-fincalc.glade \
 	dialog-find-account.glade \
+	dialog-imap-editor.glade \
+	dialog-invoice.glade \
+	dialog-job.glade \
 	dialog-lot-viewer.glade \
 	dialog-new-user.glade \
+	dialog-order.glade \
+	dialog-payment.glade \
 	dialog-price.glade \
 	dialog-print-check.glade \
 	dialog-progress.glade \
 	dialog-sx.glade \
 	dialog-tax-info.glade \
 	dialog-trans-assoc.glade \
+	dialog-vendor.glade \
 	gnc-plugin-page-budget.glade \
 	gnc-plugin-page-register.glade \
 	gnc-plugin-page-register2.glade \

src/gnome/ui/CMakeLists.txt

@@ -12,10 +12,13 @@ SET(gnome_UI
       gnc-plugin-account-tree-ui.xml
       gnc-plugin-basic-commands-ui.xml
       gnc-plugin-budget-ui.xml
+      gnc-plugin-business-ui.xml
       gnc-plugin-file-history-ui.xml
       gnc-plugin-page-account-tree2-ui.xml
       gnc-plugin-page-account-tree-ui.xml
       gnc-plugin-page-budget-ui.xml
+      gnc-plugin-page-invoice-ui.xml
+      gnc-plugin-page-owner-tree-ui.xml
       gnc-plugin-page-register2-ui.xml
       gnc-plugin-page-register-ui.xml
       gnc-plugin-page-sx-list2-ui.xml

src/gnome/ui/Makefile.am

@@ -1,6 +1,7 @@
 uidir = $(GNC_UI_DIR)
 ui_DATA = \
 	gnc-plugin-budget-ui.xml \
+	gnc-plugin-business-ui.xml \
 	gnc-plugin-page-budget-ui.xml \
 	gnc-plugin-account-tree-ui.xml \
 	gnc-plugin-basic-commands-ui.xml \
@@ -10,6 +11,8 @@ ui_DATA = \
 	gnc-plugin-register-ui.xml \
 	gnc-plugin-register2-ui.xml \
 	gnc-plugin-register22-ui.xml \
+	gnc-plugin-page-invoice-ui.xml \
+	gnc-plugin-page-owner-tree-ui.xml \
 	gnc-plugin-page-register-ui.xml \
 	gnc-plugin-page-register2-ui.xml \
         gnc-plugin-page-sx-list-ui.xml \