X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=e991eb2e47532e125c5151467f4ade270cc5249e;hb=a74cf2a2c1391eae93cba8cbe6772cc3b8013193;hp=d9fa465b937d2c3cbcf0fa151a84342f99050e34;hpb=83239cbb53294662025d5ee957d7e24e5feb66a9;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index d9fa465b93..e991eb2e47 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 \
@@ -48,13 +47,12 @@ 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
 
 
 $(top_srcdir)/doc/help-pages-list: $(UI_FILES)
-	 cat $^ | grep '"help[-_]page"' | \
+	 $(AM_V_GEN)cat $^ | grep '"help[-_]page"' | \
    $(SED) -e 's% *<property name="help[-_]page">\([^<]*\)</property>%//*[@id='"'"'\1'"'"']%' \
 	-e 's%#%'"'"']/*[@id='"'"'%g' > $@
 
@@ -63,8 +61,6 @@ 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
@@ -142,8 +138,7 @@ src_ui_gui_psppire_SOURCES = \
 	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 \
@@ -151,8 +146,6 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-import-assistant.h \
 	src/ui/gui/builder-wrapper.c \
 	src/ui/gui/builder-wrapper.h \
-	src/ui/gui/comments-dialog.c \
-	src/ui/gui/comments-dialog.h \
 	src/ui/gui/dialog-common.c \
 	src/ui/gui/dialog-common.h \
 	src/ui/gui/dict-display.h \
@@ -175,7 +168,6 @@ src_ui_gui_psppire_SOURCES = \
 	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 \
@@ -205,6 +197,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-dialog-action-chisquare.h \
 	src/ui/gui/psppire-dialog-action-compute.c \
 	src/ui/gui/psppire-dialog-action-compute.h \
+	src/ui/gui/psppire-dialog-action-comments.c \
+	src/ui/gui/psppire-dialog-action-comments.h \
 	src/ui/gui/psppire-dialog-action-count.c \
 	src/ui/gui/psppire-dialog-action-count.h \
 	src/ui/gui/psppire-dialog-action-correlation.c \
@@ -239,6 +233,12 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-dialog-action-paired.h \
 	src/ui/gui/psppire-dialog-action-rank.c \
 	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 \
@@ -251,6 +251,10 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-dialog-action-scatterplot.h \
 	src/ui/gui/psppire-dialog-action-sort.c \
 	src/ui/gui/psppire-dialog-action-sort.h \
+	src/ui/gui/psppire-dialog-action-select.c \
+	src/ui/gui/psppire-dialog-action-select.h \
+	src/ui/gui/psppire-dialog-action-split.c \
+	src/ui/gui/psppire-dialog-action-split.h \
 	src/ui/gui/psppire-dialog-action-tt1s.c \
 	src/ui/gui/psppire-dialog-action-tt1s.h \
 	src/ui/gui/psppire-dialog-action-two-sample.c \
@@ -259,6 +263,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-dialog-action-univariate.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-weight.c \
+	src/ui/gui/psppire-dialog-action-weight.h \
 	src/ui/gui/psppire-dict.c \
 	src/ui/gui/psppire-dict.h \
 	src/ui/gui/psppire-dictview.c \
@@ -269,7 +275,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,19 +301,12 @@ 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-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/recode-dialog.c \
-	src/ui/gui/recode-dialog.h \
-	src/ui/gui/select-cases-dialog.c \
-	src/ui/gui/select-cases-dialog.h \
-	src/ui/gui/split-file-dialog.c \
-	src/ui/gui/split-file-dialog.h \
 	src/ui/gui/t-test-options.c \
 	src/ui/gui/t-test-options.h \
 	src/ui/gui/val-labs-dialog.c \
@@ -317,12 +315,12 @@ 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/weight-cases-dialog.c \
-	src/ui/gui/weight-cases-dialog.h \
 	src/ui/gui/widget-io.c \
 	src/ui/gui/widget-io.h \
 	src/ui/gui/widgets.c \
-	src/ui/gui/widgets.h
+	src/ui/gui/widgets.h \
+	src/ui/gui/windows-menu.c \
+	src/ui/gui/windows-menu.h
 
 
 OBSOLETE = \
@@ -344,7 +342,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 \
@@ -365,6 +364,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 $? >> $@
@@ -378,9 +384,10 @@ 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)
 endif HAVE_GUI
 
 #ensure the installcheck passes even if there is no X server available
@@ -402,7 +409,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