X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=730dbfcb7dae184a8e21317956a95eabec38ef00;hb=0c88e75ba323baad4440ef0ab66bc35df2f1aecc;hp=941a7fea1c2690b36840188c13d19f3933ee7ed7;hpb=41a628f070c7a0d2e9468308cb1bf4ff77de9900;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 941a7fea1c..730dbfcb7d 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-include $(top_srcdir)/src/ui/gui/sheet/automake.mk
-
 UI_FILES = \
 	src/ui/gui/aggregate.ui \
 	src/ui/gui/autorecode.ui \
@@ -11,6 +9,7 @@ UI_FILES = \
 	src/ui/gui/count.ui \
 	src/ui/gui/crosstabs.ui \
 	src/ui/gui/chi-square.ui \
+	src/ui/gui/data-sheet.ui \
 	src/ui/gui/descriptives.ui \
 	src/ui/gui/entry-dialog.ui \
 	src/ui/gui/examine.ui \
@@ -45,6 +44,7 @@ UI_FILES = \
 	src/ui/gui/data-editor.ui \
 	src/ui/gui/output-viewer.ui \
 	src/ui/gui/syntax-editor.ui \
+	src/ui/gui/var-sheet.ui \
 	src/ui/gui/var-type-dialog.ui
 
 EXTRA_DIST += \
@@ -74,8 +74,7 @@ endif
 
 
 src_ui_gui_psppire_LDADD = \
-        src/ui/gui/sheet/libsheet.la \
-	lib/gtk-contrib/libgtksheet.a \
+	lib/gtk-contrib/libxpaned.a \
 	src/ui/libuicommon.la \
 	src/libpspp.la \
 	src/libpspp-core.la \
@@ -99,38 +98,35 @@ src_ui_gui_spreadsheet_test_SOURCES = src/ui/gui/spreadsheet-test.c src/ui/gui/p
 src_ui_gui_psppiredir = $(pkgdatadir)
 
 
-themedir = $(DESTDIR)$(datadir)/icons/hicolor
-context = pspp
+thethemedir = $(DESTDIR)$(datadir)/icons/hicolor
+thecontext = pspp
 
 
 install-lang:
 	$(INSTALL_DATA) $(top_srcdir)/src/ui/gui/pspp.lang $(DESTDIR)$(pkgdatadir)
 
-install-icons:
+install-legacy-icons:
 	for size in 16x16 ; do \
-	  $(MKDIR_P) $(themedir)/$$size/$(context) ; \
-          $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$size/* $(themedir)/$$size/$(context) ; \
-	  $(MKDIR_P) $(themedir)/$$size/apps ; \
-	  $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/app-icons/$$size/pspp.png $(themedir)/$$size/apps ; \
+	  $(MKDIR_P) $(thethemedir)/$$size/$(thecontext) ; \
+          $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$size/* $(thethemedir)/$$size/$(thecontext) ; \
 	done 
-	if test -z "$(DESTDIR)" ; then \
-		gtk-update-icon-cache --ignore-theme-index $(themedir); \
-	fi
 
-INSTALL_DATA_HOOKS += install-icons install-lang
+INSTALL_DATA_HOOKS += install-legacy-icons install-lang
 
-uninstall-icons:
+uninstall-legacy-icons:
 	for size in 16x16 ; do \
-          rm -r -f $(themedir)/$$size/$(context); \
-          rm -f $(themedir)/$$size/apps/pspp.png; \
+          rm -r -f $(thethemedir)/$$size/$(thecontext); \
 	done 
-	gtk-update-icon-cache --ignore-theme-index $(themedir)
 
-UNINSTALL_DATA_HOOKS += uninstall-icons
+update-icon-cache:
+	if test -z "$(DESTDIR)" ; then \
+		gtk-update-icon-cache --ignore-theme-index $(thethemedir); \
+	fi
+
+UNINSTALL_DATA_HOOKS += uninstall-legacy-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 \
@@ -146,7 +142,6 @@ 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/psppire.gtkrc
 
 src_ui_gui_psppire_SOURCES = \
@@ -188,8 +183,6 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/chi-square-dialog.h \
 	src/ui/gui/count-dialog.c \
 	src/ui/gui/count-dialog.h \
-	src/ui/gui/customentry.c \
-	src/ui/gui/customentry.h \
 	src/ui/gui/dialog-common.c \
 	src/ui/gui/dialog-common.h \
 	src/ui/gui/dict-display.h \
@@ -225,6 +218,8 @@ src_ui_gui_psppire_SOURCES = \
 	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-sheet.c \
+	src/ui/gui/psppire-data-sheet.h \
 	src/ui/gui/psppire-data-store.c \
 	src/ui/gui/psppire-data-store.h \
 	src/ui/gui/psppire-data-window.c \
@@ -301,8 +296,6 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-var-ptr.h \
 	src/ui/gui/psppire-var-sheet.c \
 	src/ui/gui/psppire-var-sheet.h \
-	src/ui/gui/psppire-var-store.c \
-	src/ui/gui/psppire-var-store.h \
 	src/ui/gui/psppire-vbuttonbox.h \
 	src/ui/gui/psppire-window.c \
 	src/ui/gui/psppire-window.h \
@@ -416,3 +409,8 @@ src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
 CLEANFILES += src/ui/gui/include/gtk/gtk.h
 EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h
 
+include $(top_srcdir)/src/ui/gui/icons/automake.mk
+
+UNINSTALL_DATA_HOOKS += update-icon-cache
+INSTALL_DATA_HOOKS += update-icon-cache
+