projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Autorecode Dialog: Convert from add hoc to PsppireDialogAction
[pspp]
/
src
/
ui
/
gui
/
automake.mk
diff --git
a/src/ui/gui/automake.mk
b/src/ui/gui/automake.mk
index 63084c5e31b120262cd58247fe71dc710002a6b0..0200348656aa3cec6dba9b7b121a23c92a0d1830 100644
(file)
--- a/
src/ui/gui/automake.mk
+++ b/
src/ui/gui/automake.mk
@@
-53,10
+53,11
@@
UI_FILES = \
src/ui/gui/weight.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' > $@
-e 's%#%'"'"']/*[@id='"'"'%g' > $@
+
EXTRA_DIST += doc/help-pages-list
EXTRA_DIST += doc/help-pages-list
@@
-146,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/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 \
src/ui/gui/builder-wrapper.c \
src/ui/gui/builder-wrapper.h \
src/ui/gui/comments-dialog.c \
@@
-192,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.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 \
src/ui/gui/psppire-dialog-action-1sks.c \
src/ui/gui/psppire-dialog-action-1sks.h \
src/ui/gui/psppire-dialog-action-barchart.c \
@@
-387,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! */'; \
@$(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' \
-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' \