X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=a88e8e733dc5353602a43752276ca3d6a0c9e891;hb=0cd7c010e3e5c316ef0eb0317fb7f408d164679d;hp=ad581e8b034bbb419efc0bb2069cab11820d791f;hpb=612b51515e356bc4dd625a3fb18d0a4f827a1e2c;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index ad581e8b03..a88e8e733d 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -8,6 +8,7 @@ UI_FILES = \
 	src/ui/gui/barchart.ui \
 	src/ui/gui/correlation.ui \
 	src/ui/gui/count.ui \
+	src/ui/gui/comments.ui \
 	src/ui/gui/crosstabs.ui \
 	src/ui/gui/chi-square.ui \
 	src/ui/gui/data-sheet.ui \
@@ -28,7 +29,6 @@ UI_FILES = \
 	src/ui/gui/missing-val-dialog.ui \
 	src/ui/gui/oneway.ui \
 	src/ui/gui/paired-samples.ui \
-	src/ui/gui/psppire.ui \
 	src/ui/gui/rank.ui \
 	src/ui/gui/runs.ui \
 	src/ui/gui/sort.ui \
@@ -41,6 +41,7 @@ UI_FILES = \
 	src/ui/gui/select-cases.ui \
 	src/ui/gui/t-test.ui \
 	src/ui/gui/text-data-import.ui \
+	src/ui/gui/transpose.ui \
 	src/ui/gui/univariate.ui \
 	src/ui/gui/val-labs-dialog.ui \
 	src/ui/gui/variable-info.ui \
@@ -48,13 +49,15 @@ UI_FILES = \
 	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/var-type-dialog.ui \
+	src/ui/gui/weight.ui
 
 
-$(srcdir)/doc/help-pages-list: $(UI_FILES)
-	 cat $^ | grep '"help-page"' | \
-   sed -e 's% *<property name="help-page">\([^<]*\)</property>%//*[@id='"'"'\1'"'"']%' \
+$(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' > $@
+
 EXTRA_DIST += doc/help-pages-list
 
 
@@ -144,14 +147,10 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-scanf.c \
 	src/ui/gui/psppire-scanf.h \
 	src/ui/gui/psppire-acr.c \
-	src/ui/gui/autorecode-dialog.c \
-	src/ui/gui/autorecode-dialog.h \
-	src/ui/gui/aggregate-dialog.c \
-	src/ui/gui/aggregate-dialog.h \
+	src/ui/gui/psppire-import-assistant.c \
+	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 \
@@ -190,6 +189,10 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-dialog.h \
 	src/ui/gui/psppire-dialog-action.c \
 	src/ui/gui/psppire-dialog-action.h \
+	src/ui/gui/psppire-dialog-action-aggregate.c \
+	src/ui/gui/psppire-dialog-action-aggregate.h \
+	src/ui/gui/psppire-dialog-action-autorecode.c \
+	src/ui/gui/psppire-dialog-action-autorecode.h \
 	src/ui/gui/psppire-dialog-action-1sks.c \
 	src/ui/gui/psppire-dialog-action-1sks.h \
 	src/ui/gui/psppire-dialog-action-barchart.c \
@@ -200,6 +203,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 \
@@ -234,6 +239,8 @@ 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-regression.c \
 	src/ui/gui/psppire-dialog-action-regression.h \
 	src/ui/gui/psppire-dialog-action-reliability.c \
@@ -246,6 +253,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 \
@@ -254,6 +265,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 \
@@ -298,12 +311,23 @@ src_ui_gui_psppire_SOURCES = \
 	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 \
+	src/ui/gui/val-labs-dialog.h \
+	src/ui/gui/var-display.c \
+	src/ui/gui/var-display.h \
+	src/ui/gui/var-type-dialog.c \
+	src/ui/gui/var-type-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/windows-menu.c \
+	src/ui/gui/windows-menu.h
+
+
+OBSOLETE = \
 	src/ui/gui/page-assistant.c \
 	src/ui/gui/page-intro.c \
 	src/ui/gui/page-intro.h \
@@ -317,21 +341,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/page-sheet-spec.c \
 	src/ui/gui/page-sheet-spec.h \
 	src/ui/gui/text-data-import-dialog.c \
-	src/ui/gui/text-data-import-dialog.h \
-	src/ui/gui/t-test-options.c \
-	src/ui/gui/t-test-options.h \
-	src/ui/gui/val-labs-dialog.c \
-	src/ui/gui/val-labs-dialog.h \
-	src/ui/gui/var-display.c \
-	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/text-data-import-dialog.h
+
 
 nodist_src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-marshal.c \
@@ -385,7 +396,7 @@ src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
 	@$(MKDIR_P) src/ui/gui/include/gtk
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  $(SED) -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_GTK_GTK_H''@|$(NEXT_GTK_GTK_H)|g' \