Revert "Fix DSO linking issue"

[pspp] / src / ui / gui / automake.mk

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 770a5a9a012635dff906690f47ec351a57252714..75ca28a7133229054de674edd3e347ab9f2d3f6d 100644 (file)
--- 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,12 @@ 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 \
@@ -232,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 \
@@ -252,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 \
@@ -313,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 $? >> $@