r18008 - gnucash/branches/webkit/src - Remove unnecessary references to GTKHTML_CFLAGS and GTKHTML_LIBS. Since these modules

Phil Longstaff plongstaff at code.gnucash.org
Mon Mar 30 19:28:39 EDT 2009 

Author: plongstaff
Date: 2009-03-30 19:28:39 -0400 (Mon, 30 Mar 2009)
New Revision: 18008
Trac: http://svn.gnucash.org/trac/changeset/18008

Modified:
   gnucash/branches/webkit/src/business/business-gnome/Makefile.am
   gnucash/branches/webkit/src/business/dialog-tax-table/Makefile.am
   gnucash/branches/webkit/src/gnome-search/Makefile.am
   gnucash/branches/webkit/src/gnome-utils/Makefile.am
   gnucash/branches/webkit/src/gnome/Makefile.am
   gnucash/branches/webkit/src/html/Makefile.am
   gnucash/branches/webkit/src/import-export/Makefile.am
   gnucash/branches/webkit/src/import-export/csv/Makefile.am
   gnucash/branches/webkit/src/import-export/hbci/Makefile.am
   gnucash/branches/webkit/src/import-export/log-replay/Makefile.am
   gnucash/branches/webkit/src/import-export/ofx/Makefile.am
   gnucash/branches/webkit/src/import-export/qif-import/Makefile.am
   gnucash/branches/webkit/src/report/report-gnome/Makefile.am
Log:
Remove unnecessary references to GTKHTML_CFLAGS and GTKHTML_LIBS.  Since these modules
don't use any gtkhtml files or library routines, they don't need to use the symbols.



Modified: gnucash/branches/webkit/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/branches/webkit/src/business/business-gnome/Makefile.am	2009-03-30 23:02:28 UTC (rev 18007)
+++ gnucash/branches/webkit/src/business/business-gnome/Makefile.am	2009-03-30 23:28:39 UTC (rev 18008)
@@ -23,7 +23,6 @@
   ${QOF_CFLAGS} \
   ${GNOME_CFLAGS} \
   ${GLADE_CFLAGS} \
-  ${GTKHTML_CFLAGS} \
   ${GDK_PIXBUF_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${GUILE_INCS}

Modified: gnucash/branches/webkit/src/business/dialog-tax-table/Makefile.am
===================================================================
--- gnucash/branches/webkit/src/business/dialog-tax-table/Makefile.am	2009-03-30 23:02:28 UTC (rev 18007)
+++ gnucash/branches/webkit/src/business/dialog-tax-table/Makefile.am	2009-03-30 23:28:39 UTC (rev 18008)
@@ -11,7 +11,6 @@
   ${QOF_CFLAGS} \
   ${GNOME_CFLAGS} \
   ${GLADE_CFLAGS} \
-  ${GTKHTML_CFLAGS} \
   ${GDK_PIXBUF_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${GUILE_INCS}

Modified: gnucash/branches/webkit/src/gnome/Makefile.am
===================================================================
--- gnucash/branches/webkit/src/gnome/Makefile.am	2009-03-30 23:02:28 UTC (rev 18007)
+++ gnucash/branches/webkit/src/gnome/Makefile.am	2009-03-30 23:28:39 UTC (rev 18008)
@@ -121,7 +121,6 @@
   ${GUILE_INCS} \
   ${GNOME_CFLAGS} \
   ${GDK_PIXBUF_CFLAGS} \
-  ${GTKHTML_CFLAGS} \
   ${GLADE_CFLAGS} \
   $(GLIB_CFLAGS)
 

Modified: gnucash/branches/webkit/src/gnome-search/Makefile.am
===================================================================
--- gnucash/branches/webkit/src/gnome-search/Makefile.am	2009-03-30 23:02:28 UTC (rev 18007)
+++ gnucash/branches/webkit/src/gnome-search/Makefile.am	2009-03-30 23:28:39 UTC (rev 18008)
@@ -10,7 +10,6 @@
   -I${top_srcdir}/src/business/business-core \
   ${QOF_CFLAGS} \
   ${GUILE_INCS} \
-  ${GTKHTML_CFLAGS} \
   ${GDK_PIXBUF_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GNOME_CFLAGS} \
@@ -57,7 +56,6 @@
   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
   ${GUILE_LIBS} \
   ${GNOME_LIBS} \
-  ${GTKHTML_LIBS} \
   ${GLADE_LIBS} \
   ${GLIB_LIBS} \
   ${REGEX_LIBS} \

Modified: gnucash/branches/webkit/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/branches/webkit/src/gnome-utils/Makefile.am	2009-03-30 23:02:28 UTC (rev 18007)
+++ gnucash/branches/webkit/src/gnome-utils/Makefile.am	2009-03-30 23:28:39 UTC (rev 18008)
@@ -210,11 +210,6 @@
   ${gncmod_DATA} \
   ${gncscm_DATA}
 
-if !GTKHTML_USES_GTKPRINT
-  AM_CPPFLAGS += ${GNOME_PRINT_CFLAGS}
-  libgncmod_gnome_utils_la_LIBADD += ${GNOME_PRINT_LIBS}
-endif
-
 ## We borrow guile's convention and use @-...-@ as the substitution
 ## brackets here, instead of the usual @... at .  This prevents autoconf
 ## from substituting the values directly into the left-hand sides of

Modified: gnucash/branches/webkit/src/html/Makefile.am
===================================================================
--- gnucash/branches/webkit/src/html/Makefile.am	2009-03-30 23:02:28 UTC (rev 18007)
+++ gnucash/branches/webkit/src/html/Makefile.am	2009-03-30 23:28:39 UTC (rev 18008)
@@ -104,8 +104,14 @@
   ${QOF_LIBS} \
   ${GOFFICE_LIBS} \
   ${REGEX_LIBS}
+
+if !GTKHTML_USES_GTKPRINT
+  AM_CPPFLAGS += ${GNOME_PRINT_CFLAGS}
+  libgncmod_html_la_LIBADD += ${GNOME_PRINT_LIBS}
 endif
 
+endif
+
 if BUILDING_FROM_SVN
 swig-gnc-html.c: gnc-html.i gnc-html.h \
                     ${top_srcdir}/src/base-typemaps.i

Modified: gnucash/branches/webkit/src/import-export/Makefile.am
===================================================================
--- gnucash/branches/webkit/src/import-export/Makefile.am	2009-03-30 23:02:28 UTC (rev 18007)
+++ gnucash/branches/webkit/src/import-export/Makefile.am	2009-03-30 23:28:39 UTC (rev 18008)
@@ -68,7 +68,6 @@
   -I${top_srcdir}/src/gnome-utils \
   ${QOF_CFLAGS} \
   ${GNOME_CFLAGS} \
-  ${GTKHTML_CFLAGS} \
   ${GDK_PIXBUF_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GUILE_INCS} \

Modified: gnucash/branches/webkit/src/import-export/csv/Makefile.am
===================================================================
--- gnucash/branches/webkit/src/import-export/csv/Makefile.am	2009-03-30 23:02:28 UTC (rev 18007)
+++ gnucash/branches/webkit/src/import-export/csv/Makefile.am	2009-03-30 23:28:39 UTC (rev 18008)
@@ -43,7 +43,6 @@
   -I${top_srcdir}/lib \
   ${QOF_CFLAGS} \
   ${GNOME_CFLAGS} \
-  ${GTKHTML_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS} \

Modified: gnucash/branches/webkit/src/import-export/hbci/Makefile.am
===================================================================
--- gnucash/branches/webkit/src/import-export/hbci/Makefile.am	2009-03-30 23:02:28 UTC (rev 18007)
+++ gnucash/branches/webkit/src/import-export/hbci/Makefile.am	2009-03-30 23:28:39 UTC (rev 18008)
@@ -74,7 +74,6 @@
   ${QOF_CFLAGS} \
   ${GUILE_INCS} \
   ${GNOME_CFLAGS} \
-  ${GTKHTML_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${AQBANKING_CFLAGS}

Modified: gnucash/branches/webkit/src/import-export/log-replay/Makefile.am
===================================================================
--- gnucash/branches/webkit/src/import-export/log-replay/Makefile.am	2009-03-30 23:02:28 UTC (rev 18007)
+++ gnucash/branches/webkit/src/import-export/log-replay/Makefile.am	2009-03-30 23:28:39 UTC (rev 18008)
@@ -33,7 +33,6 @@
   -I${top_srcdir}/src/import-export \
   ${QOF_CFLAGS} \
   ${GNOME_CFLAGS} \
-  ${GTKHTML_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS}

Modified: gnucash/branches/webkit/src/import-export/ofx/Makefile.am
===================================================================
--- gnucash/branches/webkit/src/import-export/ofx/Makefile.am	2009-03-30 23:02:28 UTC (rev 18007)
+++ gnucash/branches/webkit/src/import-export/ofx/Makefile.am	2009-03-30 23:28:39 UTC (rev 18008)
@@ -35,7 +35,6 @@
   -I${top_srcdir}/src/import-export \
   ${QOF_CFLAGS} \
   ${GNOME_CFLAGS} \
-  ${GTKHTML_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS} \

Modified: gnucash/branches/webkit/src/import-export/qif-import/Makefile.am
===================================================================
--- gnucash/branches/webkit/src/import-export/qif-import/Makefile.am	2009-03-30 23:02:28 UTC (rev 18007)
+++ gnucash/branches/webkit/src/import-export/qif-import/Makefile.am	2009-03-30 23:28:39 UTC (rev 18008)
@@ -66,8 +66,7 @@
   ${GLIB_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GNOME_CFLAGS} \
-  ${GDK_PIXBUF_CFLAGS} \
-  ${GTKHTML_CFLAGS}
+  ${GDK_PIXBUF_CFLAGS}
 
 uidir = $(GNC_UI_DIR)
 ui_DATA = \

Modified: gnucash/branches/webkit/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/branches/webkit/src/report/report-gnome/Makefile.am	2009-03-30 23:02:28 UTC (rev 18007)
+++ gnucash/branches/webkit/src/report/report-gnome/Makefile.am	2009-03-30 23:28:39 UTC (rev 18008)
@@ -16,7 +16,6 @@
   ${QOF_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GUILE_INCS} \
-  ${GTKHTML_CFLAGS} \
   ${GNOME_CFLAGS} \
   ${GLIB_CFLAGS}

More information about the gnucash-changes mailing list