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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index ad581e8b03..0200348656 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)
+	 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,10 +147,6 @@ 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/builder-wrapper.c \
 	src/ui/gui/builder-wrapper.h \
 	src/ui/gui/comments-dialog.c \
@@ -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 \
@@ -385,7 +388,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' \