Rework source directory structure for gschema, gtkbuilder and ui files

There is now a directory for each respective file type directly in the gnucash source directory
(This was already started for gschema files before).

In principle all files of each type should go into these global directories. The only
exception is if such a file belongs to an optional module. In that case the file
remains located inside that module's directory. Currently we have ui, glade and gschema file
exceptions in aqb and ofx importers.

gnucash/CMakeLists.txt

@@ -22,11 +22,13 @@ int main (int argc, char** argv) {
 ADD_SUBDIRECTORY (gnome)
 ADD_SUBDIRECTORY (gnome-utils)
 ADD_SUBDIRECTORY (gnome-search)
+ADD_SUBDIRECTORY (gtkbuilder)
 ADD_SUBDIRECTORY (html)
 ADD_SUBDIRECTORY (import-export)
 ADD_SUBDIRECTORY (python)
 ADD_SUBDIRECTORY (register)
 ADD_SUBDIRECTORY (report)
+ADD_SUBDIRECTORY (ui)
 ADD_SUBDIRECTORY (gschemas)
 
 ADD_DEFINITIONS (-DHAVE_CONFIG_H)
@@ -255,6 +257,6 @@ SET_LOCAL_DIST(gnucash_DIST_local CMakeLists.txt environment.in generate-gnc-scr
                gnucash-bin.c gnucash.rc.in gnucash-valgrind.in gnucash-gresources.xml ${gresource_files}
                ${gnucash_EXTRA_DIST})
 
-SET(gnucash_DIST ${gnucash_DIST_local} ${gschemas_DIST} ${gnome_DIST} ${gnome_search_DIST}
-             ${gnome_utils_DIST} ${html_DIST} ${import_export_DIST} ${python_DIST} ${register_DIST} ${report_DIST}
-             ${overrides_DIST} ${test_bin_DIST} PARENT_SCOPE)
+set (gnucash_DIST ${gnucash_DIST_local} ${gnome_DIST} ${gnome_search_DIST} ${gnome_utils_DIST}
+    ${gschemas_DIST} ${gtkbuilder_DIST} ${html_DIST} ${import_export_DIST} ${python_DIST} ${register_DIST}
+    ${report_DIST} ${overrides_DIST} ${test_bin_DIST} ${ui_DIST} PARENT_SCOPE)

gnucash/gnome-search/CMakeLists.txt

@@ -36,7 +36,7 @@ SET (gnome_search_noinst_HEADERS
 # Add dependency on config.h
 SET_SOURCE_FILES_PROPERTIES (${gnome_search_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
-SET_LOCAL_DIST(gnome_search_DIST_local CMakeLists.txt  dialog-search.glade ${gnome_search_SOURCES} ${gnome_search_HEADERS}
+SET_LOCAL_DIST(gnome_search_DIST_local CMakeLists.txt ${gnome_search_SOURCES} ${gnome_search_HEADERS}
         ${gnome_search_noinst_HEADERS})
 SET(gnome_search_DIST ${gnome_search_DIST_local} PARENT_SCOPE)
 
@@ -62,13 +62,3 @@ INSTALL(TARGETS gncmod-gnome-search
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 INSTALL(FILES ${gnome_search_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
-
-SET(gnome_search_GLADE dialog-search.glade)
-
-INSTALL(FILES ${gnome_search_GLADE} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
-
-FILE(COPY .
-    DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
-    PATTERN Makefile.* EXCLUDE
-    PATTERN CMakeLists.txt EXCLUDE)
-

gnucash/gnome-utils/CMakeLists.txt

@@ -1,7 +1,5 @@
 # Note that gnucash/gnome-utils CANNOT depend on gnucash/gnome!
 
-ADD_SUBDIRECTORY(gtkbuilder)
-ADD_SUBDIRECTORY(ui)
 ADD_SUBDIRECTORY(test)
 
 # Command to generate the swig-gnome-utils.c wrapper file
@@ -270,5 +268,4 @@ ADD_CUSTOM_TARGET(scm-gnome-utils ALL DEPENDS scm-gnome-utils-2 scm-gnome-utils-
 SET_LOCAL_DIST(gnome_utils_DIST_local CMakeLists.txt ${gnome_utils_SOURCES} ${gnome_utils_HEADERS}
         ${gnome_utils_noinst_HEADERS} gnome-utils.scm gnome-utils.i gnc-menu-extensions.scm
         make-gnc-warnings-c.xsl make-gnc-warnings-h.xsl)
-SET(gnome_utils_DIST ${gnome_utils_DIST_local} ${test_gnome_utils_DIST}
-        ${gnome_utils_ui_DIST} ${gnome_utils_gtkbuilder_DIST} PARENT_SCOPE)
+SET(gnome_utils_DIST ${gnome_utils_DIST_local} ${test_gnome_utils_DIST} PARENT_SCOPE)

gnucash/gnome-utils/gtkbuilder/CMakeLists.txt

@@ -1,26 +0,0 @@
-SET(gnome_utils_GLADE
-        assistant-xml-encoding.glade
-        dialog-account.glade
-        dialog-book-close.glade
-        dialog-commodity.glade
-        dialog-file-access.glade
-        dialog-object-references.glade
-        dialog-options.glade
-        dialog-preferences.glade
-        dialog-query-view.glade
-        dialog-reset-warnings.glade
-        dialog-tax-table.glade
-        dialog-totd.glade
-        dialog-transfer.glade
-        dialog-userpass.glade
-        gnc-date-format.glade
-        gnc-frequency.glade
-        gnc-recurrence.glade
-        gnc-tree-view-owner.glade
-)
-
-FILE(COPY ${gnome_utils_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
-INSTALL(FILES ${gnome_utils_GLADE} DESTINATION share/gnucash/gtkbuilder)
-
-SET_DIST_LIST(gnome_utils_gtkbuilder_DIST CMakeLists.txt ${gnome_utils_GLADE})

gnucash/gnome-utils/ui/CMakeLists.txt

@@ -1,17 +0,0 @@
-set(gnome_utils_UI
-  gnc-main-window-ui.xml
-  gnc-windows-menu-ui-quartz.xml
-  gnc-windows-menu-ui.xml
-  osx_accel_map
-  )
-
-FILE(COPY ${gnome_utils_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-
-INSTALL(FILES ${gnome_utils_UI} DESTINATION share/gnucash/ui)
-
-SET(gnome_utils_ui_DIST_local
-  CMakeLists.txt
-  ${gnome_utils_UI}
-  )
-
-SET_DIST_LIST(gnome_utils_ui_DIST ${gnome_utils_ui_DIST_local})

gnucash/gnome/CMakeLists.txt

@@ -1,7 +1,4 @@
 
-ADD_SUBDIRECTORY(gtkbuilder)
-ADD_SUBDIRECTORY(ui)
-
 SET (gnc_gnome_noinst_HEADERS
   assistant-acct-period.h
   assistant-hierarchy.h
@@ -216,7 +213,6 @@ ADD_CUSTOM_TARGET(gnucash-desktop ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucas
 
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop DESTINATION  ${CMAKE_INSTALL_DATADIR}/applications)
 
-SET_LOCAL_DIST(gnome_DIST_local
+SET_DIST_LIST(gnome_DIST
         CMakeLists.txt gnome.i gnucash.appdata.xml.in gnucash.desktop.in.in
         ${gnc_gnome_noinst_HEADERS} ${gnc_gnome_SOURCES})
-SET(gnome_DIST ${gnome_DIST_local} ${gnome_ui_DIST} ${gnome_gtkbuilder_DIST} PARENT_SCOPE)

gnucash/gnome/gtkbuilder/CMakeLists.txt

@@ -1,41 +0,0 @@
-SET(gnome_GLADE
-        assistant-acct-period.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-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
-        window-autoclear.glade
-        window-reconcile.glade
-)
-
-FILE(COPY ${gnome_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
-INSTALL(FILES ${gnome_GLADE} DESTINATION share/gnucash/gtkbuilder)
-
-SET_DIST_LIST(gnome_gtkbuilder_DIST CMakeLists.txt ${gnome_GLADE})

gnucash/gschemas/CMakeLists.txt

@@ -1,14 +1,18 @@
 
 SET(gschema_SOURCES
-  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.commodities.gschema.xml
+  org.gnucash.dialogs.export.csv.gschema.xml
+  org.gnucash.dialogs.gschema.xml
+  org.gnucash.dialogs.import.csv.gschema.xml
+  org.gnucash.dialogs.import.generic.gschema.xml
+  org.gnucash.dialogs.import.qif.gschema.xml
   org.gnucash.dialogs.reconcile.gschema.xml
   org.gnucash.dialogs.sxs.gschema.xml
   org.gnucash.dialogs.totd.gschema.xml
-  org.gnucash.gschema.xml
   org.gnucash.general.finance-quote.gschema.xml
+  org.gnucash.gschema.xml
   org.gnucash.history.gschema.xml
   org.gnucash.warnings.gschema.xml
   org.gnucash.window.pages.account.tree.gschema.xml

gnucash/gtkbuilder/CMakeLists.txt

@@ -0,0 +1,71 @@
+set (gtkbuilder_SOURCES
+        assistant-acct-period.glade
+        assistant-csv-account-import.glade
+        assistant-csv-export.glade
+        assistant-csv-price-import.glade
+        assistant-csv-trans-import.glade
+        assistant-hierarchy.glade
+        assistant-loan.glade
+        assistant-qif-import.glade
+        assistant-stock-split.glade
+        assistant-xml-encoding.glade
+        business-options-gnome.glade
+        business-prefs.glade
+        dialog-account-picker.glade
+        dialog-account.glade
+        dialog-bi-import-gui.glade
+        dialog-billterms.glade
+        dialog-book-close.glade
+        dialog-choose-owner.glade
+        dialog-commodities.glade
+        dialog-commodity.glade
+        dialog-custom-report.glade
+        dialog-customer-import-gui.glade
+        dialog-customer.glade
+        dialog-date-close.glade
+        dialog-employee.glade
+        dialog-file-access.glade
+        dialog-fincalc.glade
+        dialog-find-account.glade
+        dialog-imap-editor.glade
+        dialog-import.glade
+        dialog-invoice.glade
+        dialog-job.glade
+        dialog-lot-viewer.glade
+        dialog-new-user.glade
+        dialog-object-references.glade
+        dialog-options.glade
+        dialog-order.glade
+        dialog-payment.glade
+        dialog-preferences.glade
+        dialog-price.glade
+        dialog-print-check.glade
+        dialog-progress.glade
+        dialog-query-view.glade
+        dialog-report.glade
+        dialog-reset-warnings.glade
+        dialog-search.glade
+        dialog-sx.glade
+        dialog-tax-info.glade
+        dialog-tax-table.glade
+        dialog-totd.glade
+        dialog-trans-assoc.glade
+        dialog-transfer.glade
+        dialog-userpass.glade
+        dialog-vendor.glade
+        gnc-date-format.glade
+        gnc-frequency.glade
+        gnc-plugin-page-budget.glade
+        gnc-plugin-page-register2.glade
+        gnc-plugin-page-register.glade
+        gnc-recurrence.glade
+        gnc-tree-view-owner.glade
+        window-autoclear.glade
+        window-reconcile.glade
+)
+
+file (COPY ${gtkbuilder_SOURCES} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
+
+install (FILES ${gtkbuilder_SOURCES} DESTINATION share/gnucash/gtkbuilder)
+
+SET_DIST_LIST(gtkbuilder_DIST CMakeLists.txt ${gtkbuilder_SOURCES})

gnucash/import-export/CMakeLists.txt

@@ -8,7 +8,6 @@ ADD_SUBDIRECTORY(bi-import)
 ADD_SUBDIRECTORY(csv-exp)
 ADD_SUBDIRECTORY(csv-imp)
 ADD_SUBDIRECTORY(customer-import)
-ADD_SUBDIRECTORY(gschemas)
 ADD_SUBDIRECTORY(log-replay)
 ADD_SUBDIRECTORY(ofx)
 ADD_SUBDIRECTORY(qif)
@@ -72,21 +71,14 @@ INSTALL(TARGETS gncmod-generic-import
 
 INSTALL(FILES ${generic_import_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
 
-SET(generic_import_GLADE dialog-import.glade)
-
-INSTALL(FILES ${generic_import_GLADE} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
-
-
-FILE(COPY ${generic_import_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
 SET(generic_import_EXTRA_DIST generic-import-design.txt)
 
 SET_LOCAL_DIST(import_export_DIST_local CMakeLists.txt ${generic_import_SOURCES}
-        ${generic_import_HEADERS} ${generic_import_GLADE} ${generic_import_noinst_HEADERS}
+        ${generic_import_HEADERS} ${generic_import_noinst_HEADERS}
         ${generic_import_EXTRA_DIST})
 
 SET(import_export_DIST ${import_export_DIST_local} ${aqbanking_DIST} ${bi_import_DIST}
         ${csv_export_DIST} ${csv_import_DIST} ${customer_import_DIST}
-        ${generic_import_gschema_DIST} ${log_report_DIST} ${ofx_DIST} ${qif_DIST} ${qif_import_DIST}
+        ${log_report_DIST} ${ofx_DIST} ${qif_DIST} ${qif_import_DIST}
         ${test_generic_import_DIST}
         PARENT_SCOPE)

gnucash/import-export/bi-import/CMakeLists.txt

@@ -1,7 +1,3 @@
-
-ADD_SUBDIRECTORY(gtkbuilder)
-ADD_SUBDIRECTORY(ui)
-
 SET(bi_import_SOURCES
   gnc-plugin-bi-import.c
   gncmod-bi-import.c
@@ -49,5 +45,4 @@ INSTALL(TARGETS gncmod-bi-import
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install.
 
-SET_LOCAL_DIST(bi_import_DIST_local CMakeLists.txt 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_DIST_LIST(bi_import_DIST CMakeLists.txt README ${bi_import_SOURCES} ${bi_import_noinst_HEADERS})

gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt

@@ -1,7 +0,0 @@
-set(bi_import_GLADE dialog-bi-import-gui.glade)
-
-FILE(COPY ${bi_import_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
-INSTALL(FILES ${bi_import_GLADE} DESTINATION share/gnucash/gtkbuilder)
-
-SET_DIST_LIST(bi_import_glade_DIST CMakeLists.txt ${bi_import_GLADE})

gnucash/import-export/bi-import/ui/CMakeLists.txt

@@ -1,7 +0,0 @@
-set(bi_import_UI gnc-plugin-bi-import-ui.xml)
-
-FILE(COPY ${bi_import_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-
-INSTALL(FILES ${bi_import_UI} DESTINATION share/gnucash/ui)
-
-SET_DIST_LIST(bi_import_ui_DIST CMakeLists.txt gnc-plugin-bi-import-ui.xml)

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

@@ -1,5 +1,3 @@
-ADD_SUBDIRECTORY(gschemas)
-
 SET(csv_export_SOURCES
   gncmod-csv-export.c
   gnc-plugin-csv-export.c
@@ -35,21 +33,5 @@ INSTALL(TARGETS gncmod-csv-export
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install.
 
-SET(csv_export_GLADE assistant-csv-export.glade)
-
-INSTALL(FILES ${csv_export_GLADE} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
-
-SET(csv_export_UI gnc-plugin-csv-export-ui.xml)
-
-INSTALL(FILES ${csv_export_UI} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
-
-FILE(COPY ${csv_export_UI}
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-FILE(COPY ${csv_export_GLADE}
-  DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
-SET_LOCAL_DIST(csv_export_DIST_local CMakeLists.txt 
-        ${csv_export_SOURCES} ${csv_export_noinst_HEADERS}
-        ${csv_export_GLADE} ${csv_export_UI})
-SET(csv_export_DIST ${csv_export_DIST_local} ${csv_exp_gschema_DIST} PARENT_SCOPE)
-
+SET_DIST_LIST (csv_export_DIST CMakeLists.txt
+        ${csv_export_SOURCES} ${csv_export_noinst_HEADERS})

gnucash/import-export/csv-exp/gschemas/CMakeLists.txt

@@ -1,6 +0,0 @@
-
-SET(csv_exp_GSCHEMA org.gnucash.dialogs.export.csv.gschema.xml)
-
-add_gschema_targets("${csv_exp_GSCHEMA}")
-
-SET_DIST_LIST(csv_exp_gschema_DIST CMakeLists.txt org.gnucash.dialogs.export.csv.gschema.xml.in)

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

@@ -1,4 +1,3 @@
-ADD_SUBDIRECTORY(gschemas)
 ADD_SUBDIRECTORY(test)
 
 SET(csv_import_remote_SOURCES
@@ -93,21 +92,6 @@ INSTALL(TARGETS gncmod-csv-import
 
 # No headers to install
 
-SET(csv_import_GLADE assistant-csv-account-import.glade
-      assistant-csv-price-import.glade assistant-csv-trans-import.glade)
-
-INSTALL(FILES ${csv_import_GLADE} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
-
-SET(csv_import_UI gnc-plugin-csv-import-ui.xml)
-
-INSTALL(FILES ${csv_import_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
-
-FILE(COPY ${csv_import_UI}
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-FILE(COPY ${csv_import_GLADE}
-  DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
 SET_LOCAL_DIST(csv_import_DIST_local CMakeLists.txt 
-        ${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)
+        ${csv_import_SOURCES} ${csv_import_noinst_HEADERS})
+SET(csv_import_DIST ${csv_import_DIST_local} ${test_csv_import_DIST} PARENT_SCOPE)

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

@@ -1,5 +0,0 @@
-SET(csv_imp_GSCHEMA org.gnucash.dialogs.import.csv.gschema.xml)
-
-add_gschema_targets("${csv_imp_GSCHEMA}")
-
-SET_DIST_LIST(csv_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.csv.gschema.xml.in)

gnucash/import-export/customer-import/CMakeLists.txt

@@ -1,6 +1,3 @@
-ADD_SUBDIRECTORY(gtkbuilder)
-ADD_SUBDIRECTORY(ui)
-
 SET(customer_import_SOURCES
   gnc-plugin-customer-import.c
   gncmod-customer-import.c
@@ -40,5 +37,4 @@ INSTALL(TARGETS gncmod-customer-import
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install.
 
-SET_LOCAL_DIST(customer_import_DIST_local CMakeLists.txt ${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_DIST_LIST (customer_import_DIST CMakeLists.txt ${customer_import_SOURCES} ${customer_import_noinst_HEADERS})

gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt

@@ -1,6 +0,0 @@
-set(customer_import_GLADE dialog-customer-import-gui.glade)
-FILE(COPY ${customer_import_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
-INSTALL(FILES ${customer_import_GLADE} DESTINATION share/gnucash/gtkbuilder)
-
-SET_DIST_LIST(customer_import_glade_DIST CMakeLists.txt ${customer_import_GLADE})

gnucash/import-export/customer-import/ui/CMakeLists.txt

@@ -1,6 +0,0 @@
-set(customer_import_UI gnc-plugin-customer-import-ui.xml)
-FILE(COPY ${customer_import_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-
-INSTALL(FILES ${customer_import_UI} DESTINATION share/gnucash/ui)
-
-SET_DIST_LIST(customer_import_ui_DIST CMakeLists.txt ${customer_import_UI})

gnucash/import-export/gschemas/CMakeLists.txt

@@ -1,6 +0,0 @@
-
-SET(generic_import_GSCHEMA org.gnucash.dialogs.import.generic.gschema.xml)
-
-add_gschema_targets("${generic_import_GSCHEMA}")
-
-SET_DIST_LIST(generic_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.generic.gschema.xml.in)

gnucash/import-export/log-replay/CMakeLists.txt

@@ -30,12 +30,5 @@ INSTALL(TARGETS gncmod-log-replay
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install.
 
-SET(log_replay_UI gnc-plugin-log-replay-ui.xml)
-
-INSTALL(FILES ${log_replay_UI} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
-
-FILE(COPY ${log_replay_UI}
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-
 SET_DIST_LIST(log_report_DIST CMakeLists.txt 
-        ${log_replay_SOURCES} ${log_replay_noinst_HEADERS} ${log_replay_UI})
+        ${log_replay_SOURCES} ${log_replay_noinst_HEADERS})

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

@@ -1,6 +1,5 @@
 # CMakeLists.txt for gnucash/import_export/qif-imp
 
-ADD_SUBDIRECTORY(gschemas)
 ADD_SUBDIRECTORY(test)
 
 SET (qif_import_SOURCES
@@ -90,19 +89,6 @@ GNC_ADD_SCHEME_TARGETS(scm-qif-import
   FALSE
 )
 
-SET(qif_import_GLADE assistant-qif-import.glade dialog-account-picker.glade)
-
-INSTALL(FILES ${qif_import_GLADE} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
-
-SET(qif_import_UI gnc-plugin-qif-import-ui.xml)
-
-INSTALL(FILES ${qif_import_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
-
-FILE(COPY ${qif_import_UI}
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-FILE(COPY ${qif_import_GLADE}
-  DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
 SET_LOCAL_DIST(qif_import_DIST_local CMakeLists.txt file-format.txt ${qif_import_SOURCES} ${qif_import_noinst_HEADERS}
-        ${qif_import_SCHEME_0} ${qif_import_SCHEME} ${qif_import_SCHEME_2} ${qif_import_GLADE} ${qif_import_UI})
-SET(qif_import_DIST ${qif_import_DIST_local} ${test_qif_import_DIST} ${qif_import_gschema_DIST} PARENT_SCOPE)
+        ${qif_import_SCHEME_0} ${qif_import_SCHEME} ${qif_import_SCHEME_2})
+SET(qif_import_DIST ${qif_import_DIST_local} ${test_qif_import_DIST} PARENT_SCOPE)

gnucash/import-export/qif-imp/gschemas/CMakeLists.txt

@@ -1,6 +0,0 @@
-
-set(qif_imp_GSCHEMA org.gnucash.dialogs.import.qif.gschema.xml)
-
-add_gschema_targets("${qif_imp_GSCHEMA}")
-
-SET_DIST_LIST(qif_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.qif.gschema.xml.in)

gnucash/report/report-gnome/CMakeLists.txt

@@ -73,17 +73,6 @@ GNC_ADD_SCHEME_TARGETS(scm-report-gnome
     FALSE
 )
 
-SET(report_gnome_GLADE dialog-custom-report.glade dialog-report.glade)
-
-INSTALL(FILES ${report_gnome_GLADE} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
-
-SET(report_gnome_UI gnc-plugin-page-report-ui.xml)
-
-INSTALL(FILES ${report_gnome_UI} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
-
-FILE(COPY ${report_gnome_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-FILE(COPY ${report_gnome_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
-SET_LOCAL_DIST(report_gnome_DIST_local CMakeLists.txt report-gnome.i ${report_gnome_HEADERS} ${report_gnome_SOURCES}
-        ${report_gnome_SCHEME} ${report_gnome_GLADE} ${report_gnome_UI})
+SET_LOCAL_DIST(report_gnome_DIST_local CMakeLists.txt report-gnome.i ${report_gnome_HEADERS}
+    ${report_gnome_SOURCES} ${report_gnome_SCHEME})
 SET(report_gnome_DIST ${report_gnome_DIST_local} ${test_report_gnome_DIST} PARENT_SCOPE)

gnucash/report/stylesheets/CMakeLists.txt

@@ -73,15 +73,8 @@ GNC_ADD_SCHEME_TARGETS(scm-report-stylesheets-2
 
 ADD_CUSTOM_TARGET(scm-report-stylesheets ALL DEPENDS scm-report-stylesheets-1 scm-report-stylesheets-2)
 
-SET(stylesheets_UI gnc-plugin-stylesheets-ui.xml)
-
-INSTALL(FILES ${stylesheets_UI} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
-
-FILE(COPY ${stylesheets_UI}
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-
 SET_LOCAL_DIST(stylesheets_DIST_local CMakeLists.txt 
         ${stylesheets_SOURCES} ${stylesheets_noinst_HEADERS}
-        ${stylesheets_SCHEME_1} ${stylesheets_SCHEME_2}  ${stylesheets_UI})
+        ${stylesheets_SCHEME_1} ${stylesheets_SCHEME_2})
 
 SET(stylesheets_DIST ${stylesheets_DIST_local} ${test_stylesheets_DIST} PARENT_SCOPE)

gnucash/ui/CMakeLists.txt

@@ -1,9 +1,15 @@
-SET(gnome_UI
+set (ui_SOURCES
+      gnc-main-window-ui.xml
       gnc-plugin-account-tree-ui.xml
       gnc-plugin-basic-commands-ui.xml
+      gnc-plugin-bi-import-ui.xml
       gnc-plugin-budget-ui.xml
       gnc-plugin-business-ui.xml
+      gnc-plugin-csv-export-ui.xml
+      gnc-plugin-csv-import-ui.xml
+      gnc-plugin-customer-import-ui.xml
       gnc-plugin-file-history-ui.xml
+      gnc-plugin-log-replay-ui.xml
       gnc-plugin-page-account-tree2-ui.xml
       gnc-plugin-page-account-tree-ui.xml
       gnc-plugin-page-budget-ui.xml
@@ -11,19 +17,25 @@ SET(gnome_UI
       gnc-plugin-page-owner-tree-ui.xml
       gnc-plugin-page-register2-ui.xml
       gnc-plugin-page-register-ui.xml
+      gnc-plugin-page-report-ui.xml
       gnc-plugin-page-sx-list2-ui.xml
       gnc-plugin-page-sx-list-ui.xml
       gnc-plugin-page-sxregister-ui.xml
+      gnc-plugin-qif-import-ui.xml
       gnc-plugin-register22-ui.xml
       gnc-plugin-register2-ui.xml
       gnc-plugin-register-ui.xml
+      gnc-plugin-stylesheets-ui.xml
       gnc-reconcile-window-ui.xml
       gnc-sxed-to-create-window-ui.xml
       gnc-sxed-window-ui-full.xml
-      gnc-sxed-window-ui.xml)
+      gnc-sxed-window-ui.xml
+      gnc-windows-menu-ui-quartz.xml
+      gnc-windows-menu-ui.xml
+      osx_accel_map)
 
-FILE(COPY ${gnome_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
+file (COPY ${ui_SOURCES} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
 
-INSTALL(FILES ${gnome_UI} DESTINATION share/gnucash/ui)
+install (FILES ${ui_SOURCES} DESTINATION share/gnucash/ui)
 
-SET_DIST_LIST(gnome_ui_DIST CMakeLists.txt ${gnome_UI})
+SET_DIST_LIST(ui_DIST CMakeLists.txt ${ui_SOURCES})