Replace "sed" with "$(SED)" in Makefiles

[pspp] / src / ui / gui / automake.mk

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 7f4d474f6bf6dcea223f92ae33b747698df791ac..afae3aec3e488dc76e7cbec974d61d9e2fe76215 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -5,8 +5,10 @@ UI_FILES = \
        src/ui/gui/autorecode.ui \
        src/ui/gui/binomial.ui \
        src/ui/gui/compute.ui \
+       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 \
@@ -17,6 +19,7 @@ UI_FILES = \
        src/ui/gui/factor.ui \
        src/ui/gui/find.ui \
        src/ui/gui/frequencies.ui \
+       src/ui/gui/histogram.ui \
        src/ui/gui/indep-samples.ui \
        src/ui/gui/k-means.ui \
        src/ui/gui/k-related.ui \
@@ -26,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 \
@@ -35,9 +37,11 @@ UI_FILES = \
        src/ui/gui/regression.ui \
        src/ui/gui/reliability.ui \
        src/ui/gui/roc.ui \
+       src/ui/gui/scatterplot.ui \
        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 \
@@ -45,9 +49,20 @@ 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
+
+
+$(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
+
 
 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 \
@@ -57,10 +72,10 @@ EXTRA_DIST += \
 
 if HAVE_GUI
 bin_PROGRAMS += src/ui/gui/psppire 
-noinst_PROGRAMS += src/ui/gui/spreadsheet-test
+noinst_PROGRAMS += src/ui/gui/spreadsheet-test 
 
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
-src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 
+src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 
 
 
 src_ui_gui_psppire_LDFLAGS = \
@@ -96,7 +111,6 @@ src_ui_gui_spreadsheet_test_LDADD = \
 
 src_ui_gui_spreadsheet_test_SOURCES = src/ui/gui/spreadsheet-test.c src/ui/gui/psppire-spreadsheet-model.c
 
-
 src_ui_gui_psppiredir = $(pkgdatadir)
 
 
@@ -181,6 +195,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-dialog-action.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-barchart.h \
        src/ui/gui/psppire-dialog-action-binomial.c \
        src/ui/gui/psppire-dialog-action-binomial.h \
        src/ui/gui/psppire-dialog-action-chisquare.c \
@@ -203,6 +219,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-dialog-action-flip.h \
        src/ui/gui/psppire-dialog-action-frequencies.c \
        src/ui/gui/psppire-dialog-action-frequencies.h \
+       src/ui/gui/psppire-dialog-action-histogram.c \
+       src/ui/gui/psppire-dialog-action-histogram.h \
        src/ui/gui/psppire-dialog-action-indep-samps.c \
        src/ui/gui/psppire-dialog-action-indep-samps.h \
        src/ui/gui/psppire-dialog-action-kmeans.c \
@@ -227,6 +245,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-dialog-action-roc.h \
        src/ui/gui/psppire-dialog-action-runs.c \
        src/ui/gui/psppire-dialog-action-runs.h \
+       src/ui/gui/psppire-dialog-action-scatterplot.c \
+       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-tt1s.c \
@@ -368,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' \