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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 6097d16b82..0ff301b894 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 \
@@ -37,7 +43,6 @@ UI_FILES = \
 
 EXTRA_DIST += \
 	src/ui/gui/OChangeLog \
-	src/ui/gui/psppicon.png \
 	src/ui/gui/marshaller-list \
 	src/ui/gui/pspp.desktop
 
@@ -74,16 +79,18 @@ 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) $(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) $(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 ; \
 	done 
 	gtk-update-icon-cache --ignore-theme-index $(themedir)
 
@@ -91,7 +98,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 +107,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 +123,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,7 +133,11 @@ 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 \
@@ -139,6 +152,8 @@ src_ui_gui_psppire_SOURCES = \
 	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 \
@@ -169,11 +184,17 @@ 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/k-means-dialog.c \
+	src/ui/gui/k-means-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 \
@@ -204,6 +225,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 \
@@ -225,6 +248,8 @@ src_ui_gui_psppire_SOURCES = \
 	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,6 +268,8 @@ 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/val-labs-dialog.c \
 	src/ui/gui/val-labs-dialog.h \
 	src/ui/gui/var-display.c \