Fold branches/goffice-update/ back into trunk/.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12096 57a11ea4-9604-0410-9ed3-97b8803252fd

lib/goffice-0.0.4/goffice/Makefile.am

@@ -0,0 +1,58 @@
+SUBDIRS = utils data app graph gtk drawing ms-compat cut-n-paste
+
+lib_LTLIBRARIES = libgoffice-1.la
+
+libgoffice_1_la_LIBADD = 			\
+	cut-n-paste/pcre/libpcre.la		\
+	utils/libgoffice-utils.la		\
+	app/libgoffice-app.la			\
+	data/libgoffice-data.la			\
+	gtk/libgoffice-gtk.la			\
+	cut-n-paste/foocanvas/libfoocanvas.la		\
+	graph/libgoffice-graph.la		\
+	drawing/libgoffice-drawing.la		\
+	ms-compat/libgoffice-ms-compat.la	\
+	$(GOFFICE_DEPS_LIBS)
+
+libgoffice_1_la_LDFLAGS = -version-info $(GOFFICE_LIB_VERSION)
+if WITH_WIN32
+libgoffice_1_la_LDFLAGS += -no-undefined -Wl,-export-all-symbols
+libgoffice_1_la_LIBADD += utils/libgoffice-win32-stub.la
+endif
+
+BUILT_SOURCES =	goffice-paths.h
+CLEANFILES = $(BUILT_SOURCES)
+
+libgoffice_1_la_SOURCES = 	\
+	$(BUILT_SOURCES)	\
+	goffice.c		\
+	goffice-priv.h
+if !HAVE_GLIB26
+  libgoffice_1_la_SOURCES += glib24_26-compat.c
+endif
+
+libgoffice_1_ladir = $(goffice_include_dir)
+libgoffice_1_la_HEADERS = 	\
+	goffice.h
+if !HAVE_GLIB26
+  libgoffice_1_la_HEADERS += glib24_26-compat.h
+endif
+
+# Depends on this Makefile, because it uses make variables.
+goffice-paths.h: Makefile
+	@echo 'creating $@'
+	@( \
+	echo '/* This file has been automatically generated.  Do not edit. */'; \
+	echo ''; \
+	echo '#ifndef GOFFICE_PATHS_H'; \
+	echo '#define GOFFICE_PATHS_H'; \
+	echo ''; \
+	echo '#define GOFFICE_DATADIR "$(goffice_datadir)"'; \
+	echo '#define GOFFICE_LIBDIR "$(goffice_libdir)"'; \
+	echo '#define GOFFICE_ICONDIR "$(goffice_icondir)"'; \
+	echo '#define GOFFICE_LOCALEDIR "$(goffice_localedir)"'; \
+	echo ''; \
+	echo '#endif /* GOFFICE_PATHS_H */'; \
+	) >$@
+
+include $(top_srcdir)/lib/goffice-0.0.4/goffice.mk