Hi
To avoid collisions between the incompatible 0.4 and 0.5 goffice
versions, I'd propose to change the library name in 0.5. Attached patch
fixes it on linux, I don't know if we need to change the win32 stuff at
the bottom of goffice/Makefile.am.
Any objections before I commit?
Cheers,
Jean
Index: libgoffice-0.5.pc.in
===================================================================
--- libgoffice-0.5.pc.in (révision 1792)
+++ libgoffice-0.5.pc.in (copie de travail)
@@ -7,7 +7,7 @@
Description: G Office support library
Version: @VERSION@
Requires: glib-2.0 gobject-2.0 libgsf-1 libxml-2.0 gtk+-2.0 libglade-2.0 libart-2.0 cairo pangocairo
-Libs: -L${libdir} -lgoffice-0
+Libs: -L${libdir} -lgoffice-0.5
Libs.private: @EXTRA_LIBS@
Cflags: -I${includedir}/libgoffice-0.5 @EXTRA_INCLUDES@
GOffice_plugins_dir=${libdir}/goffice/@VERSION@/plugins
Index: goffice/Makefile.am
===================================================================
--- goffice/Makefile.am (révision 1792)
+++ goffice/Makefile.am (copie de travail)
@@ -1,8 +1,8 @@
SUBDIRS = utils data app graph ms-compat cut-n-paste
-lib_LTLIBRARIES = libgoffice-0.la
+lib_LTLIBRARIES = libgoffice-0.5.la
-libgoffice_0_la_LIBADD = \
+libgoffice_0_5_la_LIBADD = \
utils/libgoffice-utils.la \
app/libgoffice-app.la \
data/libgoffice-data.la \
@@ -12,31 +12,31 @@
if WITH_GTK
SUBDIRS += gtk drawing component
-libgoffice_0_la_LIBADD += \
+libgoffice_0_5_la_LIBADD += \
gtk/libgoffice-gtk.la \
drawing/libgoffice-drawing.la \
component/libgoffice-component.la \
cut-n-paste/foocanvas/libfoocanvas.la
endif
-libgoffice_0_la_LDFLAGS = -version-info $(VERSION_INFO)
+libgoffice_0_5_la_LDFLAGS = -version-info $(VERSION_INFO)
if WITH_WIN32
-libgoffice_0_la_DEPENDENCIES = goffice.def
-libgoffice_0_la_LDFLAGS += -no-undefined -export-symbols goffice.def
+libgoffice_0_5_la_DEPENDENCIES = goffice.def
+libgoffice_0_5_la_LDFLAGS += -no-undefined -export-symbols goffice.def
if WITH_NATIVE_WIN32
-libgoffice_0_la_LIBADD += -luuid -lhtmlhelp -lurlmon
+libgoffice_0_5_la_LIBADD += -luuid -lhtmlhelp -lurlmon
endif
endif
BUILT_SOURCES = goffice-paths.h
CLEANFILES = $(BUILT_SOURCES)
-libgoffice_0_la_SOURCES = \
+libgoffice_0_5_la_SOURCES = \
goffice.c \
goffice-priv.h
-libgoffice_0_ladir = $(goffice_include_dir)
-libgoffice_0_la_HEADERS = \
+libgoffice_0_5_ladir = $(goffice_include_dir)
+libgoffice_0_5_la_HEADERS = \
goffice-features.h \
goffice.h
@@ -60,7 +60,7 @@
include $(top_srcdir)/goffice.mk
if WITH_WIN32
-LIB_PUBLIC_HDRS = $(libgoffice_0_la_HEADERS)
+LIB_PUBLIC_HDRS = $(libgoffice_0_5_la_HEADERS)
goffice.def: local.def app/local.def \
cut-n-paste/foocanvas/local.def \
@@ -74,7 +74,7 @@
goffice_mslibdir = $(DESTDIR)$(libdir)
goffice_mslib_DATA = goffice-0.lib
-goffice-0.lib: libgoffice-0.la goffice.def
+goffice-0.lib: libgoffice-0.5.la goffice.def
lib -name:libgoffice-0-$(VERSION_IFACE).dll -def:goffice.def -out:$@
endif
endif
_______________________________________________
gnumeric-list mailing list
[email protected]
http://mail.gnome.org/mailman/listinfo/gnumeric-list
