Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Cleanup after file backend settings refactoring
This affects many other components as well, including the
python bindings

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23212 57a11ea4-9604-0410-9ed3-97b8803252fd
  • Loading branch information
gjanssens committed Oct 7, 2013
1 parent 3861de6 commit 302fb3b
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 15 deletions.
2 changes: 0 additions & 2 deletions src/backend/dbi/Makefile.am
Expand Up @@ -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 = \
Expand All @@ -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 \
Expand Down
3 changes: 1 addition & 2 deletions src/backend/dbi/test/Makefile.am
Expand Up @@ -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 \
Expand Down
2 changes: 0 additions & 2 deletions src/backend/sql/Makefile.am
Expand Up @@ -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 = \
Expand Down Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions src/backend/sql/test/Makefile.am
Expand Up @@ -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\"

Expand Down
5 changes: 1 addition & 4 deletions src/backend/xml/Makefile.am
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
3 changes: 1 addition & 2 deletions src/backend/xml/test/Makefile.am
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion src/backend/xml/test/test-load-xml2.c
Expand Up @@ -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,
Expand Down

0 comments on commit 302fb3b

Please sign in to comment.