merge up to 1.4.1 and do more work on the plugins. I'll need to do the

merge up to 1.4.1 and do more work on the plugins.
I'll need to do the error handling soon, this is putrid

plugins/plot_surface/Makefile.am

-INCLUDES = \
-    -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
-    -I$(top_srcdir)/src	-I$(top_builddir)/src	\
-    -I$(top_srcdir)	-I$(top_builddir)	\
-    -I$(top_srcdir)/src/cut-n-paste-code		\
-    $(GNUMERIC_CFLAGS)
-
 goffice_graph_surfacedir = $(gnumeric_plugindir)/plot_surface
 xmldir	 = $(goffice_graph_surfacedir)
 gladedir = $(goffice_graph_surfacedir)
@@ -30,3 +23,5 @@ plot-types.xml : plot-types.xml.in
 
 EXTRA_DIST = $(xml_in_files) $(glade_DATA)
 DISTCLEANFILES = $(xml_in_files:.xml.in=.xml)
+
+include $(srcdir)/../../../goffice-plugins.mk