[goffice] distcheck fixes.



commit 2fc6e145a1c812b9dc6e4dd97b500dd970928749
Author: Morten Welinder <terra gnome org>
Date:   Wed Aug 26 21:22:03 2009 -0400

    distcheck fixes.

 ChangeLog                        |    6 ++++++
 goffice/graph/Makefile.am        |    3 ++-
 plugins/plot_distrib/Makefile.am |    5 ++---
 3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 53b0698..d7fc179 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-26  Morten Welinder  <terra gnome org>
+
+	* goffice/graph/Makefile.am: The ui file needs to be distributed
+	regardless of configuration.
+	* plugins/plot_distrib/Makefile.am (ui_DATA): Ditto.
+
 2009-08-26  Jean Brefort  <jean brefort normalesup org>
 
 	* goffice/canvas/goc-group.c (goc_group_finalize): don't crash when
diff --git a/goffice/graph/Makefile.am b/goffice/graph/Makefile.am
index 68dc994..59e0fa0 100644
--- a/goffice/graph/Makefile.am
+++ b/goffice/graph/Makefile.am
@@ -97,8 +97,9 @@ dist_ui_DATA = \
 if GOFFICE_WITH_LASEM
   libgoffice_graph_la_SOURCES += gog-equation.c
   libgoffice_graph_la_HEADERS += gog-equation.h
-  dist_ui_DATA += gog-equation-prefs.ui
 endif
+# Always distribute the ui file.
+dist_ui_DATA += gog-equation-prefs.ui
 
 include $(top_srcdir)/goffice.mk
 
diff --git a/plugins/plot_distrib/Makefile.am b/plugins/plot_distrib/Makefile.am
index 0d40fe2..d64808b 100644
--- a/plugins/plot_distrib/Makefile.am
+++ b/plugins/plot_distrib/Makefile.am
@@ -21,9 +21,8 @@ if WITH_GTK
   distrib_la_SOURCES +=	\
 	go-distribution-prefs.c	\
 	go-distribution-prefs.h
-
-  dist_glade_ui = gog-boxplot-prefs.ui
 endif
+ui_DATA = gog-boxplot-prefs.ui
 
 @INTLTOOL_XML_RULE@
 
@@ -32,7 +31,7 @@ endif
 plot-types.xml : plot-types.xml.in
 	cp $< $@
 
-EXTRA_DIST = $(xml_in_files)
+EXTRA_DIST = $(xml_in_files) $(ui_DATA)
 DISTCLEANFILES = $(xml_in_files:.xml.in=.xml)
 
 include $(top_srcdir)/goffice-plugins.mk



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]