r23212 - gnucash/trunk/src/backend - Cleanup after file backend settings refactoring

[Geert Janssens]

Author: gjanssens
Date: 2013-10-07 10:02:08 -0400 (Mon, 07 Oct 2013)
New Revision: 23212
Trac: http://svn.gnucash.org/trac/changeset/23212

Modified:
   gnucash/trunk/src/backend/dbi/Makefile.am
   gnucash/trunk/src/backend/dbi/test/Makefile.am
   gnucash/trunk/src/backend/sql/Makefile.am
   gnucash/trunk/src/backend/sql/test/Makefile.am
   gnucash/trunk/src/backend/xml/Makefile.am
   gnucash/trunk/src/backend/xml/test/Makefile.am
   gnucash/trunk/src/backend/xml/test/test-load-xml2.c
Log:
Cleanup after file backend settings refactoring

This affects many other components as well, including the
python bindings

Modified: gnucash/trunk/src/backend/dbi/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/dbi/Makefile.am	2013-10-07 14:01:51 UTC (rev 23211)
+++ gnucash/trunk/src/backend/dbi/Makefile.am	2013-10-07 14:02:08 UTC (rev 23212)
@@ -16,7 +16,6 @@
   -I${top_srcdir}/lib/libc \
   -I${top_srcdir}/src/libqof/qof \
   ${GLIB_CFLAGS} \
-  ${GCONF_CFLAGS} \
   ${WARN_CFLAGS}
 
 libgncmod_backend_dbi_la_SOURCES = \
@@ -29,7 +28,6 @@
 libgncmod_backend_dbi_la_LDFLAGS = -shared -avoid-version
 libgncmod_backend_dbi_la_LIBADD = \
    ${GLIB_LIBS} \
-   ${GCONF_LIBS} \
    ${top_builddir}/src/backend/sql/libgnc-backend-sql.la \
    ${top_builddir}/src/engine/libgncmod-engine.la \
    ${top_builddir}/src/core-utils/libgnc-core-utils.la \

Modified: gnucash/trunk/src/backend/dbi/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/dbi/test/Makefile.am	2013-10-07 14:01:51 UTC (rev 23211)
+++ gnucash/trunk/src/backend/dbi/test/Makefile.am	2013-10-07 14:02:08 UTC (rev 23212)
@@ -15,8 +15,7 @@
   -DTEST_MYSQL_URL=\"${TEST_MYSQL_URL}\" \
   -DTEST_PGSQL_URL=\"${TEST_PGSQL_URL}\" \
   ${GLIB_CFLAGS} \
-  ${GUILE_INCS} \
-  ${GCONF_CFLAGS}
+  ${GUILE_INCS}
 
 LDADD = ${top_builddir}/src/test-core/libtest-core.la \
         ${top_builddir}/src/gnc-module/libgnc-module.la \

Modified: gnucash/trunk/src/backend/sql/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/sql/Makefile.am	2013-10-07 14:01:51 UTC (rev 23211)
+++ gnucash/trunk/src/backend/sql/Makefile.am	2013-10-07 14:02:08 UTC (rev 23212)
@@ -17,7 +17,6 @@
   -I${top_srcdir}/src/libqof/qof \
   ${GLIB_CFLAGS} \
   ${GUILE_INCS} \
-  ${GCONF_CFLAGS} \
   ${WARN_CFLAGS}
 
 libgnc_backend_sql_la_SOURCES = \
@@ -73,7 +72,6 @@
 libgnc_backend_sql_la_LIBADD = \
    ${GLIB_LIBS} \
    ${GUILE_LIBS} \
-   ${GCONF_LIBS} \
    ${top_builddir}/src/engine/libgncmod-engine.la \
    ${top_builddir}/src/libqof/qof/libgnc-qof.la
 

Modified: gnucash/trunk/src/backend/sql/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/sql/test/Makefile.am	2013-10-07 14:01:51 UTC (rev 23211)
+++ gnucash/trunk/src/backend/sql/test/Makefile.am	2013-10-07 14:02:08 UTC (rev 23212)
@@ -47,8 +47,7 @@
   -I${top_srcdir}/src/backend/sql \
   -I${top_srcdir}/src/libqof/qof \
   ${GLIB_CFLAGS} \
-  ${GUILE_INCS} \
-  ${GCONF_CFLAGS}
+  ${GUILE_INCS}
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.sql\"
 

Modified: gnucash/trunk/src/backend/xml/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/xml/Makefile.am	2013-10-07 14:01:51 UTC (rev 23211)
+++ gnucash/trunk/src/backend/xml/Makefile.am	2013-10-07 14:02:08 UTC (rev 23212)
@@ -15,8 +15,7 @@
   -I${top_srcdir}/src/libqof/qof \
   -I$(top_srcdir)/src \
   ${LIBXML2_CFLAGS} \
-  ${GLIB_CFLAGS} \
-  ${GCONF_CFLAGS}
+  ${GLIB_CFLAGS}
 
 libgnc_backend_xml_utils_la_SOURCES = \
   gnc-account-xml-v2.c \
@@ -85,7 +84,6 @@
 
 libgnc_backend_xml_utils_la_LIBADD = \
    ${GLIB_LIBS} \
-   ${GCONF_LIBS} \
    ${LIBXML2_LIBS} \
    ${ZLIB_LIBS} \
    ${top_builddir}/src/engine/libgncmod-engine.la \
@@ -95,7 +93,6 @@
 libgncmod_backend_xml_la_LDFLAGS = -module -avoid-version
 libgncmod_backend_xml_la_LIBADD = \
    ${GLIB_LIBS} \
-   ${GCONF_LIBS} \
    ${LIBXML2_LIBS} \
    ${ZLIB_LIBS} \
    ${top_builddir}/src/engine/libgncmod-engine.la \

Modified: gnucash/trunk/src/backend/xml/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/xml/test/Makefile.am	2013-10-07 14:01:51 UTC (rev 23211)
+++ gnucash/trunk/src/backend/xml/test/Makefile.am	2013-10-07 14:02:08 UTC (rev 23212)
@@ -247,8 +247,7 @@
   -I${top_srcdir}/src/libqof/qof \
   ${LIBXML2_CFLAGS} \
   ${GLIB_CFLAGS} \
-  ${GUILE_INCS} \
-  ${GCONF_CFLAGS}
+  ${GUILE_INCS}
 
 EXTRA_DIST = \
   grab-types.pl \

Modified: gnucash/trunk/src/backend/xml/test/test-load-xml2.c
===================================================================
--- gnucash/trunk/src/backend/xml/test/test-load-xml2.c	2013-10-07 14:01:51 UTC (rev 23211)
+++ gnucash/trunk/src/backend/xml/test/test-load-xml2.c	2013-10-07 14:02:08 UTC (rev 23212)
@@ -80,7 +80,7 @@
     QofBook *book;
     Account *root;
     gboolean ignore_lock;
-    gchar *logdomain = "GConf";
+    gchar *logdomain = "backend.xml";
     guint loglevel = G_LOG_LEVEL_WARNING;
     TestErrorStruct check = { loglevel, logdomain, NULL };
     g_log_set_handler (logdomain, loglevel,