X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=477010e7fa80838bb86ac71673f81c7a05c3a2e3;hb=7466f9c7baaf5a5d4cc7b670be290395ccb20b65;hp=81010218d85626e8e420cc7b86a04ae471f700f4;hpb=5825b0b870739af3760c07138bed50e99db788ae;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 81010218d8..477010e7fa 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -74,7 +74,8 @@ src_ui_gui_psppire_LDADD = \
 	$(GTK_LIBS) \
 	$(GTKSOURCEVIEW_LIBS) \
 	$(CAIRO_LIBS) \
-	$(LIBINTL)
+	$(LIBINTL) \
+	$(GSL_LIBS)
 
 src_ui_gui_psppiredir = $(pkgdatadir)
 
@@ -84,14 +85,14 @@ context = pspp
 
 
 install-lang:
-	$(INSTALL) $(top_srcdir)/src/ui/gui/pspp.lang $(DESTDIR)$(pkgdatadir)
+	$(INSTALL_DATA) $(top_srcdir)/src/ui/gui/pspp.lang $(DESTDIR)$(pkgdatadir)
 
 install-icons:
 	for size in 16x16 ; do \
 	  $(MKDIR_P) $(themedir)/$$size/$(context) ; \
-          $(INSTALL) $(top_srcdir)/src/ui/gui/icons/$$size/* $(themedir)/$$size/$(context) ; \
+          $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$size/* $(themedir)/$$size/$(context) ; \
 	  $(MKDIR_P) $(themedir)/$$size/apps ; \
-	  $(INSTALL) $(top_srcdir)/src/ui/gui/app-icons/$$size/pspp.png $(themedir)/$$size/apps ; \
+	  $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/app-icons/$$size/pspp.png $(themedir)/$$size/apps ; \
 	done 
 	gtk-update-icon-cache --ignore-theme-index $(themedir)
 
@@ -143,6 +144,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/aggregate-dialog.h \
 	src/ui/gui/binomial-dialog.c \
 	src/ui/gui/binomial-dialog.h \
+	src/ui/gui/builder-wrapper.c \
+	src/ui/gui/builder-wrapper.h \
 	src/ui/gui/checkbox-treeview.c \
 	src/ui/gui/checkbox-treeview.h \
 	src/ui/gui/comments-dialog.c \
@@ -159,8 +162,6 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/crosstabs-dialog.h \
 	src/ui/gui/customentry.c \
 	src/ui/gui/customentry.h \
-	src/ui/gui/descriptives-dialog.c \
-	src/ui/gui/descriptives-dialog.h \
 	src/ui/gui/dialog-common.c \
 	src/ui/gui/dialog-common.h \
 	src/ui/gui/dict-display.h \
@@ -209,6 +210,12 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-data-window.c \
 	src/ui/gui/psppire-data-window.h \
 	src/ui/gui/psppire-dialog.h \
+	src/ui/gui/psppire-dialog-action.c \
+	src/ui/gui/psppire-dialog-action.h \
+	src/ui/gui/psppire-dialog-action-descriptives.c \
+	src/ui/gui/psppire-dialog-action-descriptives.h \
+	src/ui/gui/psppire-dialog-action-var-info.c \
+	src/ui/gui/psppire-dialog-action-var-info.h \
 	src/ui/gui/psppire-dict.c \
 	src/ui/gui/psppire-dict.h \
 	src/ui/gui/psppire-dictview.c \
@@ -279,8 +286,6 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/val-labs-dialog.h \
 	src/ui/gui/var-display.c \
 	src/ui/gui/var-display.h \
-	src/ui/gui/variable-info-dialog.c \
-	src/ui/gui/variable-info-dialog.h \
 	src/ui/gui/var-type-dialog.c \
 	src/ui/gui/var-type-dialog.h \
 	src/ui/gui/weight-cases-dialog.c \