X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=75ca28a7133229054de674edd3e347ab9f2d3f6d;hb=f775feb2cd46a56d926cfe176e4761650bb7e692;hp=c007a8362c45ad4fbf83f97725a897929ab2eb6d;hpb=d90bff7cd2df2779eb378dec5ab53ff598f91f31;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index c007a8362c..75ca28a713 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 
@@ -74,7 +76,8 @@ src_ui_gui_psppire_LDADD = \
 	$(GTK_LIBS) \
 	$(GTKSOURCEVIEW_LIBS) \
 	$(CAIRO_LIBS) \
-	$(LIBINTL)
+	$(LIBINTL) \
+	$(GSL_LIBS)
 
 src_ui_gui_psppiredir = $(pkgdatadir)
 
@@ -84,16 +87,18 @@ 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)
+	if test -z "$(DESTDIR)" ; then \
+		gtk-update-icon-cache --ignore-theme-index $(themedir); \
+	fi
 
 INSTALL_DATA_HOOKS += install-icons install-lang
 
@@ -153,24 +158,18 @@ 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 \
 	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 \
@@ -187,8 +186,6 @@ 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 \
@@ -211,6 +208,26 @@ 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-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 \
+	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 \
@@ -221,6 +238,8 @@ src_ui_gui_psppire_SOURCES = \
 	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 \
@@ -241,6 +260,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 \
@@ -249,16 +270,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/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 \
-	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 \
@@ -281,8 +296,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 \
@@ -310,6 +323,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 $? >> $@