X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=81010218d85626e8e420cc7b86a04ae471f700f4;hb=6dffb017e700eda7cd5111509042dc8964fff29f;hp=2c8e02b6ff364be572f90929b1d45727d8431e0a;hpb=32ee0e0402d6d56674f53a47d879ec5c07dabe09;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 2c8e02b6ff..81010218d8 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -35,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 \
@@ -43,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
 
@@ -80,16 +80,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/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)
 
@@ -97,7 +99,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)
 
@@ -105,6 +108,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 \
@@ -120,7 +124,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 = \
@@ -213,6 +217,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 \
@@ -267,6 +273,8 @@ src_ui_gui_psppire_SOURCES = \
 	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 \