X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=906679c4e203c823d969601b993c7f4068d808c0;hb=50feac63e2fb9776f53e432f137311b4f5563ccf;hp=99ba25df011e6d6a848dfd3cfe78af64de661a3f;hpb=730db1fd677a4fc14dec0ca03959b94d09df7ff7;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 99ba25df01..906679c4e2 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -11,7 +11,6 @@ UI_FILES = \
 	src/ui/gui/comments.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 \
@@ -28,6 +27,7 @@ UI_FILES = \
 	src/ui/gui/means.ui \
 	src/ui/gui/missing-val-dialog.ui \
 	src/ui/gui/oneway.ui \
+	src/ui/gui/options.ui \
 	src/ui/gui/paired-samples.ui \
 	src/ui/gui/rank.ui \
 	src/ui/gui/runs.ui \
@@ -48,7 +48,6 @@ UI_FILES = \
 	src/ui/gui/data-editor.ui \
 	src/ui/gui/output-window.ui \
 	src/ui/gui/syntax-editor.ui \
-	src/ui/gui/var-sheet.ui \
 	src/ui/gui/var-type-dialog.ui \
 	src/ui/gui/weight.ui
 
@@ -56,19 +55,20 @@ UI_FILES = \
 $(top_srcdir)/doc/help-pages-list: $(UI_FILES)
 	 $(AM_V_GEN)cat $^ | grep '"help[-_]page"' | \
    $(SED) -e 's% *<property name="help[-_]page">\([^<]*\)</property>%//*[@id='"'"'\1'"'"']%' \
-	-e 's%#%'"'"']/*[@id='"'"'%g' > $@
+	-e 's%#%'"'"']/*[@id='"'"'%g' > $@,tmp
+	test -s $@,tmp
+	mv $@,tmp $@
 
 EXTRA_DIST += doc/help-pages-list
 
 
 EXTRA_DIST += \
 	src/ui/gui/memorandum.txt \
-	src/ui/gui/artwork/actions/.empty \
-	src/ui/gui/artwork/apps/scalable/.empty \
 	src/ui/gui/gen-dot-desktop.sh \
 	src/ui/gui/marshaller-list \
 	src/ui/gui/pspplogo.svg
 
+src_ui_gui_psppire_CPPFLAGS=
 
 if HAVE_GUI
 bin_PROGRAMS += src/ui/gui/psppire 
@@ -121,29 +121,14 @@ INSTALL_DATA_HOOKS += install-lang
 
 dist_src_ui_gui_psppire_DATA = \
 	$(UI_FILES) \
-	$(top_srcdir)/src/ui/gui/pspp.lang \
-	$(top_srcdir)/src/ui/gui/psppire.gtkrc
+	$(top_srcdir)/src/ui/gui/pspp.lang
 
 src_ui_gui_psppire_SOURCES = \
-	src/ui/gui/pspp-sheet-private.h \
-	src/ui/gui/pspp-sheet-selection.c \
-	src/ui/gui/pspp-sheet-selection.h \
-	src/ui/gui/pspp-sheet-view-column.c \
-	src/ui/gui/pspp-sheet-view-column.h \
-	src/ui/gui/pspp-sheet-view.c \
-	src/ui/gui/pspp-sheet-view.h \
-	src/ui/gui/pspp-widget-facade.c \
-	src/ui/gui/pspp-widget-facade.h \
-	src/ui/gui/psppire-button-editable.c \
-	src/ui/gui/psppire-button-editable.h \
-	src/ui/gui/psppire-cell-renderer-button.c \
-	src/ui/gui/psppire-cell-renderer-button.h \
 	src/ui/gui/psppire-dialog.c \
 	src/ui/gui/psppire-keypad.c \
 	src/ui/gui/psppire-selector.c \
 	src/ui/gui/psppire-buttonbox.c \
-	src/ui/gui/psppire-hbuttonbox.c \
-	src/ui/gui/psppire-vbuttonbox.c \
+	src/ui/gui/psppire-buttonbox.h \
 	src/ui/gui/psppire-scanf.c \
 	src/ui/gui/psppire-scanf.h \
 	src/ui/gui/psppire-acr.c \
@@ -170,18 +155,17 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/main.c \
 	src/ui/gui/missing-val-dialog.c \
 	src/ui/gui/missing-val-dialog.h \
+	src/ui/gui/options-dialog.c \
+	src/ui/gui/options-dialog.h \
 	src/ui/gui/psppire.c \
 	src/ui/gui/psppire.h \
 	src/ui/gui/psppire-acr.h \
-	src/ui/gui/psppire-buttonbox.h \
 	src/ui/gui/psppire-checkbox-treeview.c \
 	src/ui/gui/psppire-checkbox-treeview.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-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 \
@@ -241,6 +225,10 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-dialog-action-rank.h \
 	src/ui/gui/psppire-dialog-action-recode.c \
 	src/ui/gui/psppire-dialog-action-recode.h \
+	src/ui/gui/psppire-dialog-action-recode-same.c \
+	src/ui/gui/psppire-dialog-action-recode-same.h \
+	src/ui/gui/psppire-dialog-action-recode-different.c \
+	src/ui/gui/psppire-dialog-action-recode-different.h \
 	src/ui/gui/psppire-dialog-action-regression.c \
 	src/ui/gui/psppire-dialog-action-regression.h \
 	src/ui/gui/psppire-dialog-action-reliability.c \
@@ -277,7 +265,6 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-encoding-selector.h \
 	src/ui/gui/psppire-format.c \
 	src/ui/gui/psppire-format.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 \
@@ -296,16 +283,18 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-select-dest.h \
 	src/ui/gui/psppire-syntax-window.c \
 	src/ui/gui/psppire-syntax-window.h \
+	src/ui/gui/psppire-delimited-text.c \
+	src/ui/gui/psppire-delimited-text.h \
+	src/ui/gui/psppire-text-file.c \
+	src/ui/gui/psppire-text-file.h \
 	src/ui/gui/psppire-val-chooser.c \
 	src/ui/gui/psppire-val-chooser.h \
 	src/ui/gui/psppire-value-entry.c \
 	src/ui/gui/psppire-value-entry.h \
 	src/ui/gui/psppire-var-ptr.c \
 	src/ui/gui/psppire-var-ptr.h \
-	src/ui/gui/psppire-var-sheet.h \
 	src/ui/gui/psppire-var-sheet-header.h \
 	src/ui/gui/psppire-var-sheet-header.c \
-	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 \
@@ -320,6 +309,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/var-display.h \
 	src/ui/gui/var-type-dialog.c \
 	src/ui/gui/var-type-dialog.h \
+	src/ui/gui/value-variant.c \
+	src/ui/gui/value-variant.h \
 	src/ui/gui/widget-io.c \
 	src/ui/gui/widget-io.h \
 	src/ui/gui/widgets.c \
@@ -347,7 +338,8 @@ OBSOLETE = \
 
 nodist_src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-marshal.c \
-	src/ui/gui/psppire-marshal.h
+	src/ui/gui/psppire-marshal.h \
+	src/ui/gui/resources.c
 
 yelp-check:
 	@if ! yelp --version > /dev/null 2>&1 ; then \
@@ -368,6 +360,13 @@ src/ui/gui/pspp.desktop: src/ui/gui/gen-dot-desktop.sh $(POFILES)
 
 CLEANFILES+=src/ui/gui/pspp.desktop
 
+src/ui/gui/resources.c: src/ui/gui/resources.xml
+	$(AM_V_at)$(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/src/ui/gui --generate-source $< --target=$@,out
+	$(AM_V_GEN)echo '#include <config.h>' > $@,tmp
+	cat $@,out >> $@,tmp
+	$(RM) $@,out
+	mv $@,tmp $@
+
 src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
 	$(AM_V_GEN)echo '#include <config.h>' > $@
 	$(AM_V_at)$(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@
@@ -381,9 +380,11 @@ desktop_DATA = src/ui/gui/pspp.desktop
 appdatadir = $(datadir)/appdata
 dist_appdata_DATA = src/ui/gui/pspp.appdata.xml
 
-BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h
+BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h src/ui/gui/resources.c
+
 CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \
-	$(nodist_src_ui_gui_psppire_DATA)
+	src/ui/gui/resources.c $(nodist_src_ui_gui_psppire_DATA) 
+
 include $(top_srcdir)/src/ui/gui/efficient-sheet.mk
 endif HAVE_GUI
 
@@ -392,7 +393,7 @@ installcheck-local:
 	DISPLAY=/invalid/port $(MAKE) $(AM_MAKEFLAGS) installcheck-binPROGRAMS
 
 # <gtk/gtk.h> wrapper
-src_ui_gui_psppire_CPPFLAGS = $(AM_CPPFLAGS) -Isrc/ui/gui/include
+src_ui_gui_psppire_CPPFLAGS += $(AM_CPPFLAGS) -Isrc/ui/gui/include
 BUILT_SOURCES += src/ui/gui/include/gtk/gtk.h
 src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
 	@$(MKDIR_P) src/ui/gui/include/gtk
@@ -406,7 +407,7 @@ src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
 	} > $@-t && \
 	mv $@-t $@
 CLEANFILES += src/ui/gui/include/gtk/gtk.h
-EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h
+EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h src/ui/gui/resources.xml
 
 include $(top_srcdir)/src/ui/gui/icons/automake.mk