Remove invalid dependencies on LibGnome CFLAGS

Much work has been done to change LibGnome Druids to GtkAssistants. The Makefiles in the containing directories no longer need to use $GNOME_CFLAGS or $GNOME_LDFLAGS. In a few cases where there still is a dependency, there's also a dependency on GCONF, so this change also adds $GCONF_CFLAGS and $GCONF_LDFLAGS to those Makefiles to clarify the dependency. There were also a few cases where the dependency consisted of a no-longer- needed include, or where an include was more general than appropriate. This change cleans up those cases as well. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21796 57a11ea4-9604-0410-9ed3-97b8803252fd
2025-02-25 18:55:30 -06:00 · 2011-12-29 23:28:23 +00:00 · 2011-12-29 23:28:23 +00:00 · dda1b7283e
commit dda1b7283e
parent e707b1227c
29 changed files with 41 additions and 33 deletions
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@ -5,7 +5,7 @@ else
 SUBDIRS = . test
 endif

-AM_CPPFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
+AM_CPPFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GCONF_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
  -DPKGSYSCONFDIR=\"${GNC_CONFIGDIR}\" \
  -DPKGDATADIR=\"${GNC_SHAREDIR}\" \
  -I${top_srcdir}/src \
@ -70,6 +70,7 @@ gnucash_LDADD = \
  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
  ${GUILE_LIBS} \
  ${GLIB_LIBS} \
+  ${GCONF_LIBS} \
  ${GNOME_LIBS} \
  ${GTK_LIBS}

--- a/src/business/business-gnome/Makefile.am
+++ b/src/business/business-gnome/Makefile.am
@ -20,6 +20,7 @@ AM_CPPFLAGS = \
  -I${top_srcdir}/src/register/ledger-core \
  -I${top_srcdir}/src/libqof/qof \
  ${GNOME_CFLAGS} \
+  ${GCONF_CFLAGS} \
  ${GLADE_CFLAGS} \
  ${GLIB_CFLAGS} \
  ${GUILE_INCS}
@ -81,6 +82,7 @@ libgncmod_business_gnome_la_LIBADD = \
  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
  ${GLADE_LIBS} \
  ${GNOME_LIBS} \
+  ${GCONF_LIBS} \
  ${GUILE_LIBS} \
  ${GLIB_LIBS} \
  ${EFENCE_LIBS}
--- a/src/business/business-ledger/Makefile.am
+++ b/src/business/business-ledger/Makefile.am
@ -40,7 +40,7 @@ AM_CPPFLAGS = \
  -I${top_srcdir}/src/libqof/qof \
  ${GUILE_INCS} \
  ${GLADE_CFLAGS} \
-  ${GNOME_CFLAGS} \
+  ${GCONF_CFLAGS} \
  ${GLIB_CFLAGS}

 INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.ledger\"
--- a/src/gnome-search/Makefile.am
+++ b/src/gnome-search/Makefile.am
@ -10,7 +10,7 @@ AM_CPPFLAGS = \
  -I${top_srcdir}/src/libqof/qof \
  ${GUILE_INCS} \
  ${GLADE_CFLAGS} \
-  ${GNOME_CFLAGS} \
+  ${GCONF_CFLAGS} \
  ${GLIB_CFLAGS}

 libgncmod_gnome_search_la_SOURCES = \
@ -54,7 +54,7 @@ libgncmod_gnome_search_la_LIBADD = \
  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
  ${GUILE_LIBS} \
-  ${GNOME_LIBS} \
+  ${GCONF_LIBS} \
  ${GLADE_LIBS} \
  ${GLIB_LIBS} \
  ${REGEX_LIBS}
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@ -18,6 +18,7 @@ AM_CPPFLAGS = \
  ${GLADE_CFLAGS} \
  ${GTK_CFLAGS} \
  ${GNOME_CFLAGS} \
+  ${GCONF_CFLAGS} \
  ${GNOME_KEYRING_CFLAGS} \
  ${GUILE_INCS} \
  ${QOF_CFLAGS} \
@ -201,6 +202,7 @@ libgncmod_gnome_utils_la_LIBADD = \
  $(top_builddir)/lib/libc/libc-missing.la \
  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
  ${GNOME_LIBS} \
+  ${GCONF_LIBS} \
  ${GNOME_KEYRING_LIBS} \
  ${GLADE_LIBS} \
  ${GUILE_LIBS} \
--- a/src/gnome-utils/dialog-userpass.c
+++ b/src/gnome-utils/dialog-userpass.c
@ -22,9 +22,6 @@
 \********************************************************************/

 #include "config.h"
-
-#include <gnome.h>
-
 #include "dialog-utils.h"
 #include "gnc-ui.h"

--- a/src/gnome-utils/druid-utils.c
+++ b/src/gnome-utils/druid-utils.c
@ -24,7 +24,8 @@

 #include "config.h"

-#include <gnome.h>
+#include <libgnomeui/gnome-druid-page-edge.h>
+#include <libgnomeui/gnome-druid-page-standard.h>

 #include "dialog-utils.h"
 #include "druid-utils.h"
--- a/src/gnome-utils/gnc-gnome-utils.h
+++ b/src/gnome-utils/gnc-gnome-utils.h
@ -35,7 +35,6 @@
 #ifndef GNC_GNOME_UTILS_H
 #define GNC_GNOME_UTILS_H

-#include <libgnome/libgnome.h>
 #include <gnc-main-window.h>

 /** Initialize the Gnome libraries. */
--- a/src/gnome-utils/test/Makefile.am
+++ b/src/gnome-utils/test/Makefile.am
@ -48,7 +48,6 @@ INCLUDES= \
  -I${top_srcdir}/src/libqof/qof \
  ${GLIB_CFLAGS} \
  ${GUILE_INCS} \
-  ${GNOME_CFLAGS} \
  ${GLADE_CFLAGS}

 LDADD = \
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@ -19,6 +19,7 @@ libgnc_gnome_la_LIBADD = \
  ${GLADE_LIBS} \
  ${GUILE_LIBS} \
  ${GNOME_LIBS} \
+  ${GCONF_LIBS} \
  ${GLIB_LIBS} \
  ${QOF_LIBS}

@ -121,6 +122,7 @@ AM_CPPFLAGS = \
  -I${top_srcdir}/src/libqof/qof \
  ${GUILE_INCS} \
  ${GNOME_CFLAGS} \
+  ${GCONF_CFLAGS} \
  ${GLADE_CFLAGS} \
  $(GLIB_CFLAGS) \
  ${GTK_MAC_CFLAGS}
--- a/src/gnome/assistant-loan.c
+++ b/src/gnome/assistant-loan.c
@ -24,7 +24,6 @@
 \********************************************************************/

 #include "config.h"
-#include <gnome.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <string.h>
--- a/src/gnome/gnc-plugin-page-budget.c
+++ b/src/gnome/gnc-plugin-page-budget.c
@ -35,6 +35,10 @@
 #include "config.h"

 #include <gtk/gtk.h>
+#ifdef __G_IR_SCANNER__
+#undef __G_IR_SCANNER__
+#endif
+#include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <glade/glade.h>
 #include "gnc-date-edit.h"
--- a/src/gnome/window-reconcile.c
+++ b/src/gnome/window-reconcile.c
@ -32,6 +32,10 @@

 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
+#ifdef __G_IR_SCANNER__
+#undef __G_IR_SCANNER__
+#endif
+#include <gdk/gdkkeysyms.h>

 #include "Scrub.h"
 #include "Scrub3.h"
--- a/src/import-export/Makefile.am
+++ b/src/import-export/Makefile.am
@ -46,7 +46,7 @@ libgncmod_generic_import_la_LIBADD = \
  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
  ${top_builddir}/src/gnc-module/libgnc-module.la \
  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-  ${GNOME_LIBS} \
+  ${GCONF_LIBS} \
  ${GLADE_LIBS} \
  ${REGEX_LIBS} \
  ${GLIB_LIBS}
@ -63,7 +63,7 @@ AM_CPPFLAGS = \
  -I${top_srcdir}/src/gnome \
  -I${top_srcdir}/src/gnome-utils \
  -I${top_srcdir}/src/libqof/qof \
-  ${GNOME_CFLAGS} \
+  ${GCONF_CFLAGS} \
  ${GLADE_CFLAGS} \
  ${GUILE_INCS} \
  ${GLIB_CFLAGS}
--- a/src/import-export/aqbanking/Makefile.am
+++ b/src/import-export/aqbanking/Makefile.am
@ -43,6 +43,7 @@ libgncmod_aqbanking_la_LIBADD = \
  ${top_builddir}/src/gnc-module/libgnc-module.la \
  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
  ${GNOME_LIBS} \
+  ${GCONF_LIBS} \
  ${GLADE_LIBS} \
  ${GLIB_LIBS} \
  ${GWENGUI_GTK2_LIBS} \
@ -62,6 +63,7 @@ AM_CFLAGS = \
  -I${top_srcdir}/src/gnc-module \
  -I${top_srcdir}/src/libqof/qof \
  ${GNOME_CFLAGS} \
+  ${GCONF_CFLAGS} \
  ${GLADE_CFLAGS} \
  ${GLIB_CFLAGS} \
  ${AQBANKING_CFLAGS}
--- a/src/import-export/csv/Makefile.am
+++ b/src/import-export/csv/Makefile.am
@ -42,7 +42,7 @@ AM_CPPFLAGS = \
  -I${top_srcdir}/src/libqof/qof \
  -I${top_srcdir}/lib/libc \
  -I${top_srcdir}/lib \
-  ${GNOME_CFLAGS} \
+  ${GCONF_CFLAGS} \
  ${GLADE_CFLAGS} \
  ${GUILE_INCS} \
  ${GLIB_CFLAGS} \
--- a/src/import-export/log-replay/Makefile.am
+++ b/src/import-export/log-replay/Makefile.am
@ -34,7 +34,7 @@ AM_CPPFLAGS = \
  -I${top_srcdir}/src/gnome-utils \
  -I${top_srcdir}/src/import-export \
  -I${top_srcdir}/src/libqof/qof \
-  ${GNOME_CFLAGS} \
+  ${GCONF_CFLAGS} \
  ${GLADE_CFLAGS} \
  ${GUILE_INCS} \
  ${GLIB_CFLAGS}
--- a/src/import-export/ofx/Makefile.am
+++ b/src/import-export/ofx/Makefile.am
@ -36,7 +36,7 @@ AM_CPPFLAGS = \
  -I${top_srcdir}/src/gnome-utils \
  -I${top_srcdir}/src/import-export \
  -I${top_srcdir}/src/libqof/qof \
-  ${GNOME_CFLAGS} \
+  ${GCONF_CFLAGS} \
  ${GLADE_CFLAGS} \
  ${GUILE_INCS} \
  ${GLIB_CFLAGS} \
--- a/src/import-export/qif-import/Makefile.am
+++ b/src/import-export/qif-import/Makefile.am
@ -25,7 +25,7 @@ libgncmod_qif_import_la_LIBADD = \
  ${top_builddir}/src/gnc-module/libgnc-module.la \
  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
  ${GUILE_LIBS} \
-  ${GNOME_LIBS} \
+  ${GCONF_LIBS} \
  ${GLADE_LIBS} \
  ${GLIB_LIBS}

@ -65,7 +65,7 @@ AM_CPPFLAGS = \
  ${GUILE_INCS} \
  ${GLIB_CFLAGS} \
  ${GLADE_CFLAGS} \
-  ${GNOME_CFLAGS} 
+  ${GCONF_CFLAGS} 

 uidir = $(GNC_UI_DIR)
 ui_DATA = \
--- a/src/optional/gtkmm/Makefile.am
+++ b/src/optional/gtkmm/Makefile.am
@ -42,7 +42,7 @@ libgncmod_gtkmm_la_LIBADD = \
  ${top_builddir}/src/gnc-module/libgnc-module.la \
  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
  ${GTKMM_LIBS} \
-  ${GNOME_LIBS} \
+  ${GCONF_LIBS} \
  ${GLADE_LIBS} \
  ${GLIB_LIBS}

@ -53,7 +53,7 @@ AM_CPPFLAGS = \
  -I${top_srcdir}/src/core-utils \
  -I${top_srcdir}/src/engine \
  ${GTKMM_CFLAGS} \
-  ${GNOME_CFLAGS} \
+  ${GCONF_CFLAGS} \
  ${GLADE_CFLAGS} \
  ${GLIB_CFLAGS}

--- a/src/optional/gtkmm/test/Makefile.am
+++ b/src/optional/gtkmm/test/Makefile.am
@ -24,7 +24,6 @@ noinst_PROGRAMS = ${TEST_PROGS}
 test_gtkmm_LDADD = ${top_builddir}/${MODULEPATH}/libgncmod-gtkmm.la \
  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
  ${GTKMM_LIBS} \
-  ${GNOME_LIBS} \
  ${GLADE_LIBS} \
  ${GLIB_LIBS}

@ -39,6 +38,5 @@ AM_CPPFLAGS = \
  -I${top_srcdir}/src/engine \
  -I${top_srcdir}/src/optional/gtkmm \
  ${GTKMM_CFLAGS} \
-  ${GNOME_CFLAGS} \
  ${GLADE_CFLAGS} \
  ${GLIB_CFLAGS}
--- a/src/optional/python-bindings/Makefile.am
+++ b/src/optional/python-bindings/Makefile.am
@ -17,7 +17,6 @@ _gnucash_core_c_la_SOURCES = \
 _gnucash_core_c_la_CPPFLAGS = \
  $(PYTHON_CPPFLAGS) \
  $(GLIB_CFLAGS) \
-  $(GNOME_CFLAGS) \
  -I${top_srcdir}/src/libqof/qof \
  -I$(top_srcdir)/src  \
  -I$(top_srcdir)/src/engine \
@ -35,7 +34,6 @@ _gnucash_core_c_la_LDFLAGS = -avoid-version -module

 _gnucash_core_c_la_LIBADD = \
  ${GLIB_LIBS} \
-  ${GNOME_LIBS} \
  ${GLADE_LIBS} \
  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
  ${top_builddir}/src/gnc-module/libgnc-module.la \
--- a/src/plugins/bi_import/Makefile.am
+++ b/src/plugins/bi_import/Makefile.am
@ -26,7 +26,7 @@ libgncmod_bi_import_la_LIBADD = \
  ${top_builddir}/src/gnc-module/libgnc-module.la \
  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
  ${top_builddir}/lib/libc/libc-missing.la \
-  ${GNOME_LIBS} \
+  ${GCONF_LIBS} \
  ${GLADE_LIBS} \
  ${QOF_LIBS} \
  ${GLIB_LIBS}
@ -49,7 +49,7 @@ AM_CFLAGS = \
  -I${top_srcdir}/src/core-utils \
  -I${top_srcdir}/src/gnc-module \
  -I${top_srcdir}/lib/libc \
-  ${GNOME_CFLAGS} \
+  ${GCONF_CFLAGS} \
  ${GLADE_CFLAGS} \
  ${QOF_CFLAGS} \
  ${GLIB_CFLAGS}
--- a/src/register/ledger-core/Makefile.am
+++ b/src/register/ledger-core/Makefile.am
@ -51,7 +51,7 @@ AM_CPPFLAGS = \
  -I${top_srcdir}/src/libqof/qof \
  ${GUILE_INCS} \
  ${GLADE_CFLAGS} \
-  ${GNOME_CFLAGS} \
+  ${GCONF_CFLAGS} \
  ${GLIB_CFLAGS}


--- a/src/register/register-core/Makefile.am
+++ b/src/register/register-core/Makefile.am
@ -63,7 +63,6 @@ AM_CPPFLAGS = \
  -I${top_srcdir}/src/libqof/qof \
  ${GUILE_INCS} \
  ${GLADE_CFLAGS} \
-  ${GNOME_CFLAGS} \
  ${GLIB_CFLAGS}

 CLEANFILES = $(BUILT_SOURCES)
--- a/src/register/register-gnome/gnucash-sheet.h
+++ b/src/register/register-gnome/gnucash-sheet.h
@ -21,7 +21,7 @@
 #ifndef GNUCASH_SHEET_H
 #define GNUCASH_SHEET_H

-#include <gnome.h>
+#include <libgnomecanvas/gnome-canvas.h>

 #include "split-register-model.h"

--- a/src/report/report-gnome/Makefile.am
+++ b/src/report/report-gnome/Makefile.am
@ -16,7 +16,7 @@ AM_CPPFLAGS = \
  -I${top_srcdir}/src/libqof/qof \
  ${GLADE_CFLAGS} \
  ${GUILE_INCS} \
-  ${GNOME_CFLAGS} \
+  ${GCONF_CFLAGS} \
  ${GLIB_CFLAGS}

 libgncmod_report_gnome_la_SOURCES = \
@ -49,7 +49,7 @@ libgncmod_report_gnome_la_LIBADD = \
  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
  ${GLADE_LIBS} \
  ${GUILE_LIBS} \
-  ${GNOME_LIBS} \
+  ${GCONF_LIBS} \
  ${GLIB_LIBS}

 if BUILDING_FROM_SVN
--- a/src/report/report-gnome/window-report.c
+++ b/src/report/report-gnome/window-report.c
@ -27,7 +27,6 @@

 #include "config.h"

-#include <gnome.h>
 #include <glib/gi18n.h>
 #include <errno.h>
 #include <libguile.h>
--- a/src/report/stylesheets/Makefile.am
+++ b/src/report/stylesheets/Makefile.am
@ -18,6 +18,7 @@ libgncmod_stylesheets_la_LIBADD = \
  ${top_builddir}/src/gnc-module/libgnc-module.la \
  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
  ${GUILE_LIBS} \
+  ${GTK_LIBS} \
  ${GLIB_LIBS}

 AM_CPPFLAGS = \
@ -30,7 +31,8 @@ AM_CPPFLAGS = \
  -I${top_srcdir}/src/libqof/qof \
  ${GUILE_INCS} \
  ${GLIB_CFLAGS} \
-  ${GNOME_CFLAGS}
+  ${GTK_CFLAGS} \
+  ${GCONF_CFLAGS}

 gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
 gncscmmod_DATA = \