[Gnucash-changes] r12028 - gnucash/branches/goffice-update - Get
internal goffice build to work again.
Derek Atkins
warlord at cvs.gnucash.org
Fri Nov 25 11:26:14 EST 2005
Author: warlord
Date: 2005-11-25 11:26:12 -0500 (Fri, 25 Nov 2005)
New Revision: 12028
Trac: http://svn.gnucash.org/trac/changeset/12028
Modified:
gnucash/branches/goffice-update/ChangeLog
gnucash/branches/goffice-update/Makefile.am
gnucash/branches/goffice-update/configure.in
gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/Makefile.am
gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/graph/gog-chart.c
gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/graph/gog-object.c
gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/graph/gog-plot.c
gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c
gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/utils/datetime.c
gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/utils/go-libxml-extras.c
gnucash/branches/goffice-update/src/gnome-utils/Makefile.am
Log:
Get internal goffice build to work again.
* src/gnome-utils/Makefile.am:
add GSF_CFLAGS
* lib/goffice-0.0.4/goffice/utils/go-libxml-extras.c
lib/goffice-0.0.4/goffice/utils/datetime.c:
lib/goffice-0.0.4/goffice/graph/gog-chart.c
lib/goffice-0.0.4/goffice/graph/gog-plot.c
lib/goffice-0.0.4/goffice/graph/gog-object.c
lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c:
look for goffice/glib24_26-compat.h
* lib/goffice-0.0.4/goffice/Makefile.am:
don't deal with goffice-features.h anymore
* configure.in:
fix for FC3 dependencies
* Makefile.am:
create goffice -> , symlink when building internal goffice
Modified: gnucash/branches/goffice-update/ChangeLog
===================================================================
--- gnucash/branches/goffice-update/ChangeLog 2005-11-24 06:16:37 UTC (rev 12027)
+++ gnucash/branches/goffice-update/ChangeLog 2005-11-25 16:26:12 UTC (rev 12028)
@@ -1,3 +1,21 @@
+2005-11-25 Derek Atkins <derek at ihtfp.com>
+
+ * src/gnome-utils/Makefile.am:
+ add GSF_CFLAGS
+ * lib/goffice-0.0.4/goffice/utils/go-libxml-extras.c
+ lib/goffice-0.0.4/goffice/utils/datetime.c:
+ lib/goffice-0.0.4/goffice/graph/gog-chart.c
+ lib/goffice-0.0.4/goffice/graph/gog-plot.c
+ lib/goffice-0.0.4/goffice/graph/gog-object.c
+ lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c:
+ look for goffice/glib24_26-compat.h
+ * lib/goffice-0.0.4/goffice/Makefile.am:
+ don't deal with goffice-features.h anymore
+ * configure.in:
+ fix for FC3 dependencies
+ * Makefile.am:
+ create goffice -> , symlink when building internal goffice
+
2005-11-20 Neil Williams <linux at codehelp.co.uk>
* goffice-config.h.in : svn moved from
Modified: gnucash/branches/goffice-update/Makefile.am
===================================================================
--- gnucash/branches/goffice-update/Makefile.am 2005-11-24 06:16:37 UTC (rev 12027)
+++ gnucash/branches/goffice-update/Makefile.am 2005-11-25 16:26:12 UTC (rev 12028)
@@ -1,12 +1,12 @@
-SUBDIRS = doc lib src intl-scm po rpm accounts
+SUBDIRS = . doc lib src intl-scm po rpm accounts
docdir = ${GNC_DOC_INSTALL_DIR}
GNC_CTAGS_FILE = @GNC_CTAGS_FILE@
GNC_ETAGS_FILE = @GNC_ETAGS_FILE@
-noinst_DATA = make-gnucash-patch make-gnucash-potfiles
+noinst_DATA = make-gnucash-patch make-gnucash-potfiles .goffice-links
doc_DATA = \
AUTHORS \
@@ -80,10 +80,19 @@
chmod +x $@.tmp
mv $@.tmp $@
+
+.goffice-links:
+ rm -f goffice
+if !HAVE_GOFFICE
+ ln -sf . goffice
+endif
+ touch .goffice-links
+
DISTCLEANFILES = \
intltool-extract intltool-update intltool-merge\
cscope.files cscope.out etags.files make-gnucash-patch \
- make-gnucash-potfiles po/.intltool-merge-cache
+ make-gnucash-potfiles po/.intltool-merge-cache \
+ goffice .goffice-links
cscope.files:
find . -name '*.[ch]' > cscope.files
Modified: gnucash/branches/goffice-update/configure.in
===================================================================
--- gnucash/branches/goffice-update/configure.in 2005-11-24 06:16:37 UTC (rev 12027)
+++ gnucash/branches/goffice-update/configure.in 2005-11-25 16:26:12 UTC (rev 12028)
@@ -878,7 +878,7 @@
dnl We have to call PKG_PROG_PKG_CONFIG explicitly; otherwise it would
dnl get expanded just before the first occurence of PKG_CHECK_MODULES
dnl and might escape execution.
-PKG_PROG_PKG_CONFIG
+dnl PKG_PROG_PKG_CONFIG
dnl *****************************
# libgsf-1 >= 1.12.2
@@ -896,7 +896,7 @@
goffice_gtk_reqs="
gtk+-2.0 >= 2.4.14
libglade-2.0 >= 2.3.6
- libgnomeprint-2.2 >= 2.8.2
+ libgnomeprint-2.2 >= 2.8.0
libart-2.0 >= 2.3.11
"
goffice_gnome_reqs="
Modified: gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/Makefile.am
===================================================================
--- gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/Makefile.am 2005-11-24 06:16:37 UTC (rev 12027)
+++ gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/Makefile.am 2005-11-25 16:26:12 UTC (rev 12028)
@@ -33,7 +33,6 @@
libgoffice_1_ladir = $(goffice_include_dir)
libgoffice_1_la_HEADERS = \
- goffice-features.h \
goffice.h
if !HAVE_GLIB26
libgoffice_1_la_HEADERS += glib24_26-compat.h
Modified: gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/graph/gog-chart.c
===================================================================
--- gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/graph/gog-chart.c 2005-11-24 06:16:37 UTC (rev 12027)
+++ gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/graph/gog-chart.c 2005-11-25 16:26:12 UTC (rev 12028)
@@ -42,7 +42,7 @@
#include <gtk/gtktogglebutton.h>
#ifndef HAVE_GLIB26
-#include "glib24_26-compat.h"
+#include "goffice/glib24_26-compat.h"
#endif
const struct {
Modified: gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/graph/gog-object.c
===================================================================
--- gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/graph/gog-object.c 2005-11-24 06:16:37 UTC (rev 12027)
+++ gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/graph/gog-object.c 2005-11-25 16:26:12 UTC (rev 12028)
@@ -40,7 +40,7 @@
#include <gtk/gtkwidget.h>
#ifndef HAVE_GLIB26
-#include "glib24_26-compat.h"
+#include "goffice/glib24_26-compat.h"
#endif
GogEditor *
Modified: gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/graph/gog-plot.c
===================================================================
--- gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/graph/gog-plot.c 2005-11-24 06:16:37 UTC (rev 12027)
+++ gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/graph/gog-plot.c 2005-11-25 16:26:12 UTC (rev 12028)
@@ -44,7 +44,7 @@
#include <string.h>
#ifndef HAVE_GLIB26
-#include "glib24_26-compat.h"
+#include "goffice/glib24_26-compat.h"
#endif
#define GOG_PLOT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_PLOT_TYPE, GogPlotClass))
Modified: gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c
===================================================================
--- gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c 2005-11-24 06:16:37 UTC (rev 12027)
+++ gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c 2005-11-25 16:26:12 UTC (rev 12028)
@@ -54,7 +54,7 @@
#endif
#ifndef HAVE_GLIB26
-#include "glib24_26-compat.h"
+#include "goffice/glib24_26-compat.h"
#endif
#define PREVIEW_HSIZE 150
Modified: gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/utils/datetime.c
===================================================================
--- gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/utils/datetime.c 2005-11-24 06:16:37 UTC (rev 12027)
+++ gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/utils/datetime.c 2005-11-25 16:26:12 UTC (rev 12028)
@@ -15,7 +15,7 @@
#include <math.h>
#ifndef HAVE_GLIB26
-#include "glib24_26-compat.h"
+#include "goffice/glib24_26-compat.h"
#endif
#define SECS_PER_DAY (24 * 60 * 60)
Modified: gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/utils/go-libxml-extras.c
===================================================================
--- gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/utils/go-libxml-extras.c 2005-11-24 06:16:37 UTC (rev 12027)
+++ gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/utils/go-libxml-extras.c 2005-11-25 16:26:12 UTC (rev 12028)
@@ -18,7 +18,7 @@
#include <math.h>
#ifndef HAVE_GLIB26
-#include "glib24_26-compat.h"
+#include "goffice/glib24_26-compat.h"
#endif
#define CC2XML(s) ((xmlChar const *)(s))
Modified: gnucash/branches/goffice-update/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/branches/goffice-update/src/gnome-utils/Makefile.am 2005-11-24 06:16:37 UTC (rev 12027)
+++ gnucash/branches/goffice-update/src/gnome-utils/Makefile.am 2005-11-25 16:26:12 UTC (rev 12028)
@@ -26,7 +26,8 @@
${GUILE_INCS} \
${G_WRAP_COMPILE_ARGS} \
${QOF_CFLAGS} \
- ${GOFFICE_CFLAGS}
+ ${GOFFICE_CFLAGS} \
+ ${GSF_CFLAGS}
libgncmod_gnome_utils_la_SOURCES = \
QuickFill.c \
More information about the gnucash-changes
mailing list