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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 63084c5e31..d9fa465b93 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -53,10 +53,11 @@ UI_FILES = \
 	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
 
 
@@ -146,10 +147,8 @@ 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 \
@@ -192,6 +191,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 \
@@ -306,20 +309,6 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/select-cases-dialog.h \
 	src/ui/gui/split-file-dialog.c \
 	src/ui/gui/split-file-dialog.h \
-	src/ui/gui/page-assistant.c \
-	src/ui/gui/page-intro.c \
-	src/ui/gui/page-intro.h \
-	src/ui/gui/page-file.c \
-	src/ui/gui/page-first-line.c \
-	src/ui/gui/page-first-line.h \
-	src/ui/gui/page-formats.c \
-	src/ui/gui/page-formats.h \
-	src/ui/gui/page-separators.c \
-	src/ui/gui/page-separators.h \
-	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 \
@@ -335,6 +324,24 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/widgets.c \
 	src/ui/gui/widgets.h
 
+
+OBSOLETE = \
+	src/ui/gui/page-assistant.c \
+	src/ui/gui/page-intro.c \
+	src/ui/gui/page-intro.h \
+	src/ui/gui/page-file.c \
+	src/ui/gui/page-first-line.c \
+	src/ui/gui/page-first-line.h \
+	src/ui/gui/page-formats.c \
+	src/ui/gui/page-formats.h \
+	src/ui/gui/page-separators.c \
+	src/ui/gui/page-separators.h \
+	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
+
+
 nodist_src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-marshal.c \
 	src/ui/gui/psppire-marshal.h
@@ -387,7 +394,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' \