diff --git a/src/backend/dbi/Makefile.am b/src/backend/dbi/Makefile.am index 97d09470388..2a95ef45dc3 100644 --- a/src/backend/dbi/Makefile.am +++ b/src/backend/dbi/Makefile.am @@ -16,7 +16,6 @@ AM_CPPFLAGS = \ -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 @@ noinst_HEADERS = \ 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 \ diff --git a/src/backend/dbi/test/Makefile.am b/src/backend/dbi/test/Makefile.am index 33122f3d65d..7cb3bbef4a0 100644 --- a/src/backend/dbi/test/Makefile.am +++ b/src/backend/dbi/test/Makefile.am @@ -15,8 +15,7 @@ AM_CPPFLAGS = \ -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 \ diff --git a/src/backend/sql/Makefile.am b/src/backend/sql/Makefile.am index 91fe77ae668..dec2d69c8e7 100644 --- a/src/backend/sql/Makefile.am +++ b/src/backend/sql/Makefile.am @@ -17,7 +17,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/libqof/qof \ ${GLIB_CFLAGS} \ ${GUILE_INCS} \ - ${GCONF_CFLAGS} \ ${WARN_CFLAGS} libgnc_backend_sql_la_SOURCES = \ @@ -73,7 +72,6 @@ noinst_HEADERS = \ 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 diff --git a/src/backend/sql/test/Makefile.am b/src/backend/sql/test/Makefile.am index 0ed849dbc01..3b8e65b585b 100644 --- a/src/backend/sql/test/Makefile.am +++ b/src/backend/sql/test/Makefile.am @@ -47,8 +47,7 @@ AM_CPPFLAGS = \ -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\" diff --git a/src/backend/xml/Makefile.am b/src/backend/xml/Makefile.am index 3695ee9b7f2..6af5112c430 100644 --- a/src/backend/xml/Makefile.am +++ b/src/backend/xml/Makefile.am @@ -15,8 +15,7 @@ AM_CPPFLAGS = \ -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 @@ noinst_HEADERS = \ 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 @@ libgnc_backend_xml_utils_la_LIBADD = \ 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 \ diff --git a/src/backend/xml/test/Makefile.am b/src/backend/xml/test/Makefile.am index 922d78bdc48..1e66a31dcf1 100644 --- a/src/backend/xml/test/Makefile.am +++ b/src/backend/xml/test/Makefile.am @@ -247,8 +247,7 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/libqof/qof \ ${LIBXML2_CFLAGS} \ ${GLIB_CFLAGS} \ - ${GUILE_INCS} \ - ${GCONF_CFLAGS} + ${GUILE_INCS} EXTRA_DIST = \ grab-types.pl \ diff --git a/src/backend/xml/test/test-load-xml2.c b/src/backend/xml/test/test-load-xml2.c index 33ee0309eae..1719698e790 100644 --- a/src/backend/xml/test/test-load-xml2.c +++ b/src/backend/xml/test/test-load-xml2.c @@ -80,7 +80,7 @@ test_load_file(const char *filename) 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,