X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=b8bc11522167351ae7e84d63d853e8cb5ca6844b;hb=fa794217bafc4de9e5191871a32a9455ad5a24c4;hp=e3480d7a43196dae6c212ece519b5ad5ed3d3e34;hpb=ffce2432a76f3ffbe2a19228d3b3d03613c3b4a3;p=pspp-builds.git

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index e3480d7a..b8bc1152 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -54,7 +54,7 @@ src_ui_gui_psppire_LDADD = \
 	-dlopen src/ui/gui/libpsppire.la \
 	src/ui/gui/libpsppwidgets.la \
         src/ui/gui/sheet/libsheet.la \
-	lib/gtksheet/libgtksheet.a \
+	lib/gtk-contrib/libgtksheet.a \
 	src/ui/libuicommon.la \
 	src/libpspp.la \
 	src/libpspp-core.la \
@@ -64,18 +64,27 @@ src_ui_gui_psppire_LDADD = \
 
 src_ui_gui_psppiredir = $(pkgdatadir)
 
+nodist_src_ui_gui_psppire_DATA = \
+	$(top_srcdir)/src/ui/gui/examine.ui \
+	$(top_srcdir)/src/ui/gui/frequencies.ui \
+	$(top_srcdir)/src/ui/gui/oneway.ui \
+	$(top_srcdir)/src/ui/gui/rank.ui \
+	$(top_srcdir)/src/ui/gui/recode.ui
+
+EXTRA_DIST += \
+	$(top_srcdir)/src/ui/gui/examine.glade \
+	$(top_srcdir)/src/ui/gui/frequencies.glade \
+	$(top_srcdir)/src/ui/gui/oneway.glade \
+	$(top_srcdir)/src/ui/gui/rank.glade \
+	$(top_srcdir)/src/ui/gui/recode.glade
+
 dist_src_ui_gui_psppire_DATA = \
 	$(top_srcdir)/src/ui/gui/data-editor.glade \
 	$(top_srcdir)/src/ui/gui/descriptives-dialog.glade \
-	$(top_srcdir)/src/ui/gui/examine.glade \
 	$(top_srcdir)/src/ui/gui/crosstabs.glade \
-	$(top_srcdir)/src/ui/gui/frequencies.glade \
 	$(top_srcdir)/src/ui/gui/message-dialog.glade \
-	$(top_srcdir)/src/ui/gui/oneway.glade \
 	$(top_srcdir)/src/ui/gui/output-viewer.glade \
 	$(top_srcdir)/src/ui/gui/psppire.glade \
-	$(top_srcdir)/src/ui/gui/rank.glade \
-	$(top_srcdir)/src/ui/gui/recode.glade \
 	$(top_srcdir)/src/ui/gui/regression.glade \
 	$(top_srcdir)/src/ui/gui/syntax-editor.glade \
 	$(top_srcdir)/src/ui/gui/text-data-import.glade \
@@ -207,8 +216,6 @@ nodist_src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-marshal.h
 
 
-
-
 yelp-check:
 	@if ! yelp --version > /dev/null 2>&1 ; then \
 		echo    ; \
@@ -228,6 +235,9 @@ src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
 src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
 	glib-genmarshal --header --prefix=psppire_marshal $< > $@
 
+.glade.ui:
+	gtk-builder-convert $< $@
+
 EXTRA_DIST += src/ui/gui/OChangeLog\
 	src/ui/gui/marshaller-list