X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=630a8d9974f13d34ea3514948be6e676c2a08608;hb=17308c1e0578259823fdd996633fa70e1c2747f3;hp=6097d16b82d3a2d9dcec1b46963d4cf06330a337;hpb=fe8dc2171009e90d2335f159d05f7e6660e24780;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 6097d16b82..630a8d9974 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -4,9 +4,11 @@ include $(top_srcdir)/src/ui/gui/sheet/automake.mk
 
 UI_FILES = \
 	src/ui/gui/aggregate.ui \
+	src/ui/gui/autorecode.ui \
 	src/ui/gui/binomial.ui \
 	src/ui/gui/compute.ui \
 	src/ui/gui/correlation.ui \
+	src/ui/gui/count.ui \
 	src/ui/gui/crosstabs.ui \
 	src/ui/gui/chi-square.ui \
 	src/ui/gui/descriptives.ui \
@@ -16,10 +18,14 @@ UI_FILES = \
 	src/ui/gui/factor.ui \
 	src/ui/gui/find.ui \
 	src/ui/gui/frequencies.ui \
+	src/ui/gui/k-means.ui \
 	src/ui/gui/k-related.ui \
+	src/ui/gui/ks-one-sample.ui \
 	src/ui/gui/oneway.ui \
+	src/ui/gui/paired-samples.ui \
 	src/ui/gui/psppire.ui \
 	src/ui/gui/rank.ui \
+	src/ui/gui/runs.ui \
 	src/ui/gui/sort.ui \
 	src/ui/gui/split-file.ui \
 	src/ui/gui/recode.ui \
@@ -29,6 +35,7 @@ UI_FILES = \
 	src/ui/gui/select-cases.ui \
 	src/ui/gui/t-test.ui \
 	src/ui/gui/text-data-import.ui \
+	src/ui/gui/univariate.ui \
 	src/ui/gui/var-sheet-dialogs.ui \
 	src/ui/gui/variable-info.ui \
 	src/ui/gui/data-editor.ui \
@@ -37,7 +44,6 @@ UI_FILES = \
 
 EXTRA_DIST += \
 	src/ui/gui/OChangeLog \
-	src/ui/gui/psppicon.png \
 	src/ui/gui/marshaller-list \
 	src/ui/gui/pspp.desktop
 
@@ -68,22 +74,25 @@ src_ui_gui_psppire_LDADD = \
 	$(GTK_LIBS) \
 	$(GTKSOURCEVIEW_LIBS) \
 	$(CAIRO_LIBS) \
-	$(LIBINTL)
+	$(LIBINTL) \
+	$(GSL_LIBS)
 
 src_ui_gui_psppiredir = $(pkgdatadir)
 
 
 themedir = $(DESTDIR)$(datadir)/icons/hicolor
-context = apps
+context = pspp
 
 
 install-lang:
-	$(INSTALL) $(top_srcdir)/src/ui/gui/pspp.lang $(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/psppicon.png $(themedir)/$$size/$(context) ; \
+          $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$size/* $(themedir)/$$size/$(context) ; \
+	  $(MKDIR_P) $(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)
 
@@ -91,7 +100,8 @@ INSTALL_DATA_HOOKS += install-icons install-lang
 
 uninstall-icons:
 	for size in 16x16 ; do \
-          rm -f $(themedir)/$$size/$(context)/psppicon.png ; \
+          rm -r -f $(themedir)/$$size/$(context); \
+          rm -f $(themedir)/$$size/apps/pspp.png; \
 	done 
 	gtk-update-icon-cache --ignore-theme-index $(themedir)
 
@@ -99,6 +109,7 @@ UNINSTALL_DATA_HOOKS += uninstall-icons
 
 dist_src_ui_gui_psppire_DATA = \
 	$(UI_FILES) \
+	$(top_srcdir)/src/ui/gui/app-icons/16x16/pspp.png \
 	$(top_srcdir)/src/ui/gui/pspp.lang \
 	$(top_srcdir)/src/ui/gui/pspplogo.png \
 	$(top_srcdir)/src/ui/gui/icons/value-labels.png \
@@ -114,7 +125,7 @@ dist_src_ui_gui_psppire_DATA = \
 	$(top_srcdir)/src/ui/gui/icons/16x16/scale.png \
 	$(top_srcdir)/src/ui/gui/icons/16x16/string.png \
 	$(top_srcdir)/src/ui/gui/icons/16x16/date-scale.png \
-	$(top_srcdir)/src/ui/gui/icons/splash.png
+	$(top_srcdir)/src/ui/gui/icons/splash.png 
 
 
 src_ui_gui_psppire_SOURCES = \
@@ -124,11 +135,17 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-buttonbox.c \
 	src/ui/gui/psppire-hbuttonbox.c \
 	src/ui/gui/psppire-vbuttonbox.c \
+	src/ui/gui/psppire-scanf.c \
+	src/ui/gui/psppire-scanf.h \
 	src/ui/gui/psppire-acr.c \
+	src/ui/gui/autorecode-dialog.c \
+	src/ui/gui/autorecode-dialog.h \
 	src/ui/gui/aggregate-dialog.c \
 	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 \
@@ -137,14 +154,12 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/compute-dialog.h \
 	src/ui/gui/chi-square-dialog.c \
 	src/ui/gui/chi-square-dialog.h \
-	src/ui/gui/correlation-dialog.c \
-	src/ui/gui/correlation-dialog.h \
+	src/ui/gui/count-dialog.c \
+	src/ui/gui/count-dialog.h \
 	src/ui/gui/crosstabs-dialog.c \
 	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 \
@@ -169,11 +184,15 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/helper.h \
 	src/ui/gui/k-related-dialog.c \
 	src/ui/gui/k-related-dialog.h \
+	src/ui/gui/ks-one-sample-dialog.c \
+	src/ui/gui/ks-one-sample-dialog.h \
 	src/ui/gui/main.c \
 	src/ui/gui/missing-val-dialog.c \
 	src/ui/gui/missing-val-dialog.h \
         src/ui/gui/oneway-anova-dialog.c \
         src/ui/gui/oneway-anova-dialog.h \
+	src/ui/gui/paired-dialog.c \
+	src/ui/gui/paired-dialog.h \
 	src/ui/gui/psppire.c \
 	src/ui/gui/psppire.h \
 	src/ui/gui/psppire-acr.h \
@@ -187,6 +206,20 @@ 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-correlation.c \
+	src/ui/gui/psppire-dialog-action-correlation.h \
+	src/ui/gui/psppire-dialog-action-descriptives.c \
+	src/ui/gui/psppire-dialog-action-descriptives.h \
+	src/ui/gui/psppire-dialog-action-kmeans.c \
+	src/ui/gui/psppire-dialog-action-kmeans.h \
+	src/ui/gui/psppire-dialog-action-reliability.c \
+	src/ui/gui/psppire-dialog-action-reliability.h \
+	src/ui/gui/psppire-dialog-action-var-info.c \
+	src/ui/gui/psppire-dialog-action-var-info.h \
+	src/ui/gui/psppire-dialog-action-roc.c \
+	src/ui/gui/psppire-dialog-action-roc.h \
 	src/ui/gui/psppire-dict.c \
 	src/ui/gui/psppire-dict.h \
 	src/ui/gui/psppire-dictview.c \
@@ -195,6 +228,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-encoding-selector.h \
 	src/ui/gui/psppire-hbuttonbox.h \
 	src/ui/gui/psppire-keypad.h \
+	src/ui/gui/psppire-lex-reader.c \
+	src/ui/gui/psppire-lex-reader.h \
 	src/ui/gui/psppire-output-window.c \
 	src/ui/gui/psppire-output-window.h \
 	src/ui/gui/psppire-var-view.c \
@@ -204,6 +239,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-select-dest.h \
 	src/ui/gui/psppire-syntax-window.c \
 	src/ui/gui/psppire-syntax-window.h \
+	src/ui/gui/psppire-val-chooser.c \
+	src/ui/gui/psppire-val-chooser.h \
 	src/ui/gui/psppire-var-ptr.c \
 	src/ui/gui/psppire-var-ptr.h \
 	src/ui/gui/psppire-var-sheet.c \
@@ -221,10 +258,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/recode-dialog.h \
 	src/ui/gui/regression-dialog.c \
 	src/ui/gui/regression-dialog.h \
-	src/ui/gui/reliability-dialog.c \
-	src/ui/gui/reliability-dialog.h \
-	src/ui/gui/roc-dialog.c \
-	src/ui/gui/roc-dialog.h \
+	src/ui/gui/runs-dialog.c \
+	src/ui/gui/runs-dialog.h \
 	src/ui/gui/select-cases-dialog.c \
 	src/ui/gui/select-cases-dialog.h \
 	src/ui/gui/sort-cases-dialog.c \
@@ -243,12 +278,14 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/t-test-options.h \
 	src/ui/gui/t-test-paired-samples.c \
 	src/ui/gui/t-test-paired-samples.h \
+	src/ui/gui/npar-two-sample-related.c \
+	src/ui/gui/npar-two-sample-related.h \
+	src/ui/gui/univariate-dialog.c \
+	src/ui/gui/univariate-dialog.h \
 	src/ui/gui/val-labs-dialog.c \
 	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 \