r18013 - gnucash/branches/webkit/src - Clean up after win32 build - remove some unneeded #include lines and CFLAGS/LIBS, and added
Phil Longstaff
plongstaff at code.gnucash.org
Sat Apr 4 13:35:54 EDT 2009
Author: plongstaff
Date: 2009-04-04 13:35:54 -0400 (Sat, 04 Apr 2009)
New Revision: 18013
Trac: http://svn.gnucash.org/trac/changeset/18013
Added:
gnucash/branches/webkit/src/html/gncmod-html.c
Modified:
gnucash/branches/webkit/src/business/business-gnome/Makefile.am
gnucash/branches/webkit/src/gnome-utils/Makefile.am
gnucash/branches/webkit/src/gnome-utils/gnc-main-window.c
gnucash/branches/webkit/src/gnome-utils/gncmod-gnome-utils.c
gnucash/branches/webkit/src/gnome/Makefile.am
gnucash/branches/webkit/src/html/Makefile.am
gnucash/branches/webkit/src/html/gnc-html-graph-gog.c
gnucash/branches/webkit/src/html/gnc-html-webkit.c
gnucash/branches/webkit/src/html/gnc-html.c
gnucash/branches/webkit/src/import-export/hbci/druid-hbci-initial.c
Log:
Clean up after win32 build - remove some unneeded #include lines and CFLAGS/LIBS, and added
other needed ones.
Modified: gnucash/branches/webkit/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/branches/webkit/src/business/business-gnome/Makefile.am 2009-04-02 00:34:11 UTC (rev 18012)
+++ gnucash/branches/webkit/src/business/business-gnome/Makefile.am 2009-04-04 17:35:54 UTC (rev 18013)
@@ -75,6 +75,7 @@
${top_builddir}/src/gnome-search/libgncmod-gnome-search.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
+ ${top_builddir}/src/html/libgncmod-html.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/core-utils/libgnc-core-utils.la \
${top_builddir}/src/gnc-module/libgnc-module.la \
Modified: gnucash/branches/webkit/src/gnome/Makefile.am
===================================================================
--- gnucash/branches/webkit/src/gnome/Makefile.am 2009-04-02 00:34:11 UTC (rev 18012)
+++ gnucash/branches/webkit/src/gnome/Makefile.am 2009-04-04 17:35:54 UTC (rev 18013)
@@ -12,6 +12,7 @@
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/backend/file/libgnc-backend-xml-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
+ ${top_builddir}/src/html/libgncmod-html.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/calculation/libgncmod-calculation.la \
${top_builddir}/src/core-utils/libgnc-core-utils.la \
@@ -123,6 +124,7 @@
${QOF_CFLAGS} \
${GUILE_INCS} \
${GNOME_CFLAGS} \
+ ${GNOME_PRINT_CFLAGS} \
${GLADE_CFLAGS} \
$(GLIB_CFLAGS)
Modified: gnucash/branches/webkit/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/branches/webkit/src/gnome-utils/Makefile.am 2009-04-02 00:34:11 UTC (rev 18012)
+++ gnucash/branches/webkit/src/gnome-utils/Makefile.am 2009-04-04 17:35:54 UTC (rev 18013)
@@ -10,7 +10,6 @@
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/backend/file \
-I${top_srcdir}/src/app-utils \
- -I${top_srcdir}/src/html \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/lib/libc \
@@ -18,6 +17,7 @@
${GLADE_CFLAGS} \
${GTK_CFLAGS} \
${GNOME_CFLAGS} \
+ ${GNOME_PRINT_CFLAGS} \
${GUILE_INCS} \
${QOF_CFLAGS}
@@ -179,7 +179,7 @@
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
$(top_builddir)/lib/libc/libc-missing.la \
${GNOME_LIBS} \
- ${GUILE_LIBS} \
+ ${GNOME_PRINT_LIBS} \
${GLADE_LIBS} \
${GUILE_LIBS} \
${GLIB_LIBS} \
Modified: gnucash/branches/webkit/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/branches/webkit/src/gnome-utils/gnc-main-window.c 2009-04-02 00:34:11 UTC (rev 18012)
+++ gnucash/branches/webkit/src/gnome-utils/gnc-main-window.c 2009-04-04 17:35:54 UTC (rev 18013)
@@ -65,7 +65,7 @@
#include "gnc-main.h"
#include "gnc-gconf-utils.h"
// +JSLED
-#include "gnc-html.h"
+//#include "gnc-html.h"
#include "gnc-autosave.h"
#ifdef HAVE_GTK_2_10
# include "print-session.h"
Modified: gnucash/branches/webkit/src/gnome-utils/gncmod-gnome-utils.c
===================================================================
--- gnucash/branches/webkit/src/gnome-utils/gncmod-gnome-utils.c 2009-04-02 00:34:11 UTC (rev 18012)
+++ gnucash/branches/webkit/src/gnome-utils/gncmod-gnome-utils.c 2009-04-04 17:35:54 UTC (rev 18013)
@@ -14,7 +14,6 @@
#include "gnc-module-api.h"
#include "dialog-options.h"
-#include "gnc-html.h"
#include "qof.h"
#include "gnc-gui-query.h"
@@ -77,7 +76,6 @@
/* Initialize the options-ui database */
if (refcount == 0) {
gnc_options_ui_initialize ();
- gnc_html_initialize ();
/* register the druid pieces */
gnc_druid_gnome_register();
Modified: gnucash/branches/webkit/src/html/Makefile.am
===================================================================
--- gnucash/branches/webkit/src/html/Makefile.am 2009-04-02 00:34:11 UTC (rev 18012)
+++ gnucash/branches/webkit/src/html/Makefile.am 2009-04-04 17:35:54 UTC (rev 18013)
@@ -3,31 +3,12 @@
pkglib_LTLIBRARIES = libgncmod-html.la
-if HTML_USING_WEBKIT
AM_CPPFLAGS = \
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/engine \
- -I${top_srcdir}/src/backend/file \
- -I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/gnome-utils \
- -I${top_srcdir}/src \
- -I${top_builddir}/src \
- -I${top_srcdir}/lib/libc \
- ${QOF_CFLAGS} \
- ${GLIB_CFLAGS} \
- ${GTK_CFLAGS} \
- ${GNOME_CFLAGS} \
- ${GOFFICE_CFLAGS} \
- ${WEBKIT_CFLAGS}
-else
-AM_CPPFLAGS = \
- -I${top_srcdir}/src/core-utils \
- -I${top_srcdir}/src/gnc-module \
- -I${top_srcdir}/src/engine \
- -I${top_srcdir}/src/backend/file \
-I${top_srcdir}/src/app-utils \
- -I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/lib/libc \
@@ -35,31 +16,15 @@
${GLIB_CFLAGS} \
${GTK_CFLAGS} \
${GNOME_CFLAGS} \
- ${GTKHTML_CFLAGS} \
${GOFFICE_CFLAGS}
-endif
-if HTML_USING_WEBKIT
libgncmod_html_la_SOURCES = \
gncmod-html.c \
gnc-html.c \
gnc-html-history.c \
gnc-html-graph-gog.c \
- gnc-html-webkit.c \
- gnc-html-graph-gog-webkit.c \
gnc-html-factory.c \
swig-gnc-html.c
-else
-libgncmod_html_la_SOURCES = \
- gncmod-html.c \
- gnc-html.c \
- gnc-html-history.c \
- gnc-html-gtkhtml.c \
- gnc-html-graph-gog.c \
- gnc-html-graph-gog-gtkhtml.c \
- gnc-html-factory.c \
- swig-gnc-html.c
-endif
gncincludedir = ${GNC_INCLUDE_DIR}
gncinclude_HEADERS = \
@@ -70,13 +35,12 @@
libgncmod_html_la_LDFLAGS = -avoid-version
-if HTML_USING_WEBKIT
libgncmod_html_la_LIBADD = \
${top_builddir}/src/core-utils/libgnc-core-utils.la \
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/backend/file/libgnc-backend-xml-utils.la \
${top_builddir}/src/calculation/libgncmod-calculation.la \
+ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
$(top_builddir)/lib/libc/libc-missing.la \
${GNOME_LIBS} \
@@ -85,25 +49,23 @@
${DB_LIBS} \
${QOF_LIBS} \
${GOFFICE_LIBS} \
- ${REGEX_LIBS} \
+ ${GUILE_LIBS} \
+ ${REGEX_LIBS}
+
+if HTML_USING_WEBKIT
+AM_CPPFLAGS += ${WEBKIT_CFLAGS}
+libgncmod_html_la_SOURCES += \
+ gnc-html-webkit.c \
+ gnc-html-graph-gog-webkit.c
+libgncmod_html_la_LIBADD += \
${WEBKIT_LIBS}
else
-libgncmod_html_la_LIBADD = \
- ${top_builddir}/src/core-utils/libgnc-core-utils.la \
- ${top_builddir}/src/gnc-module/libgnc-module.la \
- ${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/backend/file/libgnc-backend-xml-utils.la \
- ${top_builddir}/src/calculation/libgncmod-calculation.la \
- ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
- $(top_builddir)/lib/libc/libc-missing.la \
- ${GNOME_LIBS} \
- ${GTKHTML_LIBS} \
- ${GDK_PIXBUF_LIBS} \
- ${GLIB_LIBS} \
- ${DB_LIBS} \
- ${QOF_LIBS} \
- ${GOFFICE_LIBS} \
- ${REGEX_LIBS}
+AM_CPPFLAGS += ${GTKHTML_CFLAGS}
+libgncmod_html_la_SOURCES += \
+ gnc-html-gtkhtml.c \
+ gnc-html-graph-gog-gtkhtml.c
+libgncmod_html_la_LIBADD += \
+ ${GTKHTML_LIBS}
if !GTKHTML_USES_GTKPRINT
AM_CPPFLAGS += ${GNOME_PRINT_CFLAGS}
@@ -128,26 +90,7 @@
libgncmod_html_la_LIBADD += ${GNOME_PRINT_LIBS}
endif
-if GNUCASH_SEPARATE_BUILDDIR
-#For executing test cases
-SCM_FILE_LINKS = \
- ${gncmod_DATA} \
- ${gncscm_DATA}
-endif
-
-.scm-links:
- $(RM) -rf gnucash
- mkdir -p gnucash
-if GNUCASH_SEPARATE_BUILDDIR
- for X in ${SCM_FILE_LINKS} ; do \
- $(LN_S) -f ${srcdir}/$$X . ; \
- done
-endif
- ( cd gnucash; for A in $(gncmod_DATA) ; do $(LN_S) -f ../$$A . ; done )
- touch .scm-links
-
-noinst_DATA = .scm-links
-CLEANFILES = $(BUILT_SOURCES) gnucash .scm-links ${SCM_FILE_LINKS}
+CLEANFILES = $(BUILT_SOURCES) gnucash
MAINTAINERCLEANFILES = swig-html.c
# FIXME: Symlinking directories only works on non-win32.
Modified: gnucash/branches/webkit/src/html/gnc-html-graph-gog.c
===================================================================
--- gnucash/branches/webkit/src/html/gnc-html-graph-gog.c 2009-04-02 00:34:11 UTC (rev 18012)
+++ gnucash/branches/webkit/src/html/gnc-html-graph-gog.c 2009-04-04 17:35:54 UTC (rev 18013)
@@ -26,7 +26,6 @@
#include <gtk/gtk.h>
#include <string.h>
-#include "gnc-ui-util.h"
#include "gnc-html-graph-gog.h"
#include "gnc-html.h"
#include "gnc-engine.h"
Modified: gnucash/branches/webkit/src/html/gnc-html-webkit.c
===================================================================
--- gnucash/branches/webkit/src/html/gnc-html-webkit.c 2009-04-02 00:34:11 UTC (rev 18012)
+++ gnucash/branches/webkit/src/html/gnc-html-webkit.c 2009-04-04 17:35:54 UTC (rev 18013)
@@ -42,14 +42,12 @@
#include <webkit/webkit.h>
#include "Account.h"
-#include "gnc-engine.h"
#include "gnc-gui-query.h"
+#include "gnc-engine.h"
#include "gnc-html.h"
#include "gnc-html-webkit.h"
#include "gnc-html-history.h"
#include "gnc-html-graph-gog-webkit.h"
-#include "gnc-ui.h"
-#include "gnc-ui-util.h"
G_DEFINE_TYPE(GncHtmlWebkit, gnc_html_webkit, GNC_TYPE_HTML )
Modified: gnucash/branches/webkit/src/html/gnc-html.c
===================================================================
--- gnucash/branches/webkit/src/html/gnc-html.c 2009-04-02 00:34:11 UTC (rev 18012)
+++ gnucash/branches/webkit/src/html/gnc-html.c 2009-04-04 17:35:54 UTC (rev 18013)
@@ -43,11 +43,8 @@
#include "Account.h"
#include "print-session.h"
#include "gnc-engine.h"
-#include "gnc-gui-query.h"
#include "gnc-html.h"
#include "gnc-html-history.h"
-#include "gnc-ui.h"
-#include "gnc-ui-util.h"
/* indicates the debugging module that this .o belongs to. */
static QofLogModule log_module = GNC_MOD_HTML;
Added: gnucash/branches/webkit/src/html/gncmod-html.c
===================================================================
--- gnucash/branches/webkit/src/html/gncmod-html.c (rev 0)
+++ gnucash/branches/webkit/src/html/gncmod-html.c 2009-04-04 17:35:54 UTC (rev 18013)
@@ -0,0 +1,81 @@
+/*********************************************************************
+ * gncmod-html.c
+ * module definition/initialization for the html utilities
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
+ *********************************************************************/
+
+#include "config.h"
+
+#include <gmodule.h>
+#include <libguile.h>
+#include <gtk/gtk.h>
+
+#include "gnc-module.h"
+#include "gnc-module-api.h"
+
+#include "gnc-html.h"
+#include "qof.h"
+
+GNC_MODULE_API_DECL(libgncmod_html)
+
+/* version of the gnc module system interface we require */
+int libgncmod_html_gnc_module_system_interface = 0;
+
+/* module versioning uses libtool semantics. */
+int libgncmod_html_gnc_module_current = 0;
+int libgncmod_html_gnc_module_revision = 0;
+int libgncmod_html_gnc_module_age = 0;
+
+
+char *
+libgncmod_html_gnc_module_path( void )
+{
+ return g_strdup( "gnucash/html" );
+}
+
+char *
+libgncmod_html_gnc_module_description( void )
+{
+ return g_strdup( "Utilities for using HTML with GnuCash" );
+}
+
+static void
+lmod( char* mn )
+{
+ char* form = g_strdup_printf( "(use-modules %s)\n", mn );
+ scm_c_eval_string( form );
+ g_free( form );
+}
+
+extern SCM scm_init_sw_gnc_html_module( void );
+
+int
+libgncmod_html_gnc_module_init( int refcount )
+{
+ /* load the engine (we depend on it) */
+ if( !gnc_module_load( "gnucash/engine", 0 ) ) {
+ return FALSE;
+ }
+
+ /* load the calculation module (we depend on it) */
+ if( !gnc_module_load( "gnucash/calculation", 0 ) ) {
+ return FALSE;
+ }
+
+ if( !gnc_module_load( "gnucash/app-utils", 0 ) ) {
+ return FALSE;
+ }
+
+ scm_init_sw_gnc_html_module();
+ lmod( "(sw_gnc_html)" );
+// lmod( "(gnucash gnc_html)" );
+
+ return TRUE;
+}
+
+int
+libgncmod_html_gnc_module_end( int refcount )
+{
+ return TRUE;
+}
Modified: gnucash/branches/webkit/src/import-export/hbci/druid-hbci-initial.c
===================================================================
--- gnucash/branches/webkit/src/import-export/hbci/druid-hbci-initial.c 2009-04-02 00:34:11 UTC (rev 18012)
+++ gnucash/branches/webkit/src/import-export/hbci/druid-hbci-initial.c 2009-04-04 17:35:54 UTC (rev 18013)
@@ -45,7 +45,7 @@
#include "druid-utils.h"
#include "gnc-ui-util.h"
#include "gnc-ui.h"
-#include "gnc-html.h"
+//#include "gnc-html.h"
//#include "import-account-matcher.h"
#include "gnc-component-manager.h"
#include "gnc-session.h"
More information about the gnucash-changes
mailing list