Merge business ledger into ledger-core

There's no need to have it as a separate directory

CMakeLists.txt

@@ -673,7 +673,7 @@ add_custom_target(uninstall
         COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
 
 SET_TARGET_PROPERTIES(gnc-qof gnc-core-utils gnc-module gnc-backend-sql gnc-backend-xml-utils
-  gnc-business-ledger gnc-gnome PROPERTIES
+  gnc-gnome PROPERTIES
   LIBRARY_OUTPUT_DIRECTORY         ${CMAKE_BINARY_DIR}/lib
   IF (XCODE_VERSION)
     LIBRARY_OUTPUT_DIRECTORY_DEBUG   ${CMAKE_BINARY_DIR}/lib

configure.ac

@@ -1786,7 +1786,6 @@ AC_CONFIG_FILES(
   src/business/business-gnome/gtkbuilder/Makefile
   src/business/business-gnome/gschemas/Makefile
   src/business/business-gnome/ui/Makefile
-  src/business/business-ledger/Makefile
   dnl # Stuff for bill/invoice import plugin
   src/plugins/Makefile
   src/plugins/bi_import/Makefile

po/POTFILES.in

@@ -142,12 +142,6 @@ 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/business/business-ledger/gncEntryLedger.c
-src/business/business-ledger/gncEntryLedgerControl.c
-src/business/business-ledger/gncEntryLedgerDisplay.c
-src/business/business-ledger/gncEntryLedgerLayout.c
-src/business/business-ledger/gncEntryLedgerLoad.c
-src/business/business-ledger/gncEntryLedgerModel.c
 src/core-utils/binreloc.c
 src/core-utils/core-utils.scm
 src/core-utils/gnc-environment.c
@@ -524,6 +518,12 @@ src/plugins/customer_import/libgncmod-customer_import.c
 src/plugins/example/gncmod-example.c
 src/plugins/example/gnc-plugin.example.c
 src/python/gncmod-python.c
+src/register/ledger-core/gncEntryLedger.c
+src/register/ledger-core/gncEntryLedgerControl.c
+src/register/ledger-core/gncEntryLedgerDisplay.c
+src/register/ledger-core/gncEntryLedgerLayout.c
+src/register/ledger-core/gncEntryLedgerLoad.c
+src/register/ledger-core/gncEntryLedgerModel.c
 src/register/ledger-core/gnc-ledger-display2.c
 src/register/ledger-core/gnc-ledger-display.c
 src/register/ledger-core/gncmod-ledger-core.c

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

@@ -57,7 +57,6 @@ eval `${top_srcdir}/src/gnc-test-env.pl \
   --gnc-module-dir ${top_builddir}/src/business/business-core/file \
   --gnc-module-dir ${top_builddir}/src/business/business-utils \
   --gnc-module-dir ${top_builddir}/src/business/dialog-tax-table \
-  --gnc-module-dir ${top_builddir}/src/business/business-ledger \
   --gnc-module-dir ${top_builddir}/src/business/business-gnome \
   --guile-load-dir ${top_builddir}/src/core-utils \
   --guile-load-dir ${top_builddir}/src/gnc-module \
@@ -92,7 +91,6 @@ eval `${top_srcdir}/src/gnc-test-env.pl \
   --library-dir    ${top_builddir}/src/register/register-gnome \
   --library-dir    ${top_builddir}/src/register/register-core \
   --library-dir    ${top_builddir}/src/register/ledger-core \
-  --library-dir    ${top_builddir}/src/business/business-ledger \
   --library-dir    ${top_builddir}/src/report/report-system \
   --library-dir    ${top_builddir}/src/report/report-gnome
   `

src/business/CMakeLists.txt

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

src/business/Makefile.am

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

src/business/business-gnome/CMakeLists.txt

@@ -50,7 +50,7 @@ ADD_LIBRARY(gncmod-business-gnome
   ${business_gnome_HEADERS}
 )
 
-TARGET_LINK_LIBRARIES(gncmod-business-gnome gnc-business-ledger gncmod-gnome-search 
+TARGET_LINK_LIBRARIES(gncmod-business-gnome gncmod-ledger-core gncmod-gnome-search 
    gncmod-report-gnome gncmod-gnome-utils gnc-gnome gncmod-engine gnc-qof ${GTK3_LDFLAGS})
 
 TARGET_COMPILE_DEFINITIONS(gncmod-business-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.business.gnome\")

src/business/business-gnome/Makefile.am

@@ -14,7 +14,6 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/gnome-search \
   -I${top_srcdir}/src/html \
   -I${top_srcdir}/src/report/report-gnome \
-  -I${top_srcdir}/src/business/business-ledger \
   -I${top_srcdir}/src/register/register-core \
   -I${top_srcdir}/src/register/register-gnome \
   -I${top_srcdir}/src/register/ledger-core \
@@ -66,9 +65,9 @@ libgncmod_business_gnome_la_LDFLAGS = -avoid-version
 
 libgncmod_business_gnome_la_LIBADD = \
   ${top_builddir}/src/gnome/libgnc-gnome.la \
-  ${top_builddir}/src/business/business-ledger/libgnc-business-ledger.la \
   ${top_builddir}/src/register/register-core/libgncmod-register-core.la \
   ${top_builddir}/src/register/register-gnome/libgncmod-register-gnome.la \
+  ${top_builddir}/src/register/ledger-core/libgncmod-ledger-core.la \
   ${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \
   ${top_builddir}/src/gnome-search/libgncmod-gnome-search.la \
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \

src/business/business-ledger/CMakeLists.txt

@@ -1,37 +0,0 @@
-
-SET (gnc_business_ledger_SOURCES
-  gncEntryLedger.c
-  gncEntryLedgerControl.c
-  gncEntryLedgerDisplay.c
-  gncEntryLedgerLayout.c
-  gncEntryLedgerLoad.c
-  gncEntryLedgerModel.c
-)
-
-SET (gnc_business_ledger_noinst_HEADERS
-  gncEntryLedger.h
-  gncEntryLedgerP.h
-  gncEntryLedgerControl.h
-  gncEntryLedgerLayout.h
-  gncEntryLedgerModel.h
-)
-
-ADD_LIBRARY (gnc-business-ledger
-  ${gnc_business_ledger_SOURCES}
-  ${gnc_business_ledger_noinst_HEADERS}
-)
-
-TARGET_LINK_LIBRARIES(gnc-business-ledger gncmod-ledger-core  gncmod-register-core gncmod-engine gncmod-gnome-utils
-                            gnc-core-utils ${GTK3_LDFLAGS})
-
-TARGET_COMPILE_DEFINITIONS (gnc-business-ledger PRIVATE -DG_LOG_DOMAIN=\"gnc.business.ledger\")
-
-TARGET_INCLUDE_DIRECTORIES (gnc-business-ledger PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-INSTALL(TARGETS gnc-business-ledger
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-  RUNTIME DESTINATION bin)
-# No headers to install
-
-SET_DIST_LIST(business_ledger_DIST CMakeLists.txt Makefile.am ${gnc_business_ledger_SOURCES} ${gnc_business_ledger_noinst_HEADERS})

src/business/business-ledger/Makefile.am

@@ -1,46 +0,0 @@
-SUBDIRS = .
-
-lib_LTLIBRARIES = libgnc-business-ledger.la
-
-libgnc_business_ledger_la_SOURCES = \
-  gncEntryLedger.c \
-  gncEntryLedgerControl.c \
-  gncEntryLedgerDisplay.c \
-  gncEntryLedgerLayout.c \
-  gncEntryLedgerLoad.c \
-  gncEntryLedgerModel.c
-
-noinst_HEADERS = \
-  gncEntryLedger.h \
-  gncEntryLedgerP.h \
-  gncEntryLedgerControl.h \
-  gncEntryLedgerLayout.h \
-  gncEntryLedgerModel.h
-
-libgnc_business_ledger_la_LIBADD = \
-  ${top_builddir}/src/register/register-core/libgncmod-register-core.la \
-  ${top_builddir}/src/register/register-gnome/libgncmod-register-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 \
-  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-  ${GTK_LIBS} \
-  ${GLIB_LIBS}
-
-AM_CPPFLAGS = \
-  -I${top_srcdir}/src \
-  -I${top_builddir}/src \
-  -I${top_srcdir}/src/engine \
-  -I${top_srcdir}/src/core-utils \
-  -I${top_srcdir}/src/gnc-module \
-  -I${top_srcdir}/src/app-utils \
-  -I${top_srcdir}/src/gnome-utils \
-  -I${top_srcdir}/src/register/register-core \
-  -I${top_srcdir}/src/libqof/qof \
-  ${GTK_CFLAGS} \
-  ${GLIB_CFLAGS}
-
-AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.business.ledger\"
-
-EXTRA_DIST = CMakeLists.txt

src/plugins/bi_import/Makefile.am

@@ -37,7 +37,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/report/report-gnome \
   -I${top_srcdir}/src/gnome-search/ \
   -I${top_srcdir}/src/register/ledger-core \
-  -I${top_srcdir}/src/business/business-ledger/ \
+  -I${top_srcdir}/src/register/ledger-business \
   -I${top_srcdir}/src/register/register-gnome \
   -I${top_srcdir}/src/register/register-core \
   -I${top_srcdir}/src/business/dialog-tax-table \

src/plugins/customer_import/Makefile.am

@@ -35,7 +35,6 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/report/report-gnome \
   -I${top_srcdir}/src/gnome-search/ \
   -I${top_srcdir}/src/register/ledger-core \
-  -I${top_srcdir}/src/business/business-ledger/ \
   -I${top_srcdir}/src/register/register-gnome \
   -I${top_srcdir}/src/register/register-core \
   -I${top_srcdir}/src/business/dialog-tax-table \

src/register/Makefile.am

@@ -1,3 +1,3 @@
-SUBDIRS=register-core register-gnome ledger-core 
+SUBDIRS=register-core register-gnome ledger-core
 
 EXTRA_DIST = CMakeLists.txt

src/register/ledger-core/CMakeLists.txt

@@ -12,8 +12,15 @@ SET (ledger_core_SOURCES
   split-register-model.c
   split-register-model-save.c
   split-register-util.c
+  gncEntryLedger.c
+  gncEntryLedgerControl.c
+  gncEntryLedgerDisplay.c
+  gncEntryLedgerLayout.c
+  gncEntryLedgerLoad.c
+  gncEntryLedgerModel.c
 )
 
+
 SET (ledger_core_HEADERS
   gnc-ledger-display.h
   gnc-ledger-display2.h
@@ -23,6 +30,11 @@ SET (ledger_core_HEADERS
   split-register-model.h
   split-register-model-save.h
   split-register-p.h
+  gncEntryLedger.h
+  gncEntryLedgerP.h
+  gncEntryLedgerControl.h
+  gncEntryLedgerLayout.h
+  gncEntryLedgerModel.h
 )
 
 # Add dependency on config.h
@@ -31,7 +43,7 @@ SET_SOURCE_FILES_PROPERTIES (${ledger_core_SOURCES} PROPERTIES OBJECT_DEPENDS ${
 ADD_LIBRARY (gncmod-ledger-core ${ledger_core_SOURCES} ${ledger_core_HEADERS})
 
 TARGET_LINK_LIBRARIES(gncmod-ledger-core gncmod-register-gnome gncmod-register-core gncmod-gnome-utils
-        gncmod-engine ${GTK3_LDFLAGS})
+        gncmod-engine gnc-core-utils ${GTK3_LDFLAGS})
 
 TARGET_COMPILE_DEFINITIONS (gncmod-ledger-core PRIVATE -DG_LOG_DOMAIN=\"gnc.register.ledger\")
 
@@ -43,5 +55,7 @@ INSTALL(TARGETS gncmod-ledger-core
   RUNTIME DESTINATION bin)
 # No headers to install
 
+
 SET_LOCAL_DIST(ledger_core_DIST_local CMakeLists.txt Makefile.am ${ledger_core_SOURCES} ${ledger_core_HEADERS})
 SET(ledger_core_DIST ${ledger_core_DIST_local} ${test_ledger_core_DIST} PARENT_SCOPE)
+

src/register/ledger-core/Makefile.am

@@ -12,7 +12,13 @@ libgncmod_ledger_core_la_SOURCES = \
   split-register-load.c \
   split-register-model.c \
   split-register-model-save.c \
-  split-register-util.c
+  split-register-util.c \
+  gncEntryLedger.c \
+  gncEntryLedgerControl.c \
+  gncEntryLedgerDisplay.c \
+  gncEntryLedgerLayout.c \
+  gncEntryLedgerLoad.c \
+  gncEntryLedgerModel.c
 
 noinst_HEADERS = \
   gnc-ledger-display.h \
@@ -22,7 +28,12 @@ noinst_HEADERS = \
   split-register-layout.h \
   split-register-model.h \
   split-register-model-save.h \
-  split-register-p.h
+  split-register-p.h \
+  gncEntryLedger.h \
+  gncEntryLedgerP.h \
+  gncEntryLedgerControl.h \
+  gncEntryLedgerLayout.h \
+  gncEntryLedgerModel.h
 
 libgncmod_ledger_core_la_LDFLAGS = -avoid-version
 

src/register/ledger-core/gncEntryLedgerLayout.c

@@ -289,5 +289,3 @@ TableLayout * gnc_entry_ledger_layout_new (GncEntryLedger *ledger)
 
     return layout;
 }
-
-