X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=4b2627885d2cf0c25325ac2d7a764bead0dddc26;hb=698f289d1ecf1620aa5429599f2e76db23cff452;hp=0dcd519ce775b14638dfe5cca921bdd80c376cb6;hpb=8a8f2ec2ef0054d16a76a752c79b7968c590c166;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 0dcd519ce7..4b2627885d 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -21,6 +21,7 @@ UI_FILES = \
 	src/ui/gui/k-means.ui \
 	src/ui/gui/k-related.ui \
 	src/ui/gui/ks-one-sample.ui \
+	src/ui/gui/means.ui \
 	src/ui/gui/oneway.ui \
 	src/ui/gui/paired-samples.ui \
 	src/ui/gui/psppire.ui \
@@ -45,7 +46,8 @@ UI_FILES = \
 EXTRA_DIST += \
 	src/ui/gui/OChangeLog \
 	src/ui/gui/marshaller-list \
-	src/ui/gui/pspp.desktop
+	src/ui/gui/gen-dot-desktop.sh
+
 
 if HAVE_GUI
 bin_PROGRAMS += src/ui/gui/psppire 
@@ -94,7 +96,9 @@ install-icons:
 	  $(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)
+	if test -z "$(DESTDIR)" ; then \
+		gtk-update-icon-cache --ignore-theme-index $(themedir); \
+	fi
 
 INSTALL_DATA_HOOKS += install-icons install-lang
 
@@ -166,8 +170,6 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/dict-display.c \
 	src/ui/gui/entry-dialog.c \
 	src/ui/gui/entry-dialog.h \
-	src/ui/gui/examine-dialog.c \
-	src/ui/gui/examine-dialog.h \
 	src/ui/gui/executor.c \
 	src/ui/gui/executor.h \
 	src/ui/gui/find-dialog.c \
@@ -212,8 +214,16 @@ src_ui_gui_psppire_SOURCES = \
 	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-examine.c \
+	src/ui/gui/psppire-dialog-action-examine.h \
 	src/ui/gui/psppire-dialog-action-kmeans.c \
 	src/ui/gui/psppire-dialog-action-kmeans.h \
+	src/ui/gui/psppire-dialog-action-means.c \
+	src/ui/gui/psppire-dialog-action-means.h \
+	src/ui/gui/psppire-dialog-action-reliability.c \
+	src/ui/gui/psppire-dialog-action-reliability.h \
+	src/ui/gui/psppire-dialog-action-sort.c \
+	src/ui/gui/psppire-dialog-action-sort.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 \
@@ -222,12 +232,16 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-dict.h \
 	src/ui/gui/psppire-dictview.c \
 	src/ui/gui/psppire-dictview.h \
+	src/ui/gui/psppire-empty-list-store.c \
+	src/ui/gui/psppire-empty-list-store.h \
 	src/ui/gui/psppire-encoding-selector.c \
 	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-means-layer.c \
+	src/ui/gui/psppire-means-layer.h \
 	src/ui/gui/psppire-output-window.c \
 	src/ui/gui/psppire-output-window.h \
 	src/ui/gui/psppire-var-view.c \
@@ -248,6 +262,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-vbuttonbox.h \
 	src/ui/gui/psppire-window.c \
 	src/ui/gui/psppire-window.h \
+	src/ui/gui/psppire-window-base.c \
+	src/ui/gui/psppire-window-base.h \
 	src/ui/gui/psppire-window-register.c \
 	src/ui/gui/psppire-window-register.h \
 	src/ui/gui/rank-dialog.c \
@@ -256,14 +272,10 @@ 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/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 \
-	src/ui/gui/sort-cases-dialog.h \
 	src/ui/gui/split-file-dialog.c \
 	src/ui/gui/split-file-dialog.h \
 	src/ui/gui/text-data-import-dialog.c \
@@ -313,6 +325,11 @@ PHONY += yelp-check
 
 AM_CPPFLAGS += -Isrc
 
+src/ui/gui/pspp.desktop: src/ui/gui/gen-dot-desktop.sh $(POFILES)
+	POFILES="$(POFILES)" top_builddir="$(top_builddir)" $(SHELL) $< > $@
+
+CLEANFILES+=src/ui/gui/pspp.desktop
+
 src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
 	echo '#include <config.h>' > $@
 	$(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@