X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=838a773ac4d68cb1f8d55d6a489cfe412a3f48f8;hb=4cf49191fb83586ae05ed9613ce229417c106055;hp=e664ab9d06fd385b33994cf4be156aae81924274;hpb=77c129d43e0d24192869d60f9ed928746cf01d7f;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index e664ab9d06..838a773ac4 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -4,7 +4,7 @@ include $(top_srcdir)/src/ui/gui/sheet/automake.mk
 
 bin_PROGRAMS += src/ui/gui/psppire 
 
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall \
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall \
 	-DINSTALLDIR=\"$(bindir)\" -DGDK_MULTIHEAD_SAFE=1
 
 
@@ -27,12 +27,34 @@ src_ui_gui_psppire_LDADD = \
 	src/libpspp.la \
 	src/libpspp-core.la \
 	$(GTK_LIBS) \
-	$(GLADE_LIBS) \
 	@LIBINTL@ \
 	$(LIB_CLOSE)
 
 src_ui_gui_psppiredir = $(pkgdatadir)
 
+
+themedir = $(DESTDIR)$(datadir)/icons/hicolor
+context = apps
+
+
+install-icons:
+	for size in 16x16 ; do \
+	  $(MKDIR_P) $(themedir)/$$size/$(context) ; \
+          $(INSTALL) $(top_srcdir)/src/ui/gui/psppicon.png $(themedir)/$$size/$(context) ; \
+	done 
+	gtk-update-icon-cache --ignore-theme-index $(themedir)
+
+INSTALL_DATA_HOOKS += install-icons
+
+uninstall-icons:
+	for size in 16x16 ; do \
+          $(RM) $(themedir)/$$size/$(context)/psppicon.png ; \
+	done 
+	gtk-update-icon-cache --ignore-theme-index $(themedir)
+
+UNINSTALL_DATA_HOOKS += uninstall-icons
+
+
 nodist_src_ui_gui_psppire_DATA = \
 	$(top_builddir)/src/ui/gui/crosstabs.ui \
 	$(top_builddir)/src/ui/gui/descriptives-dialog.ui \
@@ -51,8 +73,6 @@ nodist_src_ui_gui_psppire_DATA = \
 	$(top_builddir)/src/ui/gui/t-test.ui
 
 dist_src_ui_gui_psppire_DATA = \
-	$(top_srcdir)/src/ui/gui/text-data-import.glade \
-	$(top_srcdir)/src/ui/gui/psppicon.png \
 	$(top_srcdir)/src/ui/gui/pspplogo.png \
 	$(top_srcdir)/src/ui/gui/icons/value-labels.png \
 	$(top_srcdir)/src/ui/gui/icons/goto-variable.png\
@@ -117,6 +137,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire.h \
 	src/ui/gui/psppire-acr.h \
 	src/ui/gui/psppire-buttonbox.h \
+	src/ui/gui/psppire-conf.c \
+	src/ui/gui/psppire-conf.h \
 	src/ui/gui/psppire-data-editor.c \
 	src/ui/gui/psppire-data-editor.h \
 	src/ui/gui/psppire-data-store.c \
@@ -197,6 +219,7 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/recode.glade \
 	src/ui/gui/regression.glade \
 	src/ui/gui/syntax-editor.glade \
+	src/ui/gui/text-data-import.glade \
 	src/ui/gui/t-test.glade
 
 
@@ -214,6 +237,7 @@ yelp-check:
 		echo '    Yelp is available from the GNOME project.  ftp://ftp.gnome.org/pub/gnome/sources/yelp' ; \
 		echo ; \
 	fi
+
 PHONY += yelp-check
 
 AM_CPPFLAGS += -Isrc
@@ -227,9 +251,16 @@ src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
 .glade.ui:
 	gtk-builder-convert $< $@
 
+desktopdir = $(datadir)/applications
+desktop_DATA = src/ui/gui/pspp.desktop
+
 EXTRA_DIST += src/ui/gui/OChangeLog\
-	src/ui/gui/marshaller-list
+	src/ui/gui/psppicon.png \
+	src/ui/gui/marshaller-list \
+	$(desktop_DATA)
 
 BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h
 CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \
 	$(nodist_src_ui_gui_psppire_DATA)
+
+