From a19b858e0ac3c69e4a28c0ca6d8674427268a863 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Wed, 15 Mar 2006 03:29:10 +0000 Subject: [PATCH] Changed include paths to be explicitly specified in the #include directive. --- lib/gsl-extras/automake.mk | 2 - lib/gtksheet/automake.mk | 3 -- lib/linreg/automake.mk | 6 --- po/en_GB.po | 24 +++++----- po/pspp.pot | 24 +++++----- src/data/any-reader.c | 4 +- src/data/any-writer.c | 4 +- src/data/automake.mk | 2 - src/data/case.c | 4 +- src/data/case.h | 2 +- src/data/casefile.c | 8 ++-- src/data/category.c | 5 +- src/data/data-in.c | 14 +++--- src/data/data-out.c | 14 +++--- src/data/dictionary.c | 14 +++--- src/data/file-handle-def.c | 10 ++-- src/data/filename.c | 12 ++--- src/data/format.c | 8 ++-- src/data/make-file.c | 4 +- src/data/missing-values.c | 2 +- src/data/por-file-reader.c | 18 ++++---- src/data/por-file-writer.c | 18 ++++---- src/data/scratch-reader.c | 2 +- src/data/sfm-private.h | 4 +- src/data/sys-file-reader.c | 16 +++---- src/data/sys-file-writer.c | 18 ++++---- src/data/value-labels.c | 10 ++-- src/data/variable.c | 12 ++--- src/language/automake.mk | 5 -- src/language/command.c | 26 +++++------ src/language/control/automake.mk | 5 -- src/language/control/control-stack.c | 4 +- src/language/control/do-if.c | 22 +++++---- src/language/control/loop.c | 28 +++++------ src/language/control/repeat.c | 26 +++++------ src/language/control/temporary.c | 20 ++++---- src/language/data-io/automake.mk | 8 ---- src/language/data-io/data-list.c | 40 ++++++++-------- src/language/data-io/data-list.h | 4 +- src/language/data-io/data-reader.c | 24 +++++----- src/language/data-io/data-writer.c | 12 ++--- src/language/data-io/file-handle.h | 2 +- src/language/data-io/file-handle.q | 24 +++++----- src/language/data-io/file-type.c | 28 +++++------ src/language/data-io/get.c | 44 +++++++++--------- src/language/data-io/inpt-pgm.c | 34 +++++++------- src/language/data-io/list.q | 36 +++++++-------- src/language/data-io/matrix-data.c | 36 +++++++-------- src/language/data-io/print.c | 28 +++++------ src/language/dictionary/apply-dictionary.c | 22 ++++----- src/language/dictionary/automake.mk | 7 --- src/language/dictionary/formats.c | 14 +++--- src/language/dictionary/missing-values.c | 20 ++++---- src/language/dictionary/modify-variables.c | 28 +++++------ src/language/dictionary/numeric.c | 16 +++---- src/language/dictionary/rename-variables.c | 18 ++++---- src/language/dictionary/split-file.c | 14 +++--- src/language/dictionary/sys-file-info.c | 34 +++++++------- src/language/dictionary/value-labels.c | 16 +++---- src/language/dictionary/variable-display.c | 16 +++---- src/language/dictionary/variable-label.c | 14 +++--- src/language/dictionary/vector.c | 18 ++++---- src/language/dictionary/weight.c | 14 +++--- src/language/expressions/automake.mk | 23 ++++----- src/language/expressions/evaluate.c | 10 ++-- src/language/expressions/helpers.c | 2 +- src/language/expressions/helpers.h | 30 ++++++------ src/language/expressions/optimize.c | 16 +++---- src/language/expressions/parse.c | 24 +++++----- src/language/expressions/private.h | 4 +- src/language/lexer/automake.mk | 6 --- src/language/lexer/format-parser.c | 12 ++--- src/language/lexer/lexer.c | 16 +++---- src/language/lexer/lexer.h | 4 +- src/language/lexer/q2c.c | 26 +++++------ src/language/lexer/range-parser.c | 10 ++-- src/language/lexer/variable-parser.c | 18 ++++---- src/language/line-buffer.c | 24 +++++----- src/language/line-buffer.h | 2 +- src/language/stats/aggregate.c | 38 +++++++-------- src/language/stats/automake.mk | 10 ---- src/language/stats/autorecode.c | 26 +++++------ src/language/stats/correlations.q | 16 +++---- src/language/stats/crosstabs.q | 40 ++++++++-------- src/language/stats/descriptives.c | 32 ++++++------- src/language/stats/examine.q | 52 ++++++++++----------- src/language/stats/flip.c | 30 ++++++------ src/language/stats/frequencies.q | 54 +++++++++++----------- src/language/stats/means.q | 20 ++++---- src/language/stats/oneway.q | 42 ++++++++--------- src/language/stats/rank.q | 10 ++-- src/language/stats/regression.q | 40 ++++++++-------- src/language/stats/sort-cases.c | 14 +++--- src/language/stats/sort-criteria.c | 14 +++--- src/language/stats/t-test.q | 40 ++++++++-------- src/language/tests/automake.mk | 8 ---- src/language/tests/casefile-test.c | 8 ++-- src/language/tests/moments-test.c | 6 +-- src/language/tests/pool-test.c | 4 +- src/language/utilities/automake.mk | 8 ---- src/language/utilities/date.c | 6 +-- src/language/utilities/echo.c | 14 +++--- src/language/utilities/include.c | 12 ++--- src/language/utilities/permissions.c | 14 +++--- src/language/utilities/set.q | 32 ++++++------- src/language/utilities/title.c | 22 ++++----- src/language/xforms/automake.mk | 6 --- src/language/xforms/compute.c | 22 ++++----- src/language/xforms/count.c | 24 +++++----- src/language/xforms/recode.c | 28 +++++------ src/language/xforms/sample.c | 18 ++++---- src/language/xforms/select-if.c | 16 +++---- src/libpspp/automake.mk | 5 +- src/math/automake.mk | 6 --- src/math/design-matrix.c | 9 ++-- src/math/design-matrix.h | 4 +- src/math/factor-stats.c | 8 ++-- src/math/factor-stats.h | 4 +- src/math/group.c | 12 ++--- src/math/group.h | 2 +- src/math/levene.c | 20 ++++---- src/math/levene.h | 4 +- src/math/linreg/automake.mk | 6 --- src/math/linreg/coefficient.c | 4 +- src/math/linreg/coefficient.h | 2 +- src/math/linreg/linreg.c | 6 +-- src/math/moments.c | 6 +-- src/math/moments.h | 2 +- src/math/percentiles.c | 4 +- src/math/percentiles.h | 2 +- src/math/sort.c | 24 +++++----- src/message.c | 16 +++---- src/output/ascii.c | 18 ++++---- src/output/automake.mk | 15 ++---- src/output/chart.c | 4 +- src/output/chart.h | 6 +-- src/output/charts/automake.mk | 6 --- src/output/charts/barchart.c | 6 +-- src/output/charts/barchart.h | 2 +- src/output/charts/box-whisker.c | 15 +++--- src/output/charts/box-whisker.h | 2 + src/output/charts/cartesian.c | 10 ++-- src/output/charts/dummy-chart.c | 8 ++-- src/output/charts/piechart.c | 19 +++++--- src/output/charts/plot-chart.c | 20 +++++--- src/output/charts/plot-chart.h | 13 +++--- src/output/charts/plot-hist.c | 12 +++-- src/output/groff-font.c | 18 ++++---- src/output/html.c | 14 +++--- src/output/htmlP.h | 2 +- src/output/manager.c | 4 +- src/output/output.c | 14 +++--- src/output/output.h | 6 ++- src/output/postscript.c | 20 ++++---- src/output/table.c | 18 ++++---- src/output/table.h | 2 +- src/procedure.c | 34 +++++++------- src/ui/gui/automake.mk | 9 ---- src/ui/gui/data-sheet.c | 10 ++-- src/ui/gui/data-sheet.h | 6 +-- src/ui/gui/helper.c | 4 +- src/ui/gui/helper.h | 4 +- src/ui/gui/menu-actions.c | 9 ++-- src/ui/gui/message-dialog.c | 2 +- src/ui/gui/message-dialog.h | 2 +- src/ui/gui/missing-val-dialog.c | 6 +-- src/ui/gui/missing-val-dialog.h | 2 +- src/ui/gui/psppire-case-array.c | 5 +- src/ui/gui/psppire-data-store.c | 18 ++++---- src/ui/gui/psppire-data-store.h | 2 +- src/ui/gui/psppire-dict.c | 10 ++-- src/ui/gui/psppire-dict.h | 4 +- src/ui/gui/psppire-var-store.c | 10 ++-- src/ui/gui/psppire-var-store.h | 2 +- src/ui/gui/psppire-variable.c | 6 +-- src/ui/gui/psppire-variable.h | 2 +- src/ui/gui/val-labs-dialog.c | 2 +- src/ui/gui/var-sheet.c | 10 ++-- src/ui/gui/var-sheet.h | 2 +- src/ui/gui/var-type-dialog.c | 4 +- src/ui/gui/var-type-dialog.h | 2 +- src/ui/terminal/automake.mk | 9 ---- src/ui/terminal/command-line.c | 20 ++++---- src/ui/terminal/main.c | 28 +++++------ src/ui/terminal/read-line.c | 16 +++---- src/ui/terminal/read-line.h | 2 +- 186 files changed, 1236 insertions(+), 1330 deletions(-) diff --git a/lib/gsl-extras/automake.mk b/lib/gsl-extras/automake.mk index cf6cfc0887..7d1ed62b26 100644 --- a/lib/gsl-extras/automake.mk +++ b/lib/gsl-extras/automake.mk @@ -2,8 +2,6 @@ noinst_LIBRARIES += lib/gsl-extras/libgsl-extras.a -lib/gsl_extras/%: AM_CPPFLAGS = -I$(top_srcdir) - lib_gsl_extras_libgsl_extras_a_SOURCES = \ lib/gsl-extras/betadistinv.c lib/gsl-extras/binomial.c lib/gsl-extras/geometric.c \ lib/gsl-extras/hypergeometric.c lib/gsl-extras/negbinom.c lib/gsl-extras/poisson.c lib/gsl-extras/gsl-extras.h diff --git a/lib/gtksheet/automake.mk b/lib/gtksheet/automake.mk index 0aa3d78494..150bdaf85a 100644 --- a/lib/gtksheet/automake.mk +++ b/lib/gtksheet/automake.mk @@ -2,9 +2,6 @@ noinst_LIBRARIES += lib/gtksheet/libgtksheet.a -lib/gtksheet/%: AM_CPPFLAGS = \ - -I$(top_builddir)/lib/gtksheet - lib/gtksheet/%: AM_CFLAGS = $(GTK_CFLAGS) -Wall diff --git a/lib/linreg/automake.mk b/lib/linreg/automake.mk index 4bf19d3760..d65df864a7 100644 --- a/lib/linreg/automake.mk +++ b/lib/linreg/automake.mk @@ -2,11 +2,5 @@ noinst_LIBRARIES += lib/linreg/liblinreg.a -lib/linreg/%: AM_CPPFLAGS = -I$(top_srcdir) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/libpspp \ - -I$(top_srcdir)/src/data - - lib_linreg_liblinreg_a_SOURCES = \ lib/linreg/sweep.c lib/linreg/sweep.h diff --git a/po/en_GB.po b/po/en_GB.po index a37a1e48f0..0ce5373933 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PSPP 0.3.1\n" "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 2006-03-13 15:48+0800\n" +"POT-Creation-Date: 2006-03-14 15:35+0800\n" "PO-Revision-Date: 2004-01-23 13:04+0800\n" "Last-Translator: John Darrington \n" "Language-Team: John Darrington \n" @@ -1086,7 +1086,7 @@ msgstr "" msgid "This command cannot appear outside %s...%s." msgstr "" -#: src/language/control/do-if.c:169 +#: src/language/control/do-if.c:171 msgid "This command may not follow ELSE in DO IF...END IF." msgstr "" @@ -3501,7 +3501,7 @@ msgstr "" msgid "Cum" msgstr "" -#: src/language/stats/frequencies.q:1147 src/output/charts/plot-hist.c:127 +#: src/language/stats/frequencies.q:1147 src/output/charts/plot-hist.c:129 msgid "Frequency" msgstr "" @@ -4274,7 +4274,7 @@ msgstr "" msgid "Charts are unsupported with ascii drivers." msgstr "" -#: src/output/charts/plot-hist.c:125 +#: src/output/charts/plot-hist.c:127 msgid "HISTOGRAM" msgstr "" @@ -4784,35 +4784,35 @@ msgid "" "bad box: (%d+%d=%d,%d+%d=%d)-(%d+%d=%d,%d+%d=%d) in table size (%d,%d)\n" msgstr "" -#: src/ui/gui/menu-actions.c:57 +#: src/ui/gui/menu-actions.c:58 msgid "Untitled" msgstr "" -#: src/ui/gui/menu-actions.c:59 +#: src/ui/gui/menu-actions.c:60 msgid "PSPP Data Editor" msgstr "" -#: src/ui/gui/menu-actions.c:104 +#: src/ui/gui/menu-actions.c:105 msgid "Open" msgstr "" -#: src/ui/gui/menu-actions.c:113 +#: src/ui/gui/menu-actions.c:114 msgid "System Files (*.sav)" msgstr "" -#: src/ui/gui/menu-actions.c:119 +#: src/ui/gui/menu-actions.c:120 msgid "Portable Files (*.por) " msgstr "" -#: src/ui/gui/menu-actions.c:125 +#: src/ui/gui/menu-actions.c:126 msgid "All Files" msgstr "" -#: src/ui/gui/menu-actions.c:222 +#: src/ui/gui/menu-actions.c:223 msgid "Save Data As" msgstr "" -#: src/ui/gui/menu-actions.c:458 +#: src/ui/gui/menu-actions.c:459 msgid "Font Selection" msgstr "" diff --git a/po/pspp.pot b/po/pspp.pot index a130460a07..cfadc3efbc 100644 --- a/po/pspp.pot +++ b/po/pspp.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 2006-03-13 15:48+0800\n" +"POT-Creation-Date: 2006-03-14 15:35+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1087,7 +1087,7 @@ msgstr "" msgid "This command cannot appear outside %s...%s." msgstr "" -#: src/language/control/do-if.c:169 +#: src/language/control/do-if.c:171 msgid "This command may not follow ELSE in DO IF...END IF." msgstr "" @@ -3502,7 +3502,7 @@ msgstr "" msgid "Cum" msgstr "" -#: src/language/stats/frequencies.q:1147 src/output/charts/plot-hist.c:127 +#: src/language/stats/frequencies.q:1147 src/output/charts/plot-hist.c:129 msgid "Frequency" msgstr "" @@ -4275,7 +4275,7 @@ msgstr "" msgid "Charts are unsupported with ascii drivers." msgstr "" -#: src/output/charts/plot-hist.c:125 +#: src/output/charts/plot-hist.c:127 msgid "HISTOGRAM" msgstr "" @@ -4785,35 +4785,35 @@ msgid "" "bad box: (%d+%d=%d,%d+%d=%d)-(%d+%d=%d,%d+%d=%d) in table size (%d,%d)\n" msgstr "" -#: src/ui/gui/menu-actions.c:57 +#: src/ui/gui/menu-actions.c:58 msgid "Untitled" msgstr "" -#: src/ui/gui/menu-actions.c:59 +#: src/ui/gui/menu-actions.c:60 msgid "PSPP Data Editor" msgstr "" -#: src/ui/gui/menu-actions.c:104 +#: src/ui/gui/menu-actions.c:105 msgid "Open" msgstr "" -#: src/ui/gui/menu-actions.c:113 +#: src/ui/gui/menu-actions.c:114 msgid "System Files (*.sav)" msgstr "" -#: src/ui/gui/menu-actions.c:119 +#: src/ui/gui/menu-actions.c:120 msgid "Portable Files (*.por) " msgstr "" -#: src/ui/gui/menu-actions.c:125 +#: src/ui/gui/menu-actions.c:126 msgid "All Files" msgstr "" -#: src/ui/gui/menu-actions.c:222 +#: src/ui/gui/menu-actions.c:223 msgid "Save Data As" msgstr "" -#: src/ui/gui/menu-actions.c:458 +#: src/ui/gui/menu-actions.c:459 msgid "Font Selection" msgstr "" diff --git a/src/data/any-reader.c b/src/data/any-reader.c index 876d7fa56b..64f881e3e1 100644 --- a/src/data/any-reader.c +++ b/src/data/any-reader.c @@ -24,12 +24,12 @@ #include #include #include -#include "message.h" +#include #include "file-handle-def.h" #include "filename.h" #include "por-file-reader.h" #include "sys-file-reader.h" -#include "str.h" +#include #include "scratch-reader.h" #include "xalloc.h" diff --git a/src/data/any-writer.c b/src/data/any-writer.c index 93d2817019..c5d741a28a 100644 --- a/src/data/any-writer.c +++ b/src/data/any-writer.c @@ -24,12 +24,12 @@ #include #include #include -#include "message.h" +#include #include "file-handle-def.h" #include "filename.h" #include "por-file-writer.h" #include "sys-file-writer.h" -#include "str.h" +#include #include "scratch-writer.h" #include "xalloc.h" diff --git a/src/data/automake.mk b/src/data/automake.mk index 3a5192bb98..95507c82eb 100644 --- a/src/data/automake.mk +++ b/src/data/automake.mk @@ -1,7 +1,5 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- -src/data/%: AM_CPPFLAGS += -I$(top_srcdir)/src/libpspp - noinst_LIBRARIES += src/data/libdata.a src_data_libdata_a_SOURCES = \ diff --git a/src/data/case.c b/src/data/case.c index 8613eca6f1..eab966b186 100644 --- a/src/data/case.c +++ b/src/data/case.c @@ -22,8 +22,8 @@ #include #include #include "value.h" -#include "alloc.h" -#include "str.h" +#include +#include #include "variable.h" #ifdef DEBUGGING diff --git a/src/data/case.h b/src/data/case.h index e89cb44eb3..bdb68dc65b 100644 --- a/src/data/case.h +++ b/src/data/case.h @@ -91,7 +91,7 @@ void case_unshare (struct ccase *); #ifndef DEBUGGING #include -#include "str.h" +#include static inline void case_nullify (struct ccase *c) diff --git a/src/data/casefile.c b/src/data/casefile.c index ef900e53f2..0bbd3773e8 100644 --- a/src/data/casefile.c +++ b/src/data/casefile.c @@ -26,13 +26,13 @@ #include #include #include -#include "alloc.h" +#include #include "case.h" -#include "compiler.h" -#include "message.h" +#include +#include #include "full-read.h" #include "full-write.h" -#include "misc.h" +#include #include "make-file.h" #include "settings.h" #include "variable.h" diff --git a/src/data/category.c b/src/data/category.c index e48987a043..55d7ca8b05 100644 --- a/src/data/category.c +++ b/src/data/category.c @@ -33,9 +33,8 @@ */ #include #include -#include -#include "alloc.h" -#include "message.h" +#include +#include #include "category.h" #include "cat-routines.h" #include diff --git a/src/data/data-in.c b/src/data/data-in.c index aa8041d8a8..cc3a3e4077 100644 --- a/src/data/data-in.c +++ b/src/data/data-in.c @@ -19,7 +19,7 @@ #include #include "data-in.h" -#include "message.h" +#include #include #include #include @@ -27,20 +27,20 @@ #include #include #include -#include "message.h" +#include #include "calendar.h" -#include "compiler.h" +#include #include "identifier.h" -#include "magic.h" -#include "misc.h" +#include +#include #include "settings.h" -#include "str.h" +#include #include "variable.h" #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include /* Specialized error routine. */ diff --git a/src/data/data-out.c b/src/data/data-out.c index 7dfcc78539..79c7042446 100644 --- a/src/data/data-out.c +++ b/src/data/data-out.c @@ -18,26 +18,26 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include #include #include #include #include #include "calendar.h" -#include "message.h" +#include #include "format.h" -#include "magic.h" -#include "misc.h" -#include "misc.h" +#include +#include +#include #include "settings.h" -#include "str.h" +#include #include "variable.h" #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include /* Public functions. */ diff --git a/src/data/dictionary.c b/src/data/dictionary.c index 0edf228add..849e021062 100644 --- a/src/data/dictionary.c +++ b/src/data/dictionary.c @@ -21,17 +21,17 @@ #include "dictionary.h" #include #include -#include "array.h" -#include "alloc.h" +#include +#include #include "case.h" #include "category.h" #include "cat-routines.h" -#include "compiler.h" -#include "message.h" -#include "hash.h" -#include "misc.h" +#include +#include +#include +#include #include "settings.h" -#include "str.h" +#include #include "value-labels.h" #include "variable.h" diff --git a/src/data/file-handle-def.c b/src/data/file-handle-def.c index 5ece448698..66ee25f5f8 100644 --- a/src/data/file-handle-def.c +++ b/src/data/file-handle-def.c @@ -19,15 +19,15 @@ #include #include "file-handle-def.h" -#include "message.h" +#include #include #include #include -#include "alloc.h" -#include "compiler.h" +#include +#include #include "filename.h" -#include "message.h" -#include "magic.h" +#include +#include #include "variable.h" #include "scratch-handle.h" diff --git a/src/data/filename.c b/src/data/filename.c index 4bf5edd9c2..be8fddec8d 100644 --- a/src/data/filename.c +++ b/src/data/filename.c @@ -18,24 +18,24 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include "filename.h" #include #include #include #include -#include "alloc.h" +#include #include "intprops.h" -#include "message.h" -#include "str.h" +#include +#include #include "settings.h" -#include "version.h" +#include #include "xreadlink.h" #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include /* PORTME: Everything in this file is system dependent. */ diff --git a/src/data/format.c b/src/data/format.c index d3899b4399..5b9b76569d 100644 --- a/src/data/format.c +++ b/src/data/format.c @@ -20,12 +20,12 @@ #include #include "format.h" #include -#include "message.h" +#include #include -#include "compiler.h" -#include "misc.h" +#include +#include #include "identifier.h" -#include "str.h" +#include #include "variable.h" #include "gettext.h" diff --git a/src/data/make-file.c b/src/data/make-file.c index ed94f04c4a..1d32d07e39 100644 --- a/src/data/make-file.c +++ b/src/data/make-file.c @@ -25,8 +25,8 @@ #include #include "filename.h" #include "make-file.h" -#include "message.h" -#include "alloc.h" +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/data/missing-values.c b/src/data/missing-values.c index 6940c6cf12..fabf98b70d 100644 --- a/src/data/missing-values.c +++ b/src/data/missing-values.c @@ -21,7 +21,7 @@ #include "missing-values.h" #include #include -#include "str.h" +#include /* Initializes MV as a set of missing values for a variable of diff --git a/src/data/por-file-reader.c b/src/data/por-file-reader.c index 1ee598873e..900f629852 100644 --- a/src/data/por-file-reader.c +++ b/src/data/por-file-reader.c @@ -21,7 +21,7 @@ #include #include "por-file-reader.h" -#include "message.h" +#include #include #include #include @@ -29,25 +29,25 @@ #include #include #include -#include "alloc.h" +#include #include #include "case.h" -#include "compiler.h" +#include #include "dictionary.h" #include "file-handle-def.h" #include "format.h" -#include "hash.h" -#include "magic.h" -#include "misc.h" -#include "pool.h" -#include "str.h" +#include +#include +#include +#include +#include #include "value-labels.h" #include "variable.h" #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include /* portable_to_local[PORTABLE] translates the given portable character into the local character set. */ diff --git a/src/data/por-file-writer.c b/src/data/por-file-writer.c index 5d6d1efabd..c7c7dd2f21 100644 --- a/src/data/por-file-writer.c +++ b/src/data/por-file-writer.c @@ -19,7 +19,7 @@ #include #include "por-file-writer.h" -#include "message.h" +#include #include #include #include @@ -30,24 +30,24 @@ #include #include #include -#include "alloc.h" +#include #include "case.h" #include "dictionary.h" -#include "message.h" +#include #include "file-handle-def.h" -#include "hash.h" -#include "magic.h" -#include "misc.h" +#include +#include +#include #include "stat-macros.h" -#include "str.h" +#include #include "value-labels.h" #include "variable.h" -#include "version.h" +#include #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include /* Portable file writer. */ struct pfm_writer diff --git a/src/data/scratch-reader.c b/src/data/scratch-reader.c index 2067897e11..e329d1c818 100644 --- a/src/data/scratch-reader.c +++ b/src/data/scratch-reader.c @@ -22,7 +22,7 @@ #include #include "casefile.h" #include "dictionary.h" -#include "message.h" +#include #include "file-handle-def.h" #include "scratch-handle.h" #include "xalloc.h" diff --git a/src/data/sfm-private.h b/src/data/sfm-private.h index caf7770df4..3864ca39e3 100644 --- a/src/data/sfm-private.h +++ b/src/data/sfm-private.h @@ -20,7 +20,7 @@ /* PORTME: There might easily be alignment problems with some of these structures. */ -#include "compiler.h" +#include #include "variable.h" /* This attribute might avoid some problems. On the other hand... */ @@ -58,7 +58,7 @@ #endif /* Figure out SYSMIS value for flt64. */ -#include "magic.h" +#include #if SIZEOF_DOUBLE == 8 #define second_lowest_flt64 second_lowest_value #else diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c index 71fd6814ba..0a85cffa4c 100644 --- a/src/data/sys-file-reader.c +++ b/src/data/sys-file-reader.c @@ -20,30 +20,30 @@ #include #include "sys-file-reader.h" #include "sfm-private.h" -#include "message.h" +#include #include #include #include #include #include -#include "alloc.h" +#include #include "case.h" -#include "compiler.h" +#include #include "dictionary.h" -#include "message.h" +#include #include "file-handle-def.h" #include "filename.h" #include "format.h" -#include "magic.h" -#include "misc.h" +#include +#include #include "value-labels.h" -#include "str.h" +#include #include "variable.h" #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include /* System file reader. */ struct sfm_reader diff --git a/src/data/sys-file-writer.c b/src/data/sys-file-writer.c index 578bd9896c..823d0c47e2 100644 --- a/src/data/sys-file-writer.c +++ b/src/data/sys-file-writer.c @@ -20,7 +20,7 @@ #include #include "sys-file-writer.h" #include "sfm-private.h" -#include "message.h" +#include #include #include #include @@ -30,25 +30,25 @@ #if HAVE_UNISTD_H #include /* Required by SunOS4. */ #endif -#include "alloc.h" +#include #include "case.h" #include "dictionary.h" -#include "message.h" +#include #include "file-handle-def.h" -#include "hash.h" -#include "magic.h" -#include "misc.h" +#include +#include +#include #include "settings.h" #include "stat-macros.h" -#include "str.h" +#include #include "value-labels.h" #include "variable.h" -#include "version.h" +#include #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include /* Compression bias used by PSPP. Values between (1 - COMPRESSION_BIAS) and (251 - COMPRESSION_BIAS) inclusive can be diff --git a/src/data/value-labels.c b/src/data/value-labels.c index dc18a707f6..1e83463c2a 100644 --- a/src/data/value-labels.c +++ b/src/data/value-labels.c @@ -19,12 +19,12 @@ #include #include "value-labels.h" -#include "message.h" +#include #include -#include "alloc.h" -#include "compiler.h" -#include "hash.h" -#include "str.h" +#include +#include +#include +#include static hsh_compare_func compare_int_val_lab; static hsh_hash_func hash_int_val_lab; diff --git a/src/data/variable.c b/src/data/variable.c index 30ef24caa6..78f0cb443a 100644 --- a/src/data/variable.c +++ b/src/data/variable.c @@ -19,15 +19,15 @@ #include #include "variable.h" -#include "message.h" +#include #include -#include "alloc.h" -#include "compiler.h" +#include +#include #include "dictionary.h" -#include "hash.h" +#include #include "identifier.h" -#include "misc.h" -#include "str.h" +#include +#include #include "value-labels.h" #include "gettext.h" diff --git a/src/language/automake.mk b/src/language/automake.mk index 5140bb4195..6a2d5e5bc9 100644 --- a/src/language/automake.mk +++ b/src/language/automake.mk @@ -20,8 +20,3 @@ src_language_liblanguage_a_SOURCES = \ src/language/command.def -src/language/%: AM_CPPFLAGS += -I$(top_srcdir)/src/libpspp \ - -I$(top_srcdir)/src/language/lexer \ - -I$(top_srcdir)/src/output \ - -I$(top_srcdir)/src/data - diff --git a/src/language/command.c b/src/language/command.c index 397097ab70..45910d84f1 100644 --- a/src/language/command.c +++ b/src/language/command.c @@ -18,23 +18,23 @@ 02110-1301, USA. */ #include -#include "message.h" -#include "command.h" +#include +#include #include #include #include #include -#include "alloc.h" -#include "compiler.h" -#include "dictionary.h" -#include "message.h" -#include "lexer.h" -#include "settings.h" -#include "manager.h" -#include "str.h" -#include "table.h" -#include "variable.h" -#include "procedure.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #if HAVE_UNISTD_H #include diff --git a/src/language/control/automake.mk b/src/language/control/automake.mk index 1f61d5a872..4bd1476429 100644 --- a/src/language/control/automake.mk +++ b/src/language/control/automake.mk @@ -1,11 +1,6 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- -src/language/control/%: AM_CPPFLAGS += -I$(top_srcdir)/src/libpspp \ - -I$(top_srcdir)/src/data \ - -I$(top_srcdir)/src/language \ - -I$(top_srcdir)/src/language/lexer - noinst_LIBRARIES += src/language/control/libcontrol.a src_language_control_libcontrol_a_SOURCES = \ diff --git a/src/language/control/control-stack.c b/src/language/control/control-stack.c index 43f90e33bd..7263842933 100644 --- a/src/language/control/control-stack.c +++ b/src/language/control/control-stack.c @@ -2,8 +2,8 @@ #include "control-stack.h" #include #include -#include "compiler.h" -#include "message.h" +#include +#include #include "xalloc.h" #include "gettext.h" diff --git a/src/language/control/do-if.c b/src/language/control/do-if.c index dc39e66d4d..c16fca926f 100644 --- a/src/language/control/do-if.c +++ b/src/language/control/do-if.c @@ -18,17 +18,19 @@ 02110-1301, USA. */ #include -#include "control-stack.h" -#include "message.h" + #include -#include "alloc.h" -#include "command.h" -#include "compiler.h" -#include "message.h" -#include "expressions/public.h" -#include "lexer.h" -#include "str.h" -#include "variable.h" + +#include "control-stack.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/control/loop.c b/src/language/control/loop.c index ff38ba5f04..da1dc2fc49 100644 --- a/src/language/control/loop.c +++ b/src/language/control/loop.c @@ -18,21 +18,21 @@ 02110-1301, USA. */ #include -#include "message.h" -#include "alloc.h" -#include "case.h" -#include "command.h" -#include "compiler.h" -#include "dictionary.h" +#include +#include +#include +#include +#include +#include #include "control-stack.h" -#include "message.h" -#include "expressions/public.h" -#include "lexer.h" -#include "misc.h" -#include "pool.h" -#include "settings.h" -#include "str.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/control/repeat.c b/src/language/control/repeat.c index a26fda4b29..a71501b79c 100644 --- a/src/language/control/repeat.c +++ b/src/language/control/repeat.c @@ -19,27 +19,27 @@ #include #include "repeat.h" -#include "message.h" +#include #include #include #include -#include "alloc.h" -#include "command.h" -#include "dictionary.h" +#include +#include +#include #include "intprops.h" -#include "message.h" -#include "line-buffer.h" -#include "lexer.h" -#include "misc.h" -#include "pool.h" -#include "settings.h" -#include "str.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include /* Defines a list of lines used by DO REPEAT. */ struct line_list diff --git a/src/language/control/temporary.c b/src/language/control/temporary.c index e5b8ae47ec..c4b2532dae 100644 --- a/src/language/control/temporary.c +++ b/src/language/control/temporary.c @@ -18,19 +18,19 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include #include -#include "alloc.h" -#include "command.h" -#include "dictionary.h" +#include +#include +#include #include "control-stack.h" -#include "message.h" -#include "hash.h" -#include "lexer.h" -#include "str.h" -#include "value-labels.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/automake.mk b/src/language/data-io/automake.mk index b093b1c131..def4c384c9 100644 --- a/src/language/data-io/automake.mk +++ b/src/language/data-io/automake.mk @@ -1,14 +1,6 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- -src/language/data-io/%: AM_CPPFLAGS += -I$(top_srcdir)/src/libpspp \ - -I$(top_srcdir)/src/data \ - -I$(top_srcdir)/src/language \ - -I$(top_srcdir)/src/language/lexer \ - -I$(top_srcdir)/src/language/data-io \ - -I$(top_srcdir)/src/output/charts \ - -I$(top_srcdir)/src/output - noinst_LIBRARIES += src/language/data-io/libdata_io.a src_language_data_io_q_sources_q = src/language/data-io/file-handle.q src/language/data-io/list.q diff --git a/src/language/data-io/data-list.c b/src/language/data-io/data-list.c index cd22d0cda4..3b5066255e 100644 --- a/src/language/data-io/data-list.c +++ b/src/language/data-io/data-list.c @@ -18,30 +18,30 @@ 02110-1301, USA. */ #include -#include "data-list.h" -#include "message.h" +#include +#include #include #include #include #include -#include "alloc.h" -#include "case.h" -#include "command.h" -#include "compiler.h" -#include "data-in.h" -#include "debug-print.h" -#include "data-reader.h" -#include "dictionary.h" -#include "message.h" -#include "file-handle.h" -#include "format.h" -#include "lexer.h" -#include "misc.h" -#include "settings.h" -#include "str.h" -#include "table.h" -#include "variable.h" -#include "procedure.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/data-list.h b/src/language/data-io/data-list.h index 9b78ccdc11..10316621db 100644 --- a/src/language/data-io/data-list.h +++ b/src/language/data-io/data-list.h @@ -23,8 +23,8 @@ /* FIXME: This header is a kluge and should go away when we come up with a less-klugy solution. */ -#include "variable.h" -#include "procedure.h" +#include +#include trns_proc_func repeating_data_trns_proc; void repeating_data_set_write_case (struct transformation *, diff --git a/src/language/data-io/data-reader.c b/src/language/data-io/data-reader.c index 24b27b4048..c4bdd53891 100644 --- a/src/language/data-io/data-reader.c +++ b/src/language/data-io/data-reader.c @@ -18,26 +18,26 @@ 02110-1301, USA. */ #include -#include "data-reader.h" +#include #include #include #include #include -#include "alloc.h" -#include "command.h" -#include "message.h" -#include "file-handle.h" -#include "file-handle-def.h" -#include "filename.h" -#include "line-buffer.h" -#include "lexer.h" -#include "str.h" -#include "procedure.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include /* Flags for DFM readers. */ enum dfm_reader_flags diff --git a/src/language/data-io/data-writer.c b/src/language/data-io/data-writer.c index 993b81ca3f..57a5b9f71a 100644 --- a/src/language/data-io/data-writer.c +++ b/src/language/data-io/data-writer.c @@ -18,15 +18,15 @@ 02110-1301, USA. */ #include -#include "data-writer.h" +#include #include #include #include -#include "alloc.h" -#include "message.h" -#include "file-handle.h" -#include "filename.h" -#include "str.h" +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/file-handle.h b/src/language/data-io/file-handle.h index 2e8de05ab2..31333e9e8e 100644 --- a/src/language/data-io/file-handle.h +++ b/src/language/data-io/file-handle.h @@ -24,7 +24,7 @@ #include #include -#include "file-handle-def.h" +#include struct file_handle *fh_parse (enum fh_referent); diff --git a/src/language/data-io/file-handle.q b/src/language/data-io/file-handle.q index 65c7b2558e..09c180dc84 100644 --- a/src/language/data-io/file-handle.q +++ b/src/language/data-io/file-handle.q @@ -18,20 +18,20 @@ 02110-1301, USA. */ #include -#include "file-handle.h" -#include "message.h" +#include +#include #include #include -#include "alloc.h" -#include "filename.h" -#include "command.h" -#include "lexer.h" -#include "line-buffer.h" -#include "message.h" -#include "magic.h" -#include "str.h" -#include "variable.h" -#include "file-handle-def.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/file-type.c b/src/language/data-io/file-type.c index 6a7e7cc2e2..99a5d050d2 100644 --- a/src/language/data-io/file-type.c +++ b/src/language/data-io/file-type.c @@ -19,20 +19,20 @@ #include #include -#include "alloc.h" -#include "case.h" -#include "command.h" -#include "compiler.h" -#include "data-in.h" -#include "data-reader.h" -#include "dictionary.h" -#include "message.h" -#include "file-handle.h" -#include "format.h" -#include "lexer.h" -#include "str.h" -#include "variable.h" -#include "procedure.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/get.c b/src/language/data-io/get.c index df31b11d11..052dbeabbb 100644 --- a/src/language/data-io/get.c +++ b/src/language/data-io/get.c @@ -18,32 +18,32 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include -#include "alloc.h" -#include "any-reader.h" -#include "any-writer.h" -#include "case.h" -#include "command.h" -#include "compiler.h" -#include "dictionary.h" -#include "message.h" -#include "file-handle.h" -#include "hash.h" -#include "lexer.h" -#include "misc.h" -#include "por-file-writer.h" -#include "settings.h" -#include "sys-file-writer.h" -#include "str.h" -#include "value-labels.h" -#include "variable.h" -#include "procedure.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include /* Rearranging and reducing a dictionary. */ static void start_case_map (struct dictionary *); @@ -735,7 +735,7 @@ keep_variables (struct dictionary *dict) /* MATCH FILES. */ -#include "debug-print.h" +#include /* File types. */ enum diff --git a/src/language/data-io/inpt-pgm.c b/src/language/data-io/inpt-pgm.c index 875a6fdc9c..06b6c38625 100644 --- a/src/language/data-io/inpt-pgm.c +++ b/src/language/data-io/inpt-pgm.c @@ -18,29 +18,29 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include #include -#include "alloc.h" -#include "case.h" -#include "command.h" -#include "compiler.h" -#include "data-list.h" -#include "data-reader.h" -#include "dictionary.h" -#include "message.h" -#include "expressions/public.h" -#include "file-handle.h" -#include "lexer.h" -#include "misc.h" -#include "str.h" -#include "variable.h" -#include "procedure.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include /* Indicates how a `union value' should be initialized. */ enum value_init_type diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q index 77080a5638..8980bdde25 100644 --- a/src/language/data-io/list.q +++ b/src/language/data-io/list.q @@ -18,34 +18,34 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include #include -#include "alloc.h" -#include "case.h" -#include "command.h" -#include "compiler.h" -#include "dictionary.h" +#include +#include +#include +#include +#include #include "intprops.h" -#include "lexer.h" -#include "message.h" -#include "magic.h" -#include "misc.h" -#include "htmlP.h" -#include "output.h" +#include +#include +#include +#include +#include +#include #include "size_max.h" -#include "manager.h" -#include "table.h" -#include "variable.h" -#include "procedure.h" -#include "format.h" +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) /* (headers) */ -#include "debug-print.h" +#include /* (specification) list (lst_): diff --git a/src/language/data-io/matrix-data.c b/src/language/data-io/matrix-data.c index 47281defa3..8dc3f00a92 100644 --- a/src/language/data-io/matrix-data.c +++ b/src/language/data-io/matrix-data.c @@ -18,31 +18,31 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include #include #include -#include "array.h" -#include "alloc.h" -#include "case.h" -#include "command.h" -#include "compiler.h" -#include "data-in.h" -#include "data-reader.h" -#include "dictionary.h" -#include "message.h" -#include "file-handle.h" -#include "lexer.h" -#include "misc.h" -#include "pool.h" -#include "str.h" -#include "variable.h" -#include "procedure.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include /* FIXME: /N subcommand not implemented. It should be pretty simple, too. */ diff --git a/src/language/data-io/print.c b/src/language/data-io/print.c index 2399de799c..9d835abe52 100644 --- a/src/language/data-io/print.c +++ b/src/language/data-io/print.c @@ -20,21 +20,21 @@ /* FIXME: seems like a lot of code duplication with data-list.c. */ #include -#include "message.h" +#include #include -#include "alloc.h" -#include "case.h" -#include "command.h" -#include "compiler.h" -#include "data-writer.h" -#include "message.h" -#include "expressions/public.h" -#include "file-handle.h" -#include "lexer.h" -#include "misc.h" -#include "manager.h" -#include "table.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/dictionary/apply-dictionary.c index 0cf66e2d09..00025ead43 100644 --- a/src/language/dictionary/apply-dictionary.c +++ b/src/language/dictionary/apply-dictionary.c @@ -19,21 +19,21 @@ #include #include -#include "any-reader.h" -#include "command.h" -#include "dictionary.h" -#include "message.h" -#include "file-handle-def.h" -#include "hash.h" -#include "lexer.h" -#include "str.h" -#include "value-labels.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include /* Parses and executes APPLY DICTIONARY. */ int diff --git a/src/language/dictionary/automake.mk b/src/language/dictionary/automake.mk index 963e389048..4a8b4ad1d5 100644 --- a/src/language/dictionary/automake.mk +++ b/src/language/dictionary/automake.mk @@ -1,12 +1,5 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- -src/language/dictionary/%: AM_CPPFLAGS+=-I$(top_srcdir)/src/libpspp \ - -I$(top_srcdir)/src/data \ - -I$(top_srcdir)/src/output \ - -I$(top_srcdir)/src/output/charts \ - -I$(top_srcdir)/src/language/lexer \ - -I$(top_srcdir)/src/language - noinst_LIBRARIES += src/language/dictionary/libcmddict.a src_language_dictionary_libcmddict_a_SOURCES = \ diff --git a/src/language/dictionary/formats.c b/src/language/dictionary/formats.c index 9e62d9930b..d6eb8bfbc1 100644 --- a/src/language/dictionary/formats.c +++ b/src/language/dictionary/formats.c @@ -21,17 +21,17 @@ #include #include #include -#include "command.h" -#include "message.h" -#include "lexer.h" -#include "misc.h" -#include "str.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include enum { diff --git a/src/language/dictionary/missing-values.c b/src/language/dictionary/missing-values.c index 352284b3af..3bcf24d3ad 100644 --- a/src/language/dictionary/missing-values.c +++ b/src/language/dictionary/missing-values.c @@ -18,21 +18,21 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include -#include "command.h" -#include "data-in.h" -#include "message.h" -#include "lexer.h" -#include "magic.h" -#include "range-parser.h" -#include "str.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include int cmd_missing_values (void) diff --git a/src/language/dictionary/modify-variables.c b/src/language/dictionary/modify-variables.c index 6ead73dc31..7b8d5681fb 100644 --- a/src/language/dictionary/modify-variables.c +++ b/src/language/dictionary/modify-variables.c @@ -19,20 +19,20 @@ #include #include -#include "message.h" -#include "array.h" -#include "alloc.h" -#include "bit-vector.h" -#include "command.h" -#include "compiler.h" -#include "dictionary.h" -#include "message.h" -#include "hash.h" -#include "lexer.h" -#include "misc.h" -#include "str.h" -#include "variable.h" -#include "procedure.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c index 03eb06b72b..4800ac8694 100644 --- a/src/language/dictionary/numeric.c +++ b/src/language/dictionary/numeric.c @@ -18,19 +18,19 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include -#include "command.h" -#include "dictionary.h" -#include "message.h" -#include "lexer.h" -#include "str.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include /* Parses the NUMERIC command. */ int diff --git a/src/language/dictionary/rename-variables.c b/src/language/dictionary/rename-variables.c index 1c20c6a643..9ba6630281 100644 --- a/src/language/dictionary/rename-variables.c +++ b/src/language/dictionary/rename-variables.c @@ -19,15 +19,15 @@ #include #include -#include "message.h" -#include "alloc.h" -#include "command.h" -#include "dictionary.h" -#include "message.h" -#include "hash.h" -#include "lexer.h" -#include "str.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/split-file.c b/src/language/dictionary/split-file.c index 38eabc4540..4239ac3332 100644 --- a/src/language/dictionary/split-file.c +++ b/src/language/dictionary/split-file.c @@ -19,13 +19,13 @@ #include #include -#include "alloc.h" -#include "command.h" -#include "dictionary.h" -#include "message.h" -#include "lexer.h" -#include "str.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include +#include int cmd_split_file (void) diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c index 0234b833ca..98cc90ddfb 100644 --- a/src/language/dictionary/sys-file-info.c +++ b/src/language/dictionary/sys-file-info.c @@ -18,25 +18,25 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include #include -#include "array.h" -#include "alloc.h" -#include "command.h" -#include "dictionary.h" -#include "message.h" -#include "file-handle-def.h" -#include "hash.h" -#include "lexer.h" -#include "magic.h" -#include "misc.h" -#include "output.h" -#include "sys-file-reader.h" -#include "manager.h" -#include "table.h" -#include "value-labels.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c index 96b80ba735..976d547909 100644 --- a/src/language/dictionary/value-labels.c +++ b/src/language/dictionary/value-labels.c @@ -20,14 +20,14 @@ #include #include #include -#include "alloc.h" -#include "command.h" -#include "message.h" -#include "hash.h" -#include "lexer.h" -#include "str.h" -#include "value-labels.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c index b7dd8126c2..c1b6e1e7b8 100644 --- a/src/language/dictionary/variable-display.c +++ b/src/language/dictionary/variable-display.c @@ -20,14 +20,14 @@ #include #include #include -#include "alloc.h" -#include "command.h" -#include "message.h" -#include "lexer.h" -#include "str.h" -#include "variable.h" - -#include "debug-print.h" +#include +#include +#include +#include +#include +#include + +#include /* Set variables' alignment This is the alignment for GUI display only. diff --git a/src/language/dictionary/variable-label.c b/src/language/dictionary/variable-label.c index 6ddb00a5ef..bc171a296e 100644 --- a/src/language/dictionary/variable-label.c +++ b/src/language/dictionary/variable-label.c @@ -20,17 +20,17 @@ #include #include #include -#include "alloc.h" -#include "command.h" -#include "message.h" -#include "lexer.h" -#include "str.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include int cmd_variable_labels (void) diff --git a/src/language/dictionary/vector.c b/src/language/dictionary/vector.c index 9b1eb2cda5..20cb5f8499 100644 --- a/src/language/dictionary/vector.c +++ b/src/language/dictionary/vector.c @@ -18,16 +18,16 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include -#include "alloc.h" -#include "command.h" -#include "dictionary.h" -#include "message.h" -#include "lexer.h" -#include "misc.h" -#include "str.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/weight.c b/src/language/dictionary/weight.c index b6d63c972c..6528141f8e 100644 --- a/src/language/dictionary/weight.c +++ b/src/language/dictionary/weight.c @@ -18,14 +18,14 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include -#include "command.h" -#include "dictionary.h" -#include "message.h" -#include "lexer.h" -#include "str.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/expressions/automake.mk b/src/language/expressions/automake.mk index 1ad694b026..f1687486ea 100644 --- a/src/language/expressions/automake.mk +++ b/src/language/expressions/automake.mk @@ -1,20 +1,18 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- -src/language/expressions/%: AM_CPPFLAGS += -I$(top_srcdir)/src/libpspp \ - -I$(top_srcdir)/src/data \ - -I$(top_srcdir)/src/math \ - -I$(top_srcdir)/src/language/lexer \ - -I$(top_srcdir)/src/language/expressions \ - -I$(top_builddir)/src/language/expressions \ - -I$(top_srcdir)/src/language - noinst_LIBRARIES += src/language/expressions/libexpressions.a -src/language/expressions/evaluate.o: src/language/expressions/evaluate.h src/language/expressions/operations.h src/language/expressions/evaluate.inc +$(top_builddir)/src/language/expressions/src_language_expressions_libexpressions_a-evaluate.o: \ + $(top_builddir)/src/language/expressions/evaluate.h \ + $(top_builddir)/src/language/expressions/operations.h \ + $(top_builddir)/src/language/expressions/evaluate.inc + +$(top_builddir)/src/language/expressions/src_language_expressions_libexpressions_a-optimize.o: \ + $(top_builddir)/src/language/expressions/optimize.inc -src/language/expressions/optimize.o: src/language/expressions/optimize.inc +$(top_builddir)/src/language/expressions/src_language_expressions_libexpressions_a-parse.o: \ + $(top_builddir)/src/language/expressions/parse.inc -src/language/expressions/parse.o: src/language/expressions/parse.inc CLEANFILES += $(expressions_built_sources) @@ -41,6 +39,9 @@ expressions_built_sources= \ src/language/expressions/optimize.inc \ src/language/expressions/parse.inc +src_language_expressions_libexpressions_a_CPPFLAGS = $(AM_CPPFLAGS) \ + -I $(top_builddir)/src/language/expressions \ + -I $(top_srcdir)/src/language/expressions nodist_src_language_expressions_libexpressions_a_SOURCES = $(expressions_built_sources) diff --git a/src/language/expressions/evaluate.c b/src/language/expressions/evaluate.c index e5f605b797..cd84482462 100644 --- a/src/language/expressions/evaluate.c +++ b/src/language/expressions/evaluate.c @@ -21,11 +21,11 @@ #include "private.h" #include -#include "alloc.h" -#include "message.h" +#include +#include #include "helpers.h" #include "evaluate.h" -#include "pool.h" +#include static void expr_evaluate (struct expression *e, const struct ccase *c, int case_idx, @@ -94,8 +94,8 @@ expr_evaluate_str (struct expression *e, const struct ccase *c, int case_idx, buf_copy_rpad (dst, dst_size, s.string, s.length); } -#include "lexer.h" -#include "command.h" +#include +#include int cmd_debug_evaluate (void) diff --git a/src/language/expressions/helpers.c b/src/language/expressions/helpers.c index b4534c8111..ff16214795 100644 --- a/src/language/expressions/helpers.c +++ b/src/language/expressions/helpers.c @@ -2,7 +2,7 @@ #include "helpers.h" #include #include -#include "pool.h" +#include #include "private.h" const struct fixed_string empty_string = {NULL, 0}; diff --git a/src/language/expressions/helpers.h b/src/language/expressions/helpers.h index 54e56bbdb1..c8355550ed 100644 --- a/src/language/expressions/helpers.h +++ b/src/language/expressions/helpers.h @@ -9,21 +9,21 @@ #include #include #include -#include "case.h" -#include "compiler.h" -#include "data-in.h" -#include "dictionary.h" -#include "message.h" -#include "calendar.h" -#include "gsl-extras/gsl-extras.h" -#include "misc.h" -#include "moments.h" -#include "random.h" -#include "settings.h" -#include "str.h" -#include "value.h" -#include "variable.h" -#include "procedure.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/expressions/optimize.c b/src/language/expressions/optimize.c index b280b6d737..9f9626bc06 100644 --- a/src/language/expressions/optimize.c +++ b/src/language/expressions/optimize.c @@ -23,17 +23,17 @@ #include #include #include -#include "alloc.h" -#include "calendar.h" -#include "data-in.h" -#include "message.h" +#include +#include +#include +#include #include "evaluate.h" #include "helpers.h" -#include "misc.h" -#include "pool.h" +#include +#include #include "public.h" -#include "str.h" -#include "variable.h" +#include +#include static union any_node *evaluate_tree (struct composite_node *, struct expression *); diff --git a/src/language/expressions/parse.c b/src/language/expressions/parse.c index c348361b01..e063acb5ca 100644 --- a/src/language/expressions/parse.c +++ b/src/language/expressions/parse.c @@ -23,19 +23,19 @@ #include #include #include -#include "array.h" -#include "alloc.h" -#include "case.h" -#include "dictionary.h" -#include "message.h" +#include +#include +#include +#include +#include #include "helpers.h" -#include "lexer.h" -#include "misc.h" -#include "pool.h" -#include "settings.h" -#include "str.h" -#include "variable.h" -#include "procedure.h" +#include +#include +#include +#include +#include +#include +#include /* Declarations. */ diff --git a/src/language/expressions/private.h b/src/language/expressions/private.h index 85b82587f5..9e00bdf41b 100644 --- a/src/language/expressions/private.h +++ b/src/language/expressions/private.h @@ -22,8 +22,8 @@ #include #include -#include "format.h" -#include "str.h" +#include +#include #include "public.h" #include "operations.h" diff --git a/src/language/lexer/automake.mk b/src/language/lexer/automake.mk index ed172773e9..73dfa30f4f 100644 --- a/src/language/lexer/automake.mk +++ b/src/language/lexer/automake.mk @@ -1,12 +1,6 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- -src/language/lexer/%: AM_CPPFLAGS += \ - -I$(top_srcdir)/src/libpspp \ - -I$(top_srcdir)/src/data \ - -I$(top_srcdir)/src/language - - noinst_LIBRARIES += src/language/lexer/liblexer.a src_language_lexer_liblexer_a_SOURCES = \ diff --git a/src/language/lexer/format-parser.c b/src/language/lexer/format-parser.c index b3ccba55ce..69a83b7867 100644 --- a/src/language/lexer/format-parser.c +++ b/src/language/lexer/format-parser.c @@ -18,15 +18,15 @@ 02110-1301, USA. */ #include -#include "format.h" +#include #include -#include "message.h" +#include #include -#include "message.h" +#include #include "lexer.h" -#include "misc.h" -#include "str.h" -#include "variable.h" +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/lexer/lexer.c b/src/language/lexer/lexer.c index 391fa79a3e..ec8c45103b 100644 --- a/src/language/lexer/lexer.c +++ b/src/language/lexer/lexer.c @@ -19,20 +19,20 @@ #include #include "lexer.h" -#include "message.h" +#include #include #include #include #include #include #include -#include "alloc.h" -#include "command.h" -#include "message.h" -#include "line-buffer.h" -#include "magic.h" -#include "settings.h" -#include "str.h" +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/lexer/lexer.h b/src/language/lexer/lexer.h index ad162c8e5c..4ea80707c2 100644 --- a/src/language/lexer/lexer.h +++ b/src/language/lexer/lexer.h @@ -20,11 +20,11 @@ #if !lexer_h #define lexer_h 1 -#include "variable.h" +#include #include #include -#include "identifier.h" +#include extern int token; diff --git a/src/language/lexer/q2c.c b/src/language/lexer/q2c.c index 46255e34aa..9e8af0a246 100644 --- a/src/language/lexer/q2c.c +++ b/src/language/lexer/q2c.c @@ -18,6 +18,7 @@ 02110-1301, USA. */ #include + #include #include #include @@ -28,8 +29,8 @@ #if HAVE_UNISTD_H #include #endif -#include "compiler.h" -#include "str.h" +#include +#include /* Brokenness. */ @@ -41,13 +42,8 @@ #define EXIT_FAILURE 1 #endif -/* -#if !HAVE_STRERROR -#include "misc/strerror.c" -#endif -*/ -#include "debug-print.h" +#include /* Max length of an input line. */ #define MAX_LINE_LEN 1024 @@ -2044,13 +2040,13 @@ main (int argc, char *argv[]) indent = 0; dump (0, "#include "); - dump (0, "#include \"alloc.h\""); - dump (0, "#include \"message.h\""); - dump (0, "#include \"lexer.h\""); - dump (0, "#include \"settings.h\""); - dump (0, "#include \"str.h\""); - dump (0, "#include \"subcommand-list.h\""); - dump (0, "#include \"variable.h\""); + dump (0, "#include "); + dump (0, "#include "); + dump (0, "#include "); + dump (0, "#include "); + dump (0, "#include "); + dump (0, "#include "); + dump (0, "#include "); dump (0, nullstr); dump (0, "#include \"gettext.h\""); diff --git a/src/language/lexer/range-parser.c b/src/language/lexer/range-parser.c index 41d01984fb..334987a3e6 100644 --- a/src/language/lexer/range-parser.c +++ b/src/language/lexer/range-parser.c @@ -1,12 +1,12 @@ #include #include "range-parser.h" #include -#include "data-in.h" -#include "message.h" +#include +#include #include "lexer.h" -#include "magic.h" -#include "str.h" -#include "value.h" +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/lexer/variable-parser.c b/src/language/lexer/variable-parser.c index 937e51ca69..7037ccbf44 100644 --- a/src/language/lexer/variable-parser.c +++ b/src/language/lexer/variable-parser.c @@ -18,20 +18,20 @@ 02110-1301, USA. */ #include -#include "variable.h" +#include #include #include #include -#include "alloc.h" -#include "bit-vector.h" -#include "dictionary.h" -#include "message.h" -#include "hash.h" +#include +#include +#include +#include +#include #include "lexer.h" -#include "misc.h" -#include "pool.h" +#include +#include #include "size_max.h" -#include "str.h" +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/line-buffer.c b/src/language/line-buffer.c index ef0e74d34c..0803f0825e 100644 --- a/src/language/line-buffer.c +++ b/src/language/line-buffer.c @@ -18,21 +18,21 @@ 02110-1301, USA. */ #include -#include "line-buffer.h" -#include "message.h" +#include +#include #include #include #include -#include "alloc.h" -#include "command.h" -#include "message.h" -#include "filename.h" -#include "lexer.h" -#include "settings.h" -#include "str.h" -#include "table.h" -#include "variable.h" -#include "version.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/line-buffer.h b/src/language/line-buffer.h index 1ca8a7b4a5..59dab0a58d 100644 --- a/src/language/line-buffer.h +++ b/src/language/line-buffer.h @@ -21,7 +21,7 @@ #define GETL_H 1 #include -#include "str.h" +#include /* Current line. This line may be modified by modules other than getl.c, and by lexer.c in particular. (Ugh.) */ diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c index 0485ccaeca..793a7256f2 100644 --- a/src/language/stats/aggregate.c +++ b/src/language/stats/aggregate.c @@ -18,26 +18,26 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include -#include "alloc.h" -#include "any-writer.h" -#include "case.h" -#include "casefile.h" -#include "command.h" -#include "dictionary.h" -#include "message.h" -#include "file-handle-def.h" -#include "lexer.h" -#include "misc.h" -#include "moments.h" -#include "pool.h" -#include "settings.h" -#include "sys-file-writer.h" -#include "sort.h" -#include "str.h" -#include "variable.h" -#include "procedure.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/automake.mk b/src/language/stats/automake.mk index aebae9686b..a8a23590d3 100644 --- a/src/language/stats/automake.mk +++ b/src/language/stats/automake.mk @@ -1,16 +1,6 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- -src/language/stats/%: AM_CPPFLAGS += -I$(top_srcdir)/src/libpspp \ - -I$(top_srcdir)/src/data \ - -I$(top_srcdir)/src/math \ - -I$(top_srcdir)/src/math/linreg \ - -I$(top_srcdir)/src/output \ - -I$(top_srcdir)/src/output/charts \ - -I$(top_srcdir)/src/language/lexer \ - -I$(top_srcdir)/src/language/stats \ - -I$(top_srcdir)/src/language - noinst_LIBRARIES += src/language/stats/libstats.a src_language_stats_q_sources_q = \ diff --git a/src/language/stats/autorecode.c b/src/language/stats/autorecode.c index 1aea061f5a..89ac44db42 100644 --- a/src/language/stats/autorecode.c +++ b/src/language/stats/autorecode.c @@ -18,20 +18,20 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include -#include "alloc.h" -#include "case.h" -#include "command.h" -#include "compiler.h" -#include "dictionary.h" -#include "message.h" -#include "hash.h" -#include "lexer.h" -#include "pool.h" -#include "str.h" -#include "variable.h" -#include "procedure.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/correlations.q b/src/language/stats/correlations.q index 59f06e48d0..10818591e5 100644 --- a/src/language/stats/correlations.q +++ b/src/language/stats/correlations.q @@ -19,16 +19,16 @@ #include #include -#include "alloc.h" -#include "compiler.h" -#include "dictionary.h" -#include "file-handle-def.h" -#include "command.h" -#include "lexer.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include +#include /* (headers) */ -#include "debug-print.h" +#include struct cor_set { diff --git a/src/language/stats/crosstabs.q b/src/language/stats/crosstabs.q index 18eb26ec3f..2818a17992 100644 --- a/src/language/stats/crosstabs.q +++ b/src/language/stats/crosstabs.q @@ -30,29 +30,29 @@ */ #include -#include "message.h" +#include #include #include #include #include -#include "array.h" -#include "alloc.h" -#include "case.h" -#include "dictionary.h" -#include "hash.h" -#include "pool.h" -#include "command.h" -#include "compiler.h" -#include "lexer.h" -#include "message.h" -#include "magic.h" -#include "misc.h" -#include "output.h" -#include "str.h" -#include "table.h" -#include "value-labels.h" -#include "variable.h" -#include "procedure.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) @@ -60,7 +60,7 @@ /* (headers) */ -#include "debug-print.h" +#include /* (specification) crosstabs (crs_): diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c index 6704fe5d24..b305deea0f 100644 --- a/src/language/stats/descriptives.c +++ b/src/language/stats/descriptives.c @@ -20,25 +20,25 @@ /* FIXME: Many possible optimizations. */ #include -#include "message.h" +#include #include #include #include -#include "array.h" -#include "alloc.h" -#include "case.h" -#include "casefile.h" -#include "command.h" -#include "compiler.h" -#include "dictionary.h" -#include "lexer.h" -#include "message.h" -#include "magic.h" -#include "moments.h" -#include "manager.h" -#include "table.h" -#include "variable.h" -#include "procedure.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/examine.q b/src/language/stats/examine.q index 14981e884e..8248ff18c9 100644 --- a/src/language/stats/examine.q +++ b/src/language/stats/examine.q @@ -20,41 +20,41 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA #include #include -#include "message.h" +#include #include #include #include -#include "alloc.h" -#include "str.h" -#include "case.h" -#include "dictionary.h" -#include "command.h" -#include "compiler.h" -#include "lexer.h" -#include "message.h" -#include "magic.h" -#include "misc.h" -#include "table.h" -#include "manager.h" -#include "value-labels.h" -#include "variable.h" -#include "procedure.h" -#include "hash.h" -#include "casefile.h" -#include "factor-stats.h" -#include "moments.h" -#include "percentiles.h" -#include "box-whisker.h" -#include "cartesian.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) #define N_(msgid) msgid /* (headers) */ -#include "chart.h" -#include "plot-hist.h" -#include "plot-chart.h" +#include +#include +#include /* (specification) "EXAMINE" (xmn_): diff --git a/src/language/stats/flip.c b/src/language/stats/flip.c index bc5399a7b3..43d6d0f5b2 100644 --- a/src/language/stats/flip.c +++ b/src/language/stats/flip.c @@ -18,27 +18,27 @@ 02110-1301, USA. */ #include "config.h" -#include "message.h" +#include #include #include #include #include #include -#include "array.h" -#include "alloc.h" -#include "case.h" -#include "command.h" -#include "dictionary.h" -#include "message.h" +#include +#include +#include +#include +#include +#include #include "intprops.h" -#include "lexer.h" -#include "misc.h" -#include "pool.h" -#include "settings.h" -#include "str.h" -#include "value.h" -#include "variable.h" -#include "procedure.h" +#include +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_SYS_TYPES_H #include diff --git a/src/language/stats/frequencies.q b/src/language/stats/frequencies.q index 0bc6b555ae..9b338a8353 100644 --- a/src/language/stats/frequencies.q +++ b/src/language/stats/frequencies.q @@ -24,36 +24,36 @@ */ #include -#include "message.h" +#include #include #include #include -#include "alloc.h" -#include "bit-vector.h" -#include "case.h" -#include "compiler.h" -#include "dictionary.h" -#include "hash.h" -#include "pool.h" -#include "command.h" -#include "lexer.h" -#include "moments.h" -#include "message.h" -#include "array.h" -#include "magic.h" -#include "misc.h" -#include "output.h" -#include "manager.h" -#include "str.h" -#include "table.h" -#include "value-labels.h" -#include "variable.h" -#include "procedure.h" -#include "settings.h" -#include "piechart.h" -#include "chart.h" -#include "plot-hist.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) @@ -61,7 +61,7 @@ /* (headers) */ -#include "debug-print.h" +#include /* (specification) FREQUENCIES (frq_): diff --git a/src/language/stats/means.q b/src/language/stats/means.q index 017b53fe96..51644ac8a4 100644 --- a/src/language/stats/means.q +++ b/src/language/stats/means.q @@ -20,22 +20,22 @@ #include #include #include -#include "dictionary.h" -#include "message.h" -#include "alloc.h" -#include "command.h" -#include "hash.h" -#include "lexer.h" -#include "message.h" -#include "magic.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) /* (headers) */ -#include "debug-print.h" +#include /* (specification) means (mns_): diff --git a/src/language/stats/oneway.q b/src/language/stats/oneway.q index 6c745cd153..a2d6ab9cb0 100644 --- a/src/language/stats/oneway.q +++ b/src/language/stats/oneway.q @@ -20,30 +20,30 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA #include #include -#include "message.h" +#include #include #include #include -#include "alloc.h" -#include "str.h" -#include "case.h" -#include "dictionary.h" -#include "command.h" -#include "compiler.h" -#include "lexer.h" -#include "message.h" -#include "magic.h" -#include "misc.h" -#include "table.h" -#include "manager.h" -#include "value-labels.h" -#include "variable.h" -#include "procedure.h" -#include "hash.h" -#include "casefile.h" -#include "group-proc.h" -#include "group.h" -#include "levene.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/rank.q b/src/language/stats/rank.q index a138fc8f75..dc0b9ddd89 100644 --- a/src/language/stats/rank.q +++ b/src/language/stats/rank.q @@ -19,11 +19,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include -#include "command.h" -#include "compiler.h" -#include "dictionary.h" -#include "sort.h" -#include "variable.h" +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/regression.q b/src/language/stats/regression.q index 874e7bc2a1..4359d6f7f7 100644 --- a/src/language/stats/regression.q +++ b/src/language/stats/regression.q @@ -23,27 +23,27 @@ #include #include #include -#include "alloc.h" -#include "case.h" -#include "casefile.h" -#include "category.h" -#include "cat-routines.h" -#include "command.h" -#include "compiler.h" -#include "design-matrix.h" -#include "dictionary.h" -#include "message.h" -#include "file-handle-def.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" -#include "lexer.h" -#include "linreg.h" -#include "coefficient.h" -#include "missing-values.h" -#include "regression-export.h" -#include "table.h" -#include "value-labels.h" -#include "variable.h" -#include "procedure.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #define REG_LARGE_DATA 1000 diff --git a/src/language/stats/sort-cases.c b/src/language/stats/sort-cases.c index ed442f74f1..dd0387418a 100644 --- a/src/language/stats/sort-cases.c +++ b/src/language/stats/sort-cases.c @@ -22,14 +22,14 @@ #include #include #include -#include "alloc.h" -#include "command.h" -#include "message.h" -#include "lexer.h" -#include "settings.h" +#include +#include +#include +#include +#include #include "sort-criteria.h" -#include "sort.h" -#include "variable.h" +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/sort-criteria.c b/src/language/stats/sort-criteria.c index 5bc26d9abf..fd90af22ff 100644 --- a/src/language/stats/sort-criteria.c +++ b/src/language/stats/sort-criteria.c @@ -22,14 +22,14 @@ #include #include #include -#include "alloc.h" -#include "command.h" -#include "message.h" -#include "lexer.h" -#include "settings.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include #include "sort-criteria.h" -#include "sort.h" +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/t-test.q b/src/language/stats/t-test.q index fac23714fe..c558d60acc 100644 --- a/src/language/stats/t-test.q +++ b/src/language/stats/t-test.q @@ -21,30 +21,30 @@ #include #include -#include "message.h" +#include #include #include #include -#include "alloc.h" -#include "case.h" -#include "casefile.h" -#include "command.h" -#include "compiler.h" -#include "dictionary.h" -#include "message.h" -#include "group-proc.h" -#include "hash.h" -#include "levene.h" -#include "lexer.h" -#include "magic.h" -#include "misc.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "size_max.h" -#include "manager.h" -#include "str.h" -#include "table.h" -#include "value-labels.h" -#include "variable.h" -#include "procedure.h" +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/tests/automake.mk b/src/language/tests/automake.mk index 1aceb88e72..28e37d5c58 100644 --- a/src/language/tests/automake.mk +++ b/src/language/tests/automake.mk @@ -1,13 +1,5 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- -src/language/tests/%: AM_CPPFLAGS += -I$(top_srcdir)/src/libpspp \ - -I$(top_srcdir)/src/data \ - -I$(top_srcdir)/src/math \ - -I$(top_srcdir)/src/language \ - -I$(top_srcdir)/src/language/lexer \ - -I$(top_srcdir)/src/output - - noinst_LIBRARIES += src/language/tests/libtests.a src_language_tests_libtests_a_SOURCES = \ diff --git a/src/language/tests/casefile-test.c b/src/language/tests/casefile-test.c index 4a0c699c3e..10722dcbaf 100644 --- a/src/language/tests/casefile-test.c +++ b/src/language/tests/casefile-test.c @@ -18,13 +18,13 @@ 02110-1301, USA. */ #include -#include "casefile.h" -#include "case.h" +#include +#include #include #include -#include "command.h" -#include "lexer.h" +#include +#include static void test_casefile (int pattern, size_t value_cnt, size_t case_cnt); static void get_random_case (struct ccase *, size_t value_cnt, diff --git a/src/language/tests/moments-test.c b/src/language/tests/moments-test.c index c038a63c42..4b68523145 100644 --- a/src/language/tests/moments-test.c +++ b/src/language/tests/moments-test.c @@ -20,9 +20,9 @@ #include #include #include "gettext.h" -#include "command.h" -#include "lexer.h" -#include "moments.h" +#include +#include +#include #define _(msgid) gettext (msgid) diff --git a/src/language/tests/pool-test.c b/src/language/tests/pool-test.c index 86d50fccf8..17674fbdba 100644 --- a/src/language/tests/pool-test.c +++ b/src/language/tests/pool-test.c @@ -18,8 +18,8 @@ 02110-1301, USA. */ #include -#include "pool.h" -#include "command.h" +#include +#include #include #include #include diff --git a/src/language/utilities/automake.mk b/src/language/utilities/automake.mk index ba7ab45cc4..9ec8db1d27 100644 --- a/src/language/utilities/automake.mk +++ b/src/language/utilities/automake.mk @@ -1,14 +1,6 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- -src/language/utilities/%: AM_CPPFLAGS += -I$(top_srcdir)/src/libpspp \ - -I$(top_srcdir)/src/data \ - -I$(top_srcdir)/src/math \ - -I$(top_srcdir)/src/output \ - -I$(top_srcdir)/src/output/charts \ - -I$(top_srcdir)/src/language/lexer \ - -I$(top_srcdir)/src/language - src_language_utilities_q_sources_q = \ src/language/utilities/set.q diff --git a/src/language/utilities/date.c b/src/language/utilities/date.c index aa6cb2205d..06115f9176 100644 --- a/src/language/utilities/date.c +++ b/src/language/utilities/date.c @@ -18,9 +18,9 @@ 02110-1301, USA. */ #include -#include "command.h" -#include "message.h" -#include "lexer.h" +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/utilities/echo.c b/src/language/utilities/echo.c index 33d569f4ac..09c42382ea 100644 --- a/src/language/utilities/echo.c +++ b/src/language/utilities/echo.c @@ -19,13 +19,13 @@ 02110-1301, USA. */ #include -#include "message.h" -#include "alloc.h" -#include "str.h" -#include "lexer.h" -#include "command.h" -#include "table.h" -#include "manager.h" +#include +#include +#include +#include +#include +#include +#include /* Echos a string to the output stream */ int diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c index aab817cb5b..a148d6fac7 100644 --- a/src/language/utilities/include.c +++ b/src/language/utilities/include.c @@ -20,12 +20,12 @@ #include #include #include -#include "alloc.h" -#include "command.h" -#include "message.h" -#include "line-buffer.h" -#include "lexer.h" -#include "str.h" +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/utilities/permissions.c b/src/language/utilities/permissions.c index 05a503ca28..940b2d2bfb 100644 --- a/src/language/utilities/permissions.c +++ b/src/language/utilities/permissions.c @@ -18,19 +18,19 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include #include #include #include #include -#include "settings.h" -#include "command.h" -#include "message.h" -#include "lexer.h" -#include "misc.h" +#include +#include +#include +#include +#include #include "stat-macros.h" -#include "str.h" +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q index 23559589dd..19a287b219 100644 --- a/src/language/utilities/set.q +++ b/src/language/utilities/set.q @@ -18,26 +18,26 @@ 02110-1301, USA. */ #include -#include "settings.h" -#include "message.h" +#include +#include #include #include #include #include -#include "alloc.h" -#include "command.h" -#include "compiler.h" -#include "dictionary.h" -#include "line-buffer.h" -#include "lexer.h" -#include "message.h" -#include "magic.h" -#include "output.h" -#include "random.h" -#include "variable.h" -#include "format.h" -#include "copyleft.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #if HAVE_LIBTERMCAP diff --git a/src/language/utilities/title.c b/src/language/utilities/title.c index 759208d351..15e5a40498 100644 --- a/src/language/utilities/title.c +++ b/src/language/utilities/title.c @@ -20,21 +20,21 @@ #include #include #include -#include "alloc.h" -#include "command.h" -#include "dictionary.h" -#include "message.h" -#include "lexer.h" -#include "output.h" -#include "start-date.h" -#include "variable.h" -#include "version.h" -#include "procedure.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include static int get_title (const char *cmd, char **title); diff --git a/src/language/xforms/automake.mk b/src/language/xforms/automake.mk index db5b206d79..3e88a98452 100644 --- a/src/language/xforms/automake.mk +++ b/src/language/xforms/automake.mk @@ -1,12 +1,6 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- -src/language/xforms/%: AM_CPPFLAGS += -I$(top_srcdir)/src/libpspp \ - -I$(top_srcdir)/src/data \ - -I$(top_srcdir)/src/math \ - -I$(top_srcdir)/src/language/lexer \ - -I$(top_srcdir)/src/language - noinst_LIBRARIES += src/language/xforms/libxforms.a src_language_xforms_libxforms_a_SOURCES = \ diff --git a/src/language/xforms/compute.c b/src/language/xforms/compute.c index 13499a067f..ae2ceaf50a 100644 --- a/src/language/xforms/compute.c +++ b/src/language/xforms/compute.c @@ -18,18 +18,18 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include -#include "alloc.h" -#include "case.h" -#include "command.h" -#include "dictionary.h" -#include "message.h" -#include "expressions/public.h" -#include "lexer.h" -#include "misc.h" -#include "str.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/xforms/count.c b/src/language/xforms/count.c index 4357623528..e3f8f35805 100644 --- a/src/language/xforms/count.c +++ b/src/language/xforms/count.c @@ -18,19 +18,19 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include -#include "alloc.h" -#include "case.h" -#include "command.h" -#include "compiler.h" -#include "dictionary.h" -#include "message.h" -#include "lexer.h" -#include "pool.h" -#include "range-parser.h" -#include "str.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/xforms/recode.c b/src/language/xforms/recode.c index 38bb5508e1..d2548f31dc 100644 --- a/src/language/xforms/recode.c +++ b/src/language/xforms/recode.c @@ -18,23 +18,23 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include #include #include -#include "alloc.h" -#include "case.h" -#include "command.h" -#include "compiler.h" -#include "data-in.h" -#include "dictionary.h" -#include "message.h" -#include "lexer.h" -#include "magic.h" -#include "pool.h" -#include "range-parser.h" -#include "str.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/xforms/sample.c b/src/language/xforms/sample.c index f0bfab98e4..fc463123d2 100644 --- a/src/language/xforms/sample.c +++ b/src/language/xforms/sample.c @@ -22,19 +22,19 @@ #include #include #include -#include "alloc.h" -#include "command.h" -#include "compiler.h" -#include "message.h" -#include "lexer.h" -#include "random.h" -#include "str.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include /* The two different types of samples. */ enum diff --git a/src/language/xforms/select-if.c b/src/language/xforms/select-if.c index 23426edd48..5f15b43ebe 100644 --- a/src/language/xforms/select-if.c +++ b/src/language/xforms/select-if.c @@ -19,14 +19,14 @@ #include #include -#include "alloc.h" -#include "command.h" -#include "dictionary.h" -#include "message.h" -#include "expressions/public.h" -#include "lexer.h" -#include "str.h" -#include "variable.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk index f1a772f17a..5341c0728b 100644 --- a/src/libpspp/automake.mk +++ b/src/libpspp/automake.mk @@ -30,12 +30,14 @@ src_libpspp_libpspp_a_SOURCES = \ DISTCLEANFILES+=src/libpspp/version.c +src_libpspp_libpspp_a_CPPFLAGS = -I $(top_srcdir)/src/libpspp $(AM_CPPFLAGS) + nodist_src_libpspp_libpspp_a_SOURCES = src/libpspp/version.c src/libpspp/version.c: @mkdir -p src/libpspp echo "#include " > $@ - echo "#include " > $@ + echo "#include \"version.h\"" > $@ echo "const char bare_version[] = \"@VERSION@\";" >> $@ echo "const char version[] = \"GNU @PACKAGE@ @VERSION@\";" >> $@ echo "const char stat_version[] = \"GNU @PACKAGE@ @VERSION@ \ @@ -54,3 +56,4 @@ src/libpspp/version.c: echo " \"/usr/share/groff/font\";" >> $@ echo "const char locale_dir[] = \"$(datadir)/locale\";" >> $@ + diff --git a/src/math/automake.mk b/src/math/automake.mk index b0341fb749..77a71c28a8 100644 --- a/src/math/automake.mk +++ b/src/math/automake.mk @@ -2,12 +2,6 @@ include $(top_srcdir)/src/math/linreg/automake.mk -src/math/%: AM_CPPFLAGS += \ - -I$(top_srcdir)/src/math \ - -I$(top_srcdir)/src/libpspp \ - -I$(top_srcdir)/src/data - - noinst_LIBRARIES += src/math/libpspp_math.a src_math_libpspp_math_a_SOURCES = \ diff --git a/src/math/design-matrix.c b/src/math/design-matrix.c index 138813d7fb..63c1dd9ecc 100644 --- a/src/math/design-matrix.c +++ b/src/math/design-matrix.c @@ -22,11 +22,10 @@ */ #include #include -#include -#include "alloc.h" -#include "message.h" -#include "variable.h" -#include "category.h" +#include +#include +#include +#include #include "design-matrix.h" #include #include diff --git a/src/math/design-matrix.h b/src/math/design-matrix.h index 7f13fe87d5..8c268de424 100644 --- a/src/math/design-matrix.h +++ b/src/math/design-matrix.h @@ -26,8 +26,8 @@ #include #include -#include "category.h" -#include "cat-routines.h" +#include +#include struct design_matrix_var { size_t first_column; /* First column for this variable in diff --git a/src/math/factor-stats.c b/src/math/factor-stats.c index 8b6f4e8436..47d17706fe 100644 --- a/src/math/factor-stats.c +++ b/src/math/factor-stats.c @@ -20,10 +20,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA #include #include "factor-stats.h" -#include "value.h" -#include "hash.h" -#include "array.h" -#include "alloc.h" +#include +#include +#include +#include #include "moments.h" #include "percentiles.h" diff --git a/src/math/factor-stats.h b/src/math/factor-stats.h index 6fa8650b26..720ea017b5 100644 --- a/src/math/factor-stats.h +++ b/src/math/factor-stats.h @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA /* FIXME: These things should probably be amalgamated with the group_statistics struct */ -#include "hash.h" -#include "value.h" +#include +#include #include #include #include "percentiles.h" diff --git a/src/math/group.c b/src/math/group.c index 07803183fe..c3dcbaadda 100644 --- a/src/math/group.c +++ b/src/math/group.c @@ -19,14 +19,14 @@ #include #include -#include "alloc.h" -#include "compiler.h" -#include "hash.h" +#include +#include +#include #include "group.h" #include "group-proc.h" -#include "str.h" -#include "variable.h" -#include "misc.h" +#include +#include +#include /* Return -1 if the id of a is less than b; +1 if greater than and diff --git a/src/math/group.h b/src/math/group.h index 43714d9c05..3fa7c86218 100644 --- a/src/math/group.h +++ b/src/math/group.h @@ -22,7 +22,7 @@ #define GROUP_H -#include "value.h" +#include /* Statistics for grouped data */ diff --git a/src/math/levene.c b/src/math/levene.c index 105fc09303..7a034621d5 100644 --- a/src/math/levene.c +++ b/src/math/levene.c @@ -21,17 +21,17 @@ #include #include "levene.h" -#include "message.h" -#include "case.h" -#include "casefile.h" -#include "dictionary.h" +#include +#include +#include +#include #include "group-proc.h" -#include "hash.h" -#include "str.h" -#include "variable.h" -#include "procedure.h" -#include "alloc.h" -#include "misc.h" +#include +#include +#include +#include +#include +#include #include "group.h" #include diff --git a/src/math/levene.h b/src/math/levene.h index edbcd80e3f..886d3a3653 100644 --- a/src/math/levene.h +++ b/src/math/levene.h @@ -23,8 +23,8 @@ #define levene_h 1 -#include "variable.h" -#include "casefile.h" +#include +#include /* What to do with missing values */ enum lev_missing { LEV_ANALYSIS, LEV_LISTWISE }; diff --git a/src/math/linreg/automake.mk b/src/math/linreg/automake.mk index 931b38ed27..61263bb837 100644 --- a/src/math/linreg/automake.mk +++ b/src/math/linreg/automake.mk @@ -1,11 +1,5 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- -src/math/linreg/%: AM_CPPFLAGS += \ - -I$(top_srcdir)/src/data \ - -I$(top_srcdir)/src/math \ - -I$(top_srcdir)/lib/linreg - - noinst_LIBRARIES += src/math/linreg/libpspp_linreg.a src_math_linreg_libpspp_linreg_a_SOURCES = \ diff --git a/src/math/linreg/coefficient.c b/src/math/linreg/coefficient.c index ce75958814..5c85af5e86 100644 --- a/src/math/linreg/coefficient.c +++ b/src/math/linreg/coefficient.c @@ -23,8 +23,8 @@ Accessor functions for matching coefficients and variables. */ #include -#include "coefficient.h" -#include "linreg.h" +#include +#include #include "src/math/design-matrix.h" #include "src/data/variable.h" #include "src/data/value.h" diff --git a/src/math/linreg/coefficient.h b/src/math/linreg/coefficient.h index 9b8b945e7f..a82b54200f 100644 --- a/src/math/linreg/coefficient.h +++ b/src/math/linreg/coefficient.h @@ -24,7 +24,7 @@ #define COEFFICIENT_H -#include "linreg.h" +#include struct design_matrix; diff --git a/src/math/linreg/linreg.c b/src/math/linreg/linreg.c index e7e3a001d2..08d620b8c2 100644 --- a/src/math/linreg/linreg.c +++ b/src/math/linreg/linreg.c @@ -53,10 +53,10 @@ Springer. 1998. ISBN 0-387-98542-5. */ -#include "linreg.h" -#include "coefficient.h" -#include "sweep.h" +#include +#include #include +#include /* Get the mean and standard deviation of a vector of doubles via a form of the Kalman filter as diff --git a/src/math/moments.c b/src/math/moments.c index ce2f825c8e..e73efad101 100644 --- a/src/math/moments.c +++ b/src/math/moments.c @@ -22,9 +22,9 @@ #include #include #include -#include "alloc.h" -#include "misc.h" -#include "value.h" +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/math/moments.h b/src/math/moments.h index d872280131..0725df6db6 100644 --- a/src/math/moments.h +++ b/src/math/moments.h @@ -21,7 +21,7 @@ #define HEADER_MOMENTS #include -#include "value.h" +#include /* Moments of the mean. Higher-order moments have higher values. */ diff --git a/src/math/percentiles.c b/src/math/percentiles.c index 372bd4ca08..d00cf3e0ee 100644 --- a/src/math/percentiles.c +++ b/src/math/percentiles.c @@ -19,10 +19,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include -#include "compiler.h" +#include #include "factor-stats.h" #include "percentiles.h" -#include "misc.h" +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/math/percentiles.h b/src/math/percentiles.h index 8f4271f567..efe26918b9 100644 --- a/src/math/percentiles.h +++ b/src/math/percentiles.h @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA #define PERCENTILES_H -#include "hash.h" +#include struct weighted_value ; diff --git a/src/math/sort.c b/src/math/sort.c index 46fcb60a78..20d8dde73c 100644 --- a/src/math/sort.c +++ b/src/math/sort.c @@ -19,28 +19,28 @@ #include #include "sort.h" -#include "message.h" -#include "alloc.h" +#include +#include #include #include #include #include -#include "array.h" +#include #include -#include "case.h" -#include "casefile.h" -#include "message.h" +#include +#include +#include -#include "misc.h" -#include "settings.h" -#include "str.h" -#include "variable.h" -#include "procedure.h" +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include /* These should only be changed for testing purposes. */ int min_buffers = 64; diff --git a/src/message.c b/src/message.c index b77e7b627f..ed9036510c 100644 --- a/src/message.c +++ b/src/message.c @@ -18,18 +18,18 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include #include #include #include -#include "alloc.h" -#include "filename.h" -#include "line-buffer.h" -#include "lexer.h" -#include "settings.h" -#include "read-line.h" -#include "version.h" +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/output/ascii.c b/src/output/ascii.c index 63f64be552..f6bc7a6f91 100644 --- a/src/output/ascii.c +++ b/src/output/ascii.c @@ -18,21 +18,21 @@ 02110-1301, USA. */ #include -#include "message.h" +#include #include #include #include #include -#include "alloc.h" -#include "message.h" +#include +#include #include "chart.h" -#include "compiler.h" -#include "filename.h" -#include "misc.h" +#include +#include +#include #include "output.h" -#include "pool.h" -#include "start-date.h" -#include "version.h" +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/output/automake.mk b/src/output/automake.mk index 0d3a10971b..3c423203ac 100644 --- a/src/output/automake.mk +++ b/src/output/automake.mk @@ -3,17 +3,8 @@ include $(top_srcdir)/src/output/charts/automake.mk - -src/output/%: AM_CPPFLAGS += \ - -I$(top_srcdir)/src/math \ - -I$(top_srcdir)/src/libpspp \ - -I$(top_srcdir)/src/data - noinst_LIBRARIES += src/output/liboutput.a - - - output_sources = \ src/output/ascii.c \ src/output/font.h \ @@ -31,10 +22,12 @@ output_sources = \ if WITHCHARTS src_output_liboutput_a_SOURCES = $(output_sources) src/output/chart.c - EXTRA_DIST += src/output/dummy-chart.c + +EXTRA_DIST += src/output/dummy-chart.c else src_output_liboutput_a_SOURCES = $(output_sources) src/output/dummy-chart.c - EXTRA_DIST += src/output/chart.c + +EXTRA_DIST += src/output/chart.c endif diff --git a/src/output/chart.c b/src/output/chart.c index 958695ae30..0fda467602 100644 --- a/src/output/chart.c +++ b/src/output/chart.c @@ -28,8 +28,8 @@ #include #include "chart.h" -#include "str.h" -#include "alloc.h" +#include +#include #include "manager.h" #include "output.h" diff --git a/src/output/chart.h b/src/output/chart.h index 546c6c716e..98052f28ef 100644 --- a/src/output/chart.h +++ b/src/output/chart.h @@ -26,9 +26,9 @@ #include #include -#include "chart-geometry.h" -#include "str.h" -#include "alloc.h" +#include +#include +#include #include "manager.h" #include "output.h" diff --git a/src/output/charts/automake.mk b/src/output/charts/automake.mk index 6db4bf28a3..f1d71264fb 100644 --- a/src/output/charts/automake.mk +++ b/src/output/charts/automake.mk @@ -2,12 +2,6 @@ noinst_LIBRARIES += src/output/charts/libcharts.a -src/output/charts/%: AM_CPPFLAGS += \ - -I$(top_srcdir)/src/libpspp \ - -I$(top_srcdir)/src/output \ - -I$(top_srcdir)/src/data \ - -I$(top_srcdir)/src/math - chart_sources = \ src/output/charts/barchart.c \ src/output/charts/barchart.h \ diff --git a/src/output/charts/barchart.c b/src/output/charts/barchart.c index efa0ce82be..c49ebf0274 100644 --- a/src/output/charts/barchart.c +++ b/src/output/charts/barchart.c @@ -22,9 +22,9 @@ #include #include #include -#include "barchart.h" -#include "chart.h" -#include "plot-chart.h" +#include +#include +#include #define CATAGORIES 6 #define SUB_CATAGORIES 3 diff --git a/src/output/charts/barchart.h b/src/output/charts/barchart.h index 97fd758bfa..4a6e3b725c 100644 --- a/src/output/charts/barchart.h +++ b/src/output/charts/barchart.h @@ -20,7 +20,7 @@ #ifndef BARCHART_H #define BARCHART_H -#include "chart.h" +#include enum bar_opts { BAR_GROUPED = 0, diff --git a/src/output/charts/box-whisker.c b/src/output/charts/box-whisker.c index 1739066445..8c0160dfa1 100644 --- a/src/output/charts/box-whisker.c +++ b/src/output/charts/box-whisker.c @@ -18,15 +18,18 @@ 02110-1301, USA. */ -#include "chart.h" -#include "chart-geometry.h" #include #include -#include "misc.h" +#include + +#include +#include + +#include +#include +#include + -#include "factor-stats.h" -#include "box-whisker.h" -#include "plot-chart.h" /* Draw a box-and-whiskers plot diff --git a/src/output/charts/box-whisker.h b/src/output/charts/box-whisker.h index cf4d2e689d..9c6df31405 100644 --- a/src/output/charts/box-whisker.h +++ b/src/output/charts/box-whisker.h @@ -23,6 +23,8 @@ #include struct chart ; +struct weighted_value; +struct metrics; /* Draw an outlier on the plot CH * at CENTRELINE diff --git a/src/output/charts/cartesian.c b/src/output/charts/cartesian.c index 2a9b1c5fcb..a8057ba43b 100644 --- a/src/output/charts/cartesian.c +++ b/src/output/charts/cartesian.c @@ -19,11 +19,13 @@ #include -#include "chart.h" #include -#include "plot-chart.h" -#include "cartesian.h" -#include "compiler.h" + +#include + +#include +#include +#include diff --git a/src/output/charts/dummy-chart.c b/src/output/charts/dummy-chart.c index a255f23795..b77700ba0f 100644 --- a/src/output/charts/dummy-chart.c +++ b/src/output/charts/dummy-chart.c @@ -22,11 +22,11 @@ This module is linked only when charts are not supported */ #include "config.h" -#include "chart.h" -#include "plot-chart.h" -#include "cartesian.h" +#include +#include +#include #include -#include "compiler.h" +#include #ifndef NO_CHARTS diff --git a/src/output/charts/piechart.c b/src/output/charts/piechart.c index 3fceaf20f5..37788380a8 100644 --- a/src/output/charts/piechart.c +++ b/src/output/charts/piechart.c @@ -19,17 +19,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "config.h" -#include "piechart.h" -#include "chart.h" +#include + #include #include #include #include -#include "str.h" -#include "value-labels.h" -#include "misc.h" -#include "plot-chart.h" + + +#include +#include + +#include +#include +#include +#include + /* Pie charts of course need to know Pi :) */ #ifndef M_PI diff --git a/src/output/charts/plot-chart.c b/src/output/charts/plot-chart.c index f965a6fed1..6b91045273 100644 --- a/src/output/charts/plot-chart.c +++ b/src/output/charts/plot-chart.c @@ -18,6 +18,7 @@ 02110-1301, USA. */ #include + #include #include #include @@ -27,13 +28,18 @@ #include #include -#include "chart-geometry.h" -#include "plot-chart.h" -#include "str.h" -#include "alloc.h" -#include "manager.h" -#include "output.h" -#include "plot-chart.h" +#include +#include + +#include + + + +#include +#include +#include +#include + const char *data_colour[] = { "brown", diff --git a/src/output/charts/plot-chart.h b/src/output/charts/plot-chart.h index ffcf3b0180..e8bb7d42ce 100644 --- a/src/output/charts/plot-chart.h +++ b/src/output/charts/plot-chart.h @@ -27,12 +27,13 @@ #include -#include "chart-geometry.h" -#include "chart.h" -#include "str.h" -#include "alloc.h" -#include "manager.h" -#include "output.h" +#include +#include + +#include +#include +#include +#include #ifndef PLOT_CHART_H diff --git a/src/output/charts/plot-hist.c b/src/output/charts/plot-hist.c index 68c0a6a8d4..a500d5bf62 100644 --- a/src/output/charts/plot-hist.c +++ b/src/output/charts/plot-hist.c @@ -21,16 +21,18 @@ #include #include -#include "plot-hist.h" -#include "plot-chart.h" #include #include #include #include #include -#include "hash.h" -#include "variable.h" -#include "chart.h" + +#include +#include + +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/output/groff-font.c b/src/output/groff-font.c index 5b651c4a82..4817084f6d 100644 --- a/src/output/groff-font.c +++ b/src/output/groff-font.c @@ -19,22 +19,22 @@ #include #include "font.h" -#include "message.h" +#include #include #include #include #include #include -#include "alloc.h" -#include "compiler.h" -#include "message.h" -#include "filename.h" +#include +#include +#include +#include #include "getline.h" -#include "hash.h" +#include #include "intprops.h" -#include "pool.h" -#include "str.h" -#include "version.h" +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/output/html.c b/src/output/html.c index 1cf65839bb..48aead065f 100644 --- a/src/output/html.c +++ b/src/output/html.c @@ -20,7 +20,7 @@ #include #include "chart.h" #include "htmlP.h" -#include "message.h" +#include #include #include #include @@ -30,17 +30,17 @@ #include #endif -#include "alloc.h" -#include "compiler.h" -#include "message.h" -#include "filename.h" +#include +#include +#include +#include #include "getline.h" #include "getlogin_r.h" #include "output.h" #include "manager.h" #include "table.h" -#include "version.h" -#include "make-file.h" +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/output/htmlP.h b/src/output/htmlP.h index ee86141426..673ca48410 100644 --- a/src/output/htmlP.h +++ b/src/output/htmlP.h @@ -20,7 +20,7 @@ #if !htmlP_h #define htmlP_h 1 -#include "filename.h" +#include /* HTML output driver extension record. */ struct html_driver_ext diff --git a/src/output/manager.c b/src/output/manager.c index 404c3bf2db..f7d0b5eb74 100644 --- a/src/output/manager.c +++ b/src/output/manager.c @@ -19,11 +19,11 @@ #include #include "manager.h" -#include "message.h" +#include #include #include #include "output.h" -#include "debug-print.h" +#include /* Table. */ int table_num = 1; diff --git a/src/output/output.c b/src/output/output.c index 8af1a7b804..4a915fe2ef 100644 --- a/src/output/output.c +++ b/src/output/output.c @@ -19,19 +19,19 @@ #include #include "output.h" -#include "message.h" +#include #include #include #include #include -#include "alloc.h" -#include "message.h" -#include "filename.h" +#include +#include +#include #include "htmlP.h" #include "intprops.h" -#include "misc.h" -#include "settings.h" -#include "str.h" +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/output/output.h b/src/output/output.h index 7d6f81cb85..9694fcb4d8 100644 --- a/src/output/output.h +++ b/src/output/output.h @@ -20,8 +20,10 @@ #if !output_h #define output_h 1 -#include "str.h" -#include "config.h" +#include + +#include + /* A rectangle. */ struct rect diff --git a/src/output/postscript.c b/src/output/postscript.c index a4c54015bc..e6ce861482 100644 --- a/src/output/postscript.c +++ b/src/output/postscript.c @@ -21,7 +21,7 @@ #include #include "chart.h" -#include "message.h" +#include #include #include #include @@ -31,20 +31,20 @@ #include #endif -#include "alloc.h" -#include "bit-vector.h" -#include "compiler.h" -#include "message.h" -#include "filename.h" +#include +#include +#include +#include +#include #include "font.h" #include "getline.h" -#include "hash.h" +#include #include "intprops.h" -#include "misc.h" +#include #include "output.h" #include "manager.h" -#include "start-date.h" -#include "version.h" +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/output/table.c b/src/output/table.c index 4f5007c2a5..7306ee3cfb 100644 --- a/src/output/table.c +++ b/src/output/table.c @@ -23,21 +23,21 @@ #include #include #include -#include "message.h" -#include "alloc.h" -#include "compiler.h" -#include "format.h" -#include "magic.h" -#include "misc.h" +#include +#include +#include +#include +#include +#include #include "output.h" -#include "pool.h" +#include #include "manager.h" -#include "variable.h" +#include #include "gettext.h" #define _(msgid) gettext (msgid) -#include "debug-print.h" +#include struct som_table_class tab_table_class; static char *command_name; diff --git a/src/output/table.h b/src/output/table.h index 4fa459759e..678d6aa3a8 100644 --- a/src/output/table.h +++ b/src/output/table.h @@ -21,7 +21,7 @@ #define tab_h 1 #include -#include "str.h" +#include /* Cell options. */ enum diff --git a/src/procedure.c b/src/procedure.c index e7f61933ac..c6209af266 100644 --- a/src/procedure.c +++ b/src/procedure.c @@ -18,30 +18,30 @@ 02110-1301, USA. */ #include -#include "procedure.h" -#include "message.h" +#include +#include #include #include #include #if HAVE_UNISTD_H #include /* Required by SunOS4. */ #endif -#include "alloc.h" -#include "case.h" -#include "casefile.h" -#include "command.h" -#include "dictionary.h" -#include "control-stack.h" -#include "message.h" +#include +#include +#include +#include +#include +#include +#include #include "expressions/public.h" -#include "file-handle-def.h" -#include "misc.h" -#include "settings.h" -#include "manager.h" -#include "table.h" -#include "str.h" -#include "variable.h" -#include "value-labels.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 545e934521..f802c776ea 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -2,15 +2,6 @@ bin_PROGRAMS += src/ui/gui/psppire -src/ui/gui/%: AM_CPPFLAGS += \ - -export-dynamic \ - -I$(top_srcdir)/gl \ - -I$(top_srcdir)/lib/gtksheet \ - -I$(top_srcdir)/src/libpspp \ - -I$(top_srcdir)/src/data \ - -I$(top_srcdir)/src/ui/gui - - src/ui/gui/%: AM_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall src_ui_gui_psppire_LDFLAGS = \ diff --git a/src/ui/gui/data-sheet.c b/src/ui/gui/data-sheet.c index 1edeb330f8..bff1af9706 100644 --- a/src/ui/gui/data-sheet.c +++ b/src/ui/gui/data-sheet.c @@ -24,18 +24,18 @@ #include -#include "gtksheet.h" +#include -#include "gsheet-uniform-row.h" +#include #include "psppire-dict.h" #include "psppire-variable.h" #include "psppire-data-store.h" #include "helper.h" -#include "value-labels.h" -#include "case.h" -#include "data-in.h" +#include +#include +#include #include "menu-actions.h" #include "data-sheet.h" diff --git a/src/ui/gui/data-sheet.h b/src/ui/gui/data-sheet.h index e89433807f..9189edddda 100644 --- a/src/ui/gui/data-sheet.h +++ b/src/ui/gui/data-sheet.h @@ -22,9 +22,9 @@ #ifndef DATA_SHEET_H #define DATA_SHEET_H -#include -#include -#include +#include +#include "psppire-case-array.h" +#include "psppire-dict.h" void psppire_data_sheet_clear(GtkSheet *sheet); diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c index 061e4dc776..b3d83da270 100644 --- a/src/ui/gui/helper.c +++ b/src/ui/gui/helper.c @@ -1,7 +1,7 @@ #include "helper.h" -#include "data-in.h" -#include "message.h" +#include +#include #include #include diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h index 6097041e04..eef64213c2 100644 --- a/src/ui/gui/helper.h +++ b/src/ui/gui/helper.h @@ -22,8 +22,8 @@ #ifndef __MISC_H__ #define __MISC_H__ -#include "value.h" -#include "format.h" +#include +#include #include #include diff --git a/src/ui/gui/menu-actions.c b/src/ui/gui/menu-actions.c index 175fd5d19f..d10cd5153a 100644 --- a/src/ui/gui/menu-actions.c +++ b/src/ui/gui/menu-actions.c @@ -20,14 +20,15 @@ #include #include -#include -#include -#include + +#include +#include +#include #include #include -#include +#include #include "helper.h" #include "menu-actions.h" #include "psppire-variable.h" diff --git a/src/ui/gui/message-dialog.c b/src/ui/gui/message-dialog.c index 624b4147de..6e93f7e6b3 100644 --- a/src/ui/gui/message-dialog.c +++ b/src/ui/gui/message-dialog.c @@ -24,7 +24,7 @@ #include #include -#include "message.h" +#include #include "message-dialog.h" diff --git a/src/ui/gui/message-dialog.h b/src/ui/gui/message-dialog.h index 8a17e8bcba..3b85e60f2c 100644 --- a/src/ui/gui/message-dialog.h +++ b/src/ui/gui/message-dialog.h @@ -22,7 +22,7 @@ #ifndef ERROR_DIALOG_H #define ERROR_DIALOG_H -#include "message.h" +#include void vmsg(int klass, const char *fmt, va_list args); void msg(int klass, const char *fmt, ...); diff --git a/src/ui/gui/missing-val-dialog.c b/src/ui/gui/missing-val-dialog.c index 74bc675553..ec136cd0cf 100644 --- a/src/ui/gui/missing-val-dialog.c +++ b/src/ui/gui/missing-val-dialog.c @@ -23,9 +23,9 @@ #include "helper.h" #include "missing-val-dialog.h" -#include "missing-values.h" -#include "variable.h" -#include "data-in.h" +#include +#include +#include #include "psppire-variable.h" #include diff --git a/src/ui/gui/missing-val-dialog.h b/src/ui/gui/missing-val-dialog.h index 4129d07cbf..44f025e68c 100644 --- a/src/ui/gui/missing-val-dialog.h +++ b/src/ui/gui/missing-val-dialog.h @@ -28,7 +28,7 @@ #include #include -#include "missing-values.h" +#include struct missing_val_dialog { diff --git a/src/ui/gui/psppire-case-array.c b/src/ui/gui/psppire-case-array.c index 159b3cc122..e6ab7f7f3d 100644 --- a/src/ui/gui/psppire-case-array.c +++ b/src/ui/gui/psppire-case-array.c @@ -24,9 +24,10 @@ #include "psppire-object.h" #include "psppire-case-array.h" -#include "gtkextra-marshal.h" -#include "case.h" +#include + +#include /* --- prototypes --- */ static void psppire_case_array_class_init (PsppireCaseArrayClass *class); diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index aa11859360..63e6f9c156 100644 --- a/src/ui/gui/psppire-data-store.c +++ b/src/ui/gui/psppire-data-store.c @@ -23,20 +23,20 @@ #include #include -#include "gtksheet.h" -#include "gsheetmodel.h" -#include "gsheet-column-iface.h" +#include +#include +#include #include "psppire-variable.h" #include "psppire-data-store.h" -#include "dictionary.h" -#include "missing-values.h" -#include "value-labels.h" -#include "data-in.h" +#include +#include +#include +#include -#include "file-handle-def.h" -#include "sys-file-writer.h" +#include +#include #define _(A) A #define N_(A) A diff --git a/src/ui/gui/psppire-data-store.h b/src/ui/gui/psppire-data-store.h index 508f0cd688..2f0d42ca10 100644 --- a/src/ui/gui/psppire-data-store.h +++ b/src/ui/gui/psppire-data-store.h @@ -22,7 +22,7 @@ #ifndef __PSPPIRE_DATA_STORE_H__ #define __PSPPIRE_DATA_STORE_H__ -#include "gsheetmodel.h" +#include #include "psppire-dict.h" #include "psppire-case-array.h" diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c index d5ea909417..357ec031b5 100644 --- a/src/ui/gui/psppire-dict.c +++ b/src/ui/gui/psppire-dict.c @@ -22,14 +22,14 @@ #include #include -#include "gtkextra-marshal.c" +#include #include "psppire-object.h" #include "psppire-dict.h" -#include "format.h" -#include "dictionary.h" -#include "missing-values.h" -#include "value-labels.h" +#include +#include +#include +#include #include "message-dialog.h" diff --git a/src/ui/gui/psppire-dict.h b/src/ui/gui/psppire-dict.h index b36ccf9e61..173ed48697 100644 --- a/src/ui/gui/psppire-dict.h +++ b/src/ui/gui/psppire-dict.h @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c index dfae46b1e4..b6966f6a83 100644 --- a/src/ui/gui/psppire-var-store.c +++ b/src/ui/gui/psppire-var-store.c @@ -25,19 +25,19 @@ #include -#include "gsheetmodel.h" +#include #include "psppire-variable.h" #include "psppire-var-store.h" #include "var-sheet.h" -#include "dictionary.h" -#include "variable.h" -#include "missing-values.h" +#include +#include +#include #include "val-labs-dialog.h" #include "missing-val-dialog.h" -#include "value-labels.h" +#include #define _(A) A #define N_(A) A diff --git a/src/ui/gui/psppire-var-store.h b/src/ui/gui/psppire-var-store.h index b4da027ee4..7a4eee8e3b 100644 --- a/src/ui/gui/psppire-var-store.h +++ b/src/ui/gui/psppire-var-store.h @@ -22,7 +22,7 @@ #ifndef __PSPPIRE_VAR_STORE_H__ #define __PSPPIRE_VAR_STORE_H__ -#include "gsheetmodel.h" +#include #include "psppire-dict.h" #include diff --git a/src/ui/gui/psppire-variable.c b/src/ui/gui/psppire-variable.c index 6443ee901e..7d23f48bfb 100644 --- a/src/ui/gui/psppire-variable.c +++ b/src/ui/gui/psppire-variable.c @@ -21,9 +21,9 @@ #include #include -#include "missing-values.h" -#include "value-labels.h" -#include "format.h" +#include +#include +#include #include "psppire-variable.h" #include "psppire-dict.h" diff --git a/src/ui/gui/psppire-variable.h b/src/ui/gui/psppire-variable.h index 19e7ecc80d..815086a64b 100644 --- a/src/ui/gui/psppire-variable.h +++ b/src/ui/gui/psppire-variable.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include "psppire-dict.h" /* Don't use any of these members. diff --git a/src/ui/gui/val-labs-dialog.c b/src/ui/gui/val-labs-dialog.c index d5a8256592..070a4f50da 100644 --- a/src/ui/gui/val-labs-dialog.c +++ b/src/ui/gui/val-labs-dialog.c @@ -26,7 +26,7 @@ #include "helper.h" #include "val-labs-dialog.h" -#include "value-labels.h" +#include #include "psppire-variable.h" /* This callback occurs when the text in the label entry box diff --git a/src/ui/gui/var-sheet.c b/src/ui/gui/var-sheet.c index 8a2ba9855c..b38806bb16 100644 --- a/src/ui/gui/var-sheet.c +++ b/src/ui/gui/var-sheet.c @@ -22,7 +22,7 @@ /* This module creates the Variable Sheet used for inputing the variables in the dictonary */ -#include +#include #include #include @@ -32,11 +32,11 @@ #define min(A,B) ((A < B)?A:B) -#include "gtksheet.h" -#include "gsheet-hetero-column.h" -#include "gsheet-uniform-row.h" -#include "psppire-var-store.h" +#include +#include +#include +#include "psppire-var-store.h" #include "helper.h" #include "menu-actions.h" #include "psppire-dict.h" diff --git a/src/ui/gui/var-sheet.h b/src/ui/gui/var-sheet.h index 09bcb72873..fda222b90a 100644 --- a/src/ui/gui/var-sheet.h +++ b/src/ui/gui/var-sheet.h @@ -22,7 +22,7 @@ #ifndef VAR_SHEET_H #define VAR_SHEET_H -#include "gtksheet.h" +#include #include "psppire-dict.h" diff --git a/src/ui/gui/var-type-dialog.c b/src/ui/gui/var-type-dialog.c index d1569f8f40..3a6f67eb13 100644 --- a/src/ui/gui/var-type-dialog.c +++ b/src/ui/gui/var-type-dialog.c @@ -32,8 +32,8 @@ #include "psppire-variable.h" -#include "variable.h" -#include "settings.h" +#include +#include struct tgs diff --git a/src/ui/gui/var-type-dialog.h b/src/ui/gui/var-type-dialog.h index 28e7d8bda6..d259fa1a71 100644 --- a/src/ui/gui/var-type-dialog.h +++ b/src/ui/gui/var-type-dialog.h @@ -26,7 +26,7 @@ /* This module describes the behaviour of the Variable Type dialog box, used for input of the variable type parameter in the var sheet */ -#include "format.h" +#include enum { diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk index d68f5c18eb..7411bbd331 100644 --- a/src/ui/terminal/automake.mk +++ b/src/ui/terminal/automake.mk @@ -1,14 +1,5 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- -src/ui/terminal/%: AM_CPPFLAGS += \ - -I$(top_srcdir)/src/libpspp \ - -I$(top_srcdir)/src/data \ - -I$(top_srcdir)/src/math \ - -I$(top_srcdir)/src/language \ - -I$(top_srcdir)/src/language/lexer \ - -I$(top_srcdir)/src/output/charts \ - -I$(top_srcdir)/src/output - noinst_LIBRARIES += src/ui/terminal/libui.a src_ui_terminal_libui_a_SOURCES = \ diff --git a/src/ui/terminal/command-line.c b/src/ui/terminal/command-line.c index 39e17e325d..9c5af7c8e4 100644 --- a/src/ui/terminal/command-line.c +++ b/src/ui/terminal/command-line.c @@ -19,23 +19,23 @@ #include #include "command-line.h" -#include "message.h" +#include #include #include #include #include #include -#include "alloc.h" -#include "copyleft.h" -#include "message.h" -#include "line-buffer.h" +#include +#include +#include +#include #include "progname.h" -#include "settings.h" +#include #include "read-line.h" -#include "output.h" -#include "filename.h" -#include "str.h" -#include "version.h" +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index 7712df83d9..84cd2a6d56 100644 --- a/src/ui/terminal/main.c +++ b/src/ui/terminal/main.c @@ -22,21 +22,21 @@ #include #include #include "command-line.h" -#include "command.h" -#include "compiler.h" -#include "dictionary.h" -#include "message.h" -#include "file-handle-def.h" -#include "filename.h" -#include "line-buffer.h" -#include "lexer.h" -#include "output.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "progname.h" -#include "random.h" +#include #include "read-line.h" -#include "settings.h" -#include "variable.h" -#include "version.h" +#include +#include +#include #if HAVE_FPU_CONTROL_H #include @@ -55,7 +55,7 @@ #include -#include "debug-print.h" +#include static void i18n_init (void); static void fpu_init (void); diff --git a/src/ui/terminal/read-line.c b/src/ui/terminal/read-line.c index 562a6fcbbf..e92113514a 100644 --- a/src/ui/terminal/read-line.c +++ b/src/ui/terminal/read-line.c @@ -25,14 +25,14 @@ #include #include "read-line.h" -#include "command.h" -#include "filename.h" -#include "version.h" -#include "str.h" -#include "table.h" -#include "message.h" -#include "filename.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/ui/terminal/read-line.h b/src/ui/terminal/read-line.h index 0c32dec512..cadd2cce14 100644 --- a/src/ui/terminal/read-line.h +++ b/src/ui/terminal/read-line.h @@ -20,7 +20,7 @@ #ifndef READLN_H #define READLN_H -#include "str.h" +#include void readln_initialize (void); void readln_uninitialize (void); -- 2.30.2