Changed include paths to be explicitly specified in the #include directive.
authorJohn Darrington <john@darrington.wattle.id.au>
Wed, 15 Mar 2006 03:29:10 +0000 (03:29 +0000)
committerJohn Darrington <john@darrington.wattle.id.au>
Wed, 15 Mar 2006 03:29:10 +0000 (03:29 +0000)
186 files changed:
lib/gsl-extras/automake.mk
lib/gtksheet/automake.mk
lib/linreg/automake.mk
po/en_GB.po
po/pspp.pot
src/data/any-reader.c
src/data/any-writer.c
src/data/automake.mk
src/data/case.c
src/data/case.h
src/data/casefile.c
src/data/category.c
src/data/data-in.c
src/data/data-out.c
src/data/dictionary.c
src/data/file-handle-def.c
src/data/filename.c
src/data/format.c
src/data/make-file.c
src/data/missing-values.c
src/data/por-file-reader.c
src/data/por-file-writer.c
src/data/scratch-reader.c
src/data/sfm-private.h
src/data/sys-file-reader.c
src/data/sys-file-writer.c
src/data/value-labels.c
src/data/variable.c
src/language/automake.mk
src/language/command.c
src/language/control/automake.mk
src/language/control/control-stack.c
src/language/control/do-if.c
src/language/control/loop.c
src/language/control/repeat.c
src/language/control/temporary.c
src/language/data-io/automake.mk
src/language/data-io/data-list.c
src/language/data-io/data-list.h
src/language/data-io/data-reader.c
src/language/data-io/data-writer.c
src/language/data-io/file-handle.h
src/language/data-io/file-handle.q
src/language/data-io/file-type.c
src/language/data-io/get.c
src/language/data-io/inpt-pgm.c
src/language/data-io/list.q
src/language/data-io/matrix-data.c
src/language/data-io/print.c
src/language/dictionary/apply-dictionary.c
src/language/dictionary/automake.mk
src/language/dictionary/formats.c
src/language/dictionary/missing-values.c
src/language/dictionary/modify-variables.c
src/language/dictionary/numeric.c
src/language/dictionary/rename-variables.c
src/language/dictionary/split-file.c
src/language/dictionary/sys-file-info.c
src/language/dictionary/value-labels.c
src/language/dictionary/variable-display.c
src/language/dictionary/variable-label.c
src/language/dictionary/vector.c
src/language/dictionary/weight.c
src/language/expressions/automake.mk
src/language/expressions/evaluate.c
src/language/expressions/helpers.c
src/language/expressions/helpers.h
src/language/expressions/optimize.c
src/language/expressions/parse.c
src/language/expressions/private.h
src/language/lexer/automake.mk
src/language/lexer/format-parser.c
src/language/lexer/lexer.c
src/language/lexer/lexer.h
src/language/lexer/q2c.c
src/language/lexer/range-parser.c
src/language/lexer/variable-parser.c
src/language/line-buffer.c
src/language/line-buffer.h
src/language/stats/aggregate.c
src/language/stats/automake.mk
src/language/stats/autorecode.c
src/language/stats/correlations.q
src/language/stats/crosstabs.q
src/language/stats/descriptives.c
src/language/stats/examine.q
src/language/stats/flip.c
src/language/stats/frequencies.q
src/language/stats/means.q
src/language/stats/oneway.q
src/language/stats/rank.q
src/language/stats/regression.q
src/language/stats/sort-cases.c
src/language/stats/sort-criteria.c
src/language/stats/t-test.q
src/language/tests/automake.mk
src/language/tests/casefile-test.c
src/language/tests/moments-test.c
src/language/tests/pool-test.c
src/language/utilities/automake.mk
src/language/utilities/date.c
src/language/utilities/echo.c
src/language/utilities/include.c
src/language/utilities/permissions.c
src/language/utilities/set.q
src/language/utilities/title.c
src/language/xforms/automake.mk
src/language/xforms/compute.c
src/language/xforms/count.c
src/language/xforms/recode.c
src/language/xforms/sample.c
src/language/xforms/select-if.c
src/libpspp/automake.mk
src/math/automake.mk
src/math/design-matrix.c
src/math/design-matrix.h
src/math/factor-stats.c
src/math/factor-stats.h
src/math/group.c
src/math/group.h
src/math/levene.c
src/math/levene.h
src/math/linreg/automake.mk
src/math/linreg/coefficient.c
src/math/linreg/coefficient.h
src/math/linreg/linreg.c
src/math/moments.c
src/math/moments.h
src/math/percentiles.c
src/math/percentiles.h
src/math/sort.c
src/message.c
src/output/ascii.c
src/output/automake.mk
src/output/chart.c
src/output/chart.h
src/output/charts/automake.mk
src/output/charts/barchart.c
src/output/charts/barchart.h
src/output/charts/box-whisker.c
src/output/charts/box-whisker.h
src/output/charts/cartesian.c
src/output/charts/dummy-chart.c
src/output/charts/piechart.c
src/output/charts/plot-chart.c
src/output/charts/plot-chart.h
src/output/charts/plot-hist.c
src/output/groff-font.c
src/output/html.c
src/output/htmlP.h
src/output/manager.c
src/output/output.c
src/output/output.h
src/output/postscript.c
src/output/table.c
src/output/table.h
src/procedure.c
src/ui/gui/automake.mk
src/ui/gui/data-sheet.c
src/ui/gui/data-sheet.h
src/ui/gui/helper.c
src/ui/gui/helper.h
src/ui/gui/menu-actions.c
src/ui/gui/message-dialog.c
src/ui/gui/message-dialog.h
src/ui/gui/missing-val-dialog.c
src/ui/gui/missing-val-dialog.h
src/ui/gui/psppire-case-array.c
src/ui/gui/psppire-data-store.c
src/ui/gui/psppire-data-store.h
src/ui/gui/psppire-dict.c
src/ui/gui/psppire-dict.h
src/ui/gui/psppire-var-store.c
src/ui/gui/psppire-var-store.h
src/ui/gui/psppire-variable.c
src/ui/gui/psppire-variable.h
src/ui/gui/val-labs-dialog.c
src/ui/gui/var-sheet.c
src/ui/gui/var-sheet.h
src/ui/gui/var-type-dialog.c
src/ui/gui/var-type-dialog.h
src/ui/terminal/automake.mk
src/ui/terminal/command-line.c
src/ui/terminal/main.c
src/ui/terminal/read-line.c
src/ui/terminal/read-line.h

index cf6cfc0887685e4afe07463a3382635150e33c7f..7d1ed62b26bfb23e91ea58407f77cb53067dd64b 100644 (file)
@@ -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
index 0aa3d78494c01feb3106af38a90d8370fa1699b0..150bdaf85a765a292ea9398659a3b3cdbf6f9365 100644 (file)
@@ -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
 
 
index 4bf19d37604f98f771424b0bf1bb8b8abf56e106..d65df864a762fd15b826427be31529a753b834a6 100644 (file)
@@ -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 
index a37a1e48f03bd28cb539a8dc30f9631f4f5c16fa..0ce537393318ad2468daa09f421ac708311eecab 100644 (file)
@@ -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 <john@darrington.wattle.id.au>\n"
 "Language-Team: John Darrington <john@darrington.wattle.id.au>\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 ""
 
index a130460a0789e9a3e494256ceed6715abae7b340..cfadc3efbc0fcd91f1ad8a3edb3535616bc96dcc 100644 (file)
@@ -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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 ""
 
index 876d7fa56b4059ad1028d1ed0783b63d8e9230da..64f881e3e124e2d382ffe0fed927b1bb3c291d88 100644 (file)
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include "file-handle-def.h"
 #include "filename.h"
 #include "por-file-reader.h"
 #include "sys-file-reader.h"
-#include "str.h"
+#include <libpspp/str.h>
 #include "scratch-reader.h"
 #include "xalloc.h"
 
index 93d2817019c2c0afd1bdc0fb3d78b6babc542f7c..c5d741a28a800d92efeed76d151492ebbfc7d321 100644 (file)
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include "file-handle-def.h"
 #include "filename.h"
 #include "por-file-writer.h"
 #include "sys-file-writer.h"
-#include "str.h"
+#include <libpspp/str.h>
 #include "scratch-writer.h"
 #include "xalloc.h"
 
index 3a5192bb98fc8fca44c001dcabe586e485d89879..95507c82eb8ecc60418926f59b660c77692dc130 100644 (file)
@@ -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 = \
index 8613eca6f1b9944da0ffd2269f4dd8bf0691f429..eab966b1867d3e6405fc4d5c818c4ca275a12923 100644 (file)
@@ -22,8 +22,8 @@
 #include <limits.h>
 #include <stdlib.h>
 #include "value.h"
-#include "alloc.h"
-#include "str.h"
+#include <libpspp/alloc.h>
+#include <libpspp/str.h>
 #include "variable.h"
 
 #ifdef DEBUGGING
index e89cb44eb3f60e6e8071fa66a3d8a774feeee485..bdb68dc65b55617a463fe0ca6ab10a9892d9327b 100644 (file)
@@ -91,7 +91,7 @@ void case_unshare (struct ccase *);
 
 #ifndef DEBUGGING
 #include <stdlib.h>
-#include "str.h"
+#include <libpspp/str.h>
 
 static inline void
 case_nullify (struct ccase *c) 
index ef900e53f231c63e8831d369e9f5772cf06813ba..0bbd3773e8b7511c3c95438581829246ace34213 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "alloc.h"
+#include <libpspp/alloc.h>
 #include "case.h"
-#include "compiler.h"
-#include "message.h"
+#include <libpspp/compiler.h>
+#include <libpspp/message.h>
 #include "full-read.h"
 #include "full-write.h"
-#include "misc.h"
+#include <libpspp/misc.h>
 #include "make-file.h"
 #include "settings.h"
 #include "variable.h"
index e48987a043ded9bd16012145eb69bb7840149dc9..55d7ca8b05addbe392424f1114755d9e4629645d 100644 (file)
@@ -33,9 +33,8 @@
 */
 #include <config.h>
 #include <stdlib.h>
-#include <message.h>
-#include "alloc.h"
-#include "message.h"
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
 #include "category.h"
 #include "cat-routines.h"
 #include <string.h>
index aa8041d8a814b58c9dd11f94f509885a56c0585e..cc3a3e40775d63f134bbe71095ad82593ca59fc9 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <config.h>
 #include "data-in.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <math.h>
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include "calendar.h"
-#include "compiler.h"
+#include <libpspp/compiler.h>
 #include "identifier.h"
-#include "magic.h"
-#include "misc.h"
+#include <libpspp/magic.h>
+#include <libpspp/misc.h>
 #include "settings.h"
-#include "str.h"
+#include <libpspp/str.h>
 #include "variable.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 \f
 /* Specialized error routine. */
 
index 7dfcc7853908f2347f6ec6aa4b187957f773863f..79c7042446abb453c2c1722b118303805dd5b217 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <ctype.h>
 #include <math.h>
 #include <float.h>
 #include <stdlib.h>
 #include <time.h>
 #include "calendar.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include "format.h"
-#include "magic.h"
-#include "misc.h"
-#include "misc.h"
+#include <libpspp/magic.h>
+#include <libpspp/misc.h>
+#include <libpspp/misc.h>
 #include "settings.h"
-#include "str.h"
+#include <libpspp/str.h>
 #include "variable.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 \f
 /* Public functions. */
 
index 0edf228add65c638d4b824236d72bf85f6f14202..849e0210623b56fe601050a81bf35f8bccd15db8 100644 (file)
 #include "dictionary.h"
 #include <stdlib.h>
 #include <ctype.h>
-#include "array.h"
-#include "alloc.h"
+#include <libpspp/array.h>
+#include <libpspp/alloc.h>
 #include "case.h"
 #include "category.h"
 #include "cat-routines.h"
-#include "compiler.h"
-#include "message.h"
-#include "hash.h"
-#include "misc.h"
+#include <libpspp/compiler.h>
+#include <libpspp/message.h>
+#include <libpspp/hash.h>
+#include <libpspp/misc.h>
 #include "settings.h"
-#include "str.h"
+#include <libpspp/str.h>
 #include "value-labels.h"
 #include "variable.h"
 
index 5ece4486989889f6537bcc4d37ba27a6fa55df98..66ee25f5f88c0a33885a70c6ea0a87e3127c1ea0 100644 (file)
 
 #include <config.h>
 #include "file-handle-def.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include "alloc.h"
-#include "compiler.h"
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
 #include "filename.h"
-#include "message.h"
-#include "magic.h"
+#include <libpspp/message.h>
+#include <libpspp/magic.h>
 #include "variable.h"
 #include "scratch-handle.h"
 
index 4bf5edd9c28516186563690b86413cced3e7fed8..be8fddec8de27abe22d73bd091093fdb0244733f 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include "filename.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#include "alloc.h"
+#include <libpspp/alloc.h>
 #include "intprops.h"
-#include "message.h"
-#include "str.h"
+#include <libpspp/message.h>
+#include <libpspp/str.h>
 #include "settings.h"
-#include "version.h"
+#include <libpspp/version.h>
 #include "xreadlink.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* PORTME: Everything in this file is system dependent. */
 
index d3899b43996642d06532e769b454383ccea1cd05..5b9b76569d2ad2611526302391ef60764cc76141 100644 (file)
 #include <config.h>
 #include "format.h"
 #include <ctype.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
-#include "compiler.h"
-#include "misc.h"
+#include <libpspp/compiler.h>
+#include <libpspp/misc.h>
 #include "identifier.h"
-#include "str.h"
+#include <libpspp/str.h>
 #include "variable.h"
 
 #include "gettext.h"
index ed94f04c4adf7888e93dae3580ea403815b816af..1d32d07e39208ca8cf39997c46cae3428ad747b7 100644 (file)
@@ -25,8 +25,8 @@
 #include <stdio.h>
 #include "filename.h"
 #include "make-file.h"
-#include "message.h"
-#include "alloc.h"
+#include <libpspp/message.h>
+#include <libpspp/alloc.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 6940c6cf124d37ff5f0d674578da55ab32dc8c0a..fabf98b70dc4f3c74df7e5457f376b61ca8740ea 100644 (file)
@@ -21,7 +21,7 @@
 #include "missing-values.h"
 #include <assert.h>
 #include <stdlib.h>
-#include "str.h"
+#include <libpspp/str.h>
 
 
 /* Initializes MV as a set of missing values for a variable of
index 1ee598873ed89edff4d6b099a7ff6b2b21c74036..900f62985283d7a3128b93e2e0b774075e982a48 100644 (file)
@@ -21,7 +21,7 @@
 
 #include <config.h>
 #include "por-file-reader.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <math.h>
 #include <setjmp.h>
-#include "alloc.h"
+#include <libpspp/alloc.h>
 #include <stdbool.h>
 #include "case.h"
-#include "compiler.h"
+#include <libpspp/compiler.h>
 #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 <libpspp/hash.h>
+#include <libpspp/magic.h>
+#include <libpspp/misc.h>
+#include <libpspp/pool.h>
+#include <libpspp/str.h>
 #include "value-labels.h"
 #include "variable.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* portable_to_local[PORTABLE] translates the given portable
    character into the local character set. */
index 5d6d1efabd9cf6f75effac30b79780d3e3f426dc..c7c7dd2f211672a68a0cbe5866599b481816f849 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <config.h>
 #include "por-file-writer.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#include "alloc.h"
+#include <libpspp/alloc.h>
 #include "case.h"
 #include "dictionary.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include "file-handle-def.h"
-#include "hash.h"
-#include "magic.h"
-#include "misc.h"
+#include <libpspp/hash.h>
+#include <libpspp/magic.h>
+#include <libpspp/misc.h>
 #include "stat-macros.h"
-#include "str.h"
+#include <libpspp/str.h>
 #include "value-labels.h"
 #include "variable.h"
-#include "version.h"
+#include <libpspp/version.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* Portable file writer. */
 struct pfm_writer
index 2067897e111974c4625c8ed69e73eb63533d0fba..e329d1c8184b04e2420712b92ac7c6330b2420dd 100644 (file)
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include "casefile.h"
 #include "dictionary.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include "file-handle-def.h"
 #include "scratch-handle.h"
 #include "xalloc.h"
index caf7770df432d285f559a61416199942d9fab051..3864ca39e3348a60fbef3823181991de1766d4a2 100644 (file)
@@ -20,7 +20,7 @@
 /* PORTME: There might easily be alignment problems with some of these
    structures. */
 
-#include "compiler.h"
+#include <libpspp/compiler.h>
 #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 <libpspp/magic.h>
 #if SIZEOF_DOUBLE == 8
 #define second_lowest_flt64 second_lowest_value
 #else
index 71fd6814ba544dc120d87741c66894b6e05eedbf..0a85cffa4ce9d9714f9a02294249e60e1ca02e49 100644 (file)
 #include <config.h>
 #include "sys-file-reader.h"
 #include "sfm-private.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
 #include <float.h>
 #include <setjmp.h>
-#include "alloc.h"
+#include <libpspp/alloc.h>
 #include "case.h"
-#include "compiler.h"
+#include <libpspp/compiler.h>
 #include "dictionary.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include "file-handle-def.h"
 #include "filename.h"
 #include "format.h"
-#include "magic.h"
-#include "misc.h"
+#include <libpspp/magic.h>
+#include <libpspp/misc.h>
 #include "value-labels.h"
-#include "str.h"
+#include <libpspp/str.h>
 #include "variable.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* System file reader. */
 struct sfm_reader
index 578bd9896c28e9c5ff461386fb988d5f36a04c1e..823d0c47e29138950421e7103b964f8ba52b48a4 100644 (file)
@@ -20,7 +20,7 @@
 #include <config.h>
 #include "sys-file-writer.h"
 #include "sfm-private.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>    /* Required by SunOS4. */
 #endif
-#include "alloc.h"
+#include <libpspp/alloc.h>
 #include "case.h"
 #include "dictionary.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include "file-handle-def.h"
-#include "hash.h"
-#include "magic.h"
-#include "misc.h"
+#include <libpspp/hash.h>
+#include <libpspp/magic.h>
+#include <libpspp/misc.h>
 #include "settings.h"
 #include "stat-macros.h"
-#include "str.h"
+#include <libpspp/str.h>
 #include "value-labels.h"
 #include "variable.h"
-#include "version.h"
+#include <libpspp/version.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* Compression bias used by PSPP.  Values between (1 -
    COMPRESSION_BIAS) and (251 - COMPRESSION_BIAS) inclusive can be
index dc18a707f6b9c4274aefe3b9fad5f0ef2ed14f3f..1e83463c2aace69581aeecc494dfec8d34ad6e51 100644 (file)
 
 #include <config.h>
 #include "value-labels.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "compiler.h"
-#include "hash.h"
-#include "str.h"
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
+#include <libpspp/hash.h>
+#include <libpspp/str.h>
 
 static hsh_compare_func compare_int_val_lab;
 static hsh_hash_func hash_int_val_lab;
index 30ef24caa6ddf7cb772f158903a98d50cf0549fd..78f0cb443acf2387e5cad42fa07444b71212c2ee 100644 (file)
 
 #include <config.h>
 #include "variable.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "compiler.h"
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
 #include "dictionary.h"
-#include "hash.h"
+#include <libpspp/hash.h>
 #include "identifier.h"
-#include "misc.h"
-#include "str.h"
+#include <libpspp/misc.h>
+#include <libpspp/str.h>
 #include "value-labels.h"
 
 #include "gettext.h"
index 5140bb419570dba5fc3c021f5c3ee822c2d1c94a..6a2d5e5bc91e0252d12e2c1df13582882ab51881 100644 (file)
@@ -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
-
index 397097ab70e40c6bba4410f41079fe4688ca8fbd..45910d84f1491da8041cf2b441980de1edc7f6b6 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
-#include "command.h"
+#include <libpspp/message.h>
+#include <language/command.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#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 <libpspp/alloc.h>
+#include <libpspp/compiler.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <data/settings.h>
+#include <output/manager.h>
+#include <libpspp/str.h>
+#include <output/table.h>
+#include <data/variable.h>
+#include <procedure.h>
 
 #if HAVE_UNISTD_H
 #include <unistd.h>
index 1f61d5a8724d34601172847ab03f31dbab47e26e..4bd14764293ec902ef2de59254f2e36eb8f2a97b 100644 (file)
@@ -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 = \
index 43f90e33bd24efb442c4462a768ce934a1a0e834..7263842933fe225da0a7625250b540cdb89b72aa 100644 (file)
@@ -2,8 +2,8 @@
 #include "control-stack.h"
 #include <assert.h>
 #include <stdlib.h>
-#include "compiler.h"
-#include "message.h"
+#include <libpspp/compiler.h>
+#include <libpspp/message.h>
 #include "xalloc.h"
 
 #include "gettext.h"
index dc39e66d4db01214c5c174bf83ddbe879dd47bee..c16fca926f6702dd06e30147e24aa86883d508b2 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "control-stack.h"
-#include "message.h"
+
 #include <stdlib.h>
-#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 <libpspp/message.h>
+#include <libpspp/alloc.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <libpspp/message.h>
+#include <language/expressions/public.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index ff38ba5f042bcfbbc4ee84e734f2a822ab35a874..da1dc2fc49dfeda732b6f8e599ffe3d14fd92496 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
-#include "alloc.h"
-#include "case.h"
-#include "command.h"
-#include "compiler.h"
-#include "dictionary.h"
+#include <libpspp/message.h>
+#include <libpspp/alloc.h>
+#include <data/case.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <data/dictionary.h>
 #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 <libpspp/message.h>
+#include <language/expressions/public.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/misc.h>
+#include <libpspp/pool.h>
+#include <data/settings.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index a26fda4b2949c61eef734d0c7272d276874775c3..a71501b79c4a3a90bc172da6ff1d8946bb1bdbe5 100644 (file)
 
 #include <config.h>
 #include "repeat.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "dictionary.h"
+#include <libpspp/alloc.h>
+#include <language/command.h>
+#include <data/dictionary.h>
 #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 <libpspp/message.h>
+#include <language/line-buffer.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/misc.h>
+#include <libpspp/pool.h>
+#include <data/settings.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* Defines a list of lines used by DO REPEAT. */
 struct line_list
index e5b8ae47ec670f1ee8a2978ceeed3aae9fab7ddb..c4b2532daee73e6dda0f382eb9d5d47b2e0869ce 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "dictionary.h"
+#include <libpspp/alloc.h>
+#include <language/command.h>
+#include <data/dictionary.h>
 #include "control-stack.h"
-#include "message.h"
-#include "hash.h"
-#include "lexer.h"
-#include "str.h"
-#include "value-labels.h"
-#include "variable.h"
+#include <libpspp/message.h>
+#include <libpspp/hash.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/str.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index b093b1c131281c68d375e1b1f95992b2ca503567..def4c384c9e5f7d71d17cf07049743ce474d15f8 100644 (file)
@@ -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
index cd22d0cda484e0412a6b1c9a2cc7516da6fde1f2..3b5066255eaf3f2c33f89ca286c975b3c95d6c57 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "data-list.h"
-#include "message.h"
+#include <language/data-io/data-list.h>
+#include <libpspp/message.h>
 #include <ctype.h>
 #include <float.h>
 #include <stdio.h>
 #include <stdlib.h>
-#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 <libpspp/alloc.h>
+#include <data/case.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <data/data-in.h>
+#include <libpspp/debug-print.h>
+#include <language/data-io/data-reader.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <language/data-io/file-handle.h>
+#include <data/format.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/misc.h>
+#include <data/settings.h>
+#include <libpspp/str.h>
+#include <output/table.h>
+#include <data/variable.h>
+#include <procedure.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 9b78ccdc11d1e57869390baa63d369df9973bea4..10316621dbc4fb016a50047a98d6aa0123adaf8c 100644 (file)
@@ -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 <data/variable.h>
+#include <procedure.h>
 
 trns_proc_func repeating_data_trns_proc;
 void repeating_data_set_write_case (struct transformation *,
index 24b27b4048732b870d3ae15045537a5359bfcecf..c4bdd5389118ed1cf3d71b4479b7951de7fa47a5 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "data-reader.h"
+#include <language/data-io/data-reader.h>
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#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 <libpspp/alloc.h>
+#include <language/command.h>
+#include <libpspp/message.h>
+#include <language/data-io/file-handle.h>
+#include <data/file-handle-def.h>
+#include <data/filename.h>
+#include <language/line-buffer.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/str.h>
+#include <procedure.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* Flags for DFM readers. */
 enum dfm_reader_flags
index 993b81ca3f8dee58f4afb2fd8e56972675600e5f..57a5b9f71abc29422006c11c88b8c885cf66f76a 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "data-writer.h"
+#include <language/data-io/data-writer.h>
 #include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "message.h"
-#include "file-handle.h"
-#include "filename.h"
-#include "str.h"
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
+#include <language/data-io/file-handle.h>
+#include <data/filename.h>
+#include <libpspp/str.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 2e8de05ab2f774c840b9ab09cd80a9f16449b5f3..31333e9e8ecc3cd4d568a372e74a04a23c967682 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include "file-handle-def.h"
+#include <data/file-handle-def.h>
 
 struct file_handle *fh_parse (enum fh_referent);
 
index 65c7b2558e5d427a423530ad445530486f0f2b6d..09c180dc84135f944cb2ebbc6d6d3b0fbeca60ee 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "file-handle.h"
-#include "message.h"
+#include <language/data-io/file-handle.h>
+#include <libpspp/message.h>
 #include <errno.h>
 #include <stdlib.h>
-#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 <libpspp/alloc.h>
+#include <data/filename.h>
+#include <language/command.h>
+#include <language/lexer/lexer.h>
+#include <language/line-buffer.h>
+#include <libpspp/message.h>
+#include <libpspp/magic.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
+#include <data/file-handle-def.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 6a7e7cc2e2b815d82f6e5b966e56079ab3b29c91..99a5d050d21c5757fe521b4d47311b23eea762e6 100644 (file)
 
 #include <config.h>
 #include <stdlib.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 "format.h"
-#include "lexer.h"
-#include "str.h"
-#include "variable.h"
-#include "procedure.h"
+#include <libpspp/alloc.h>
+#include <data/case.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <data/data-in.h>
+#include <language/data-io/data-reader.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <language/data-io/file-handle.h>
+#include <data/format.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
+#include <procedure.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index df31b11d119a505f36038bc4645b3baf84751687..052dbeabbbd63931189aa120c833fb0ffb451a9c 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
-#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 <libpspp/alloc.h>
+#include <data/any-reader.h>
+#include <data/any-writer.h>
+#include <data/case.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <language/data-io/file-handle.h>
+#include <libpspp/hash.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/misc.h>
+#include <data/por-file-writer.h>
+#include <data/settings.h>
+#include <data/sys-file-writer.h>
+#include <libpspp/str.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
+#include <procedure.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* Rearranging and reducing a dictionary. */
 static void start_case_map (struct dictionary *);
@@ -735,7 +735,7 @@ keep_variables (struct dictionary *dict)
 \f
 /* MATCH FILES. */
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* File types. */
 enum
index 875a6fdc9c482e3030b93b8a7049d2bb5cff36da..06b6c38625b12ef218ead57c11effc9479aee473 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <float.h>
 #include <stdlib.h>
-#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 <libpspp/alloc.h>
+#include <data/case.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <language/data-io/data-list.h>
+#include <language/data-io/data-reader.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <language/expressions/public.h>
+#include <language/data-io/file-handle.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/misc.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
+#include <procedure.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* Indicates how a `union value' should be initialized. */
 enum value_init_type
index 77080a563825eae535db1f1687f65a04f823f375..8980bdde253a2af0e402a0a1b502e8cbc876c54b 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "case.h"
-#include "command.h"
-#include "compiler.h"
-#include "dictionary.h"
+#include <libpspp/alloc.h>
+#include <data/case.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <data/dictionary.h>
 #include "intprops.h"
-#include "lexer.h"
-#include "message.h"
-#include "magic.h"
-#include "misc.h"
-#include "htmlP.h"
-#include "output.h"
+#include <language/lexer/lexer.h>
+#include <libpspp/message.h>
+#include <libpspp/magic.h>
+#include <libpspp/misc.h>
+#include <output/htmlP.h>
+#include <output/output.h>
 #include "size_max.h"
-#include "manager.h"
-#include "table.h"
-#include "variable.h"
-#include "procedure.h"
-#include "format.h"
+#include <output/manager.h>
+#include <output/table.h>
+#include <data/variable.h>
+#include <procedure.h>
+#include <data/format.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
 /* (headers) */
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* (specification)
    list (lst_):
index 47281defa3bce9be7da93db0e21ee726834e620d..8dc3f00a929ccab93b62b55d980cd1dff19dc4de 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <float.h>
-#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 <libpspp/array.h>
+#include <libpspp/alloc.h>
+#include <data/case.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <data/data-in.h>
+#include <language/data-io/data-reader.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <language/data-io/file-handle.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/misc.h>
+#include <libpspp/pool.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
+#include <procedure.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* FIXME: /N subcommand not implemented.  It should be pretty simple,
    too. */
index 2399de799c2d392d9d59ee9c41f6ebfd629cd9db..9d835abe5204f439fbe97b18b7a091a9b8b8e1bd 100644 (file)
 /* FIXME: seems like a lot of code duplication with data-list.c. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
-#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 <libpspp/alloc.h>
+#include <data/case.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <language/data-io/data-writer.h>
+#include <libpspp/message.h>
+#include <language/expressions/public.h>
+#include <language/data-io/file-handle.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/misc.h>
+#include <output/manager.h>
+#include <output/table.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 0cf66e2d09452c38bb20bfb940bccbb62971b143..00025ead43b1793d118417c4e603ac7ecb48674d 100644 (file)
 
 #include <config.h>
 #include <stdlib.h>
-#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 <data/any-reader.h>
+#include <language/command.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <data/file-handle-def.h>
+#include <libpspp/hash.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/str.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* Parses and executes APPLY DICTIONARY. */
 int
index 963e389048ee189d1e640f95d13a8659d153a7a7..4a8b4ad1d59507e76a53d5ea3db4ef8ed099c6bc 100644 (file)
@@ -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 = \
index 9e62d9930b9d7b3c21efa82cc5c920b3e80c9569..d6eb8bfbc1e243d3d6e080cd3812f036b19b1a14 100644 (file)
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
-#include "misc.h"
-#include "str.h"
-#include "variable.h"
+#include <language/command.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/misc.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 enum
   {
index 352284b3af1a49957cbe492cb0baf133e8a8c355..3bcf24d3adea9fd1fd38f7c211064987686d0467 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
-#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 <language/command.h>
+#include <data/data-in.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/magic.h>
+#include <language/lexer/range-parser.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 int
 cmd_missing_values (void)
index 6ead73dc318e01c848b09a739596ab92036f8f45..7b8d5681fba57f8ed72cbaae1dd2f152a1d04eec 100644 (file)
 
 #include <config.h>
 #include <stdlib.h>
-#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 <libpspp/message.h>
+#include <libpspp/array.h>
+#include <libpspp/alloc.h>
+#include <libpspp/bit-vector.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <libpspp/hash.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/misc.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
+#include <procedure.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 03eb06b72bb729dc19fc2ddb01ce14edf038d840..4800ac86944f83f894f6cf0df662551bec11669d 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
-#include "command.h"
-#include "dictionary.h"
-#include "message.h"
-#include "lexer.h"
-#include "str.h"
-#include "variable.h"
+#include <language/command.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* Parses the NUMERIC command. */
 int
index 1c20c6a643519f12a9e684de1185a07c94969f9c..9ba6630281877fd779f8f43898bed72da42f399f 100644 (file)
 
 #include <config.h>
 #include <stdlib.h>
-#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 <libpspp/message.h>
+#include <libpspp/alloc.h>
+#include <language/command.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <libpspp/hash.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 38eabc45406822db0bf436d7771f0986ae575457..4239ac33325e4ae31434c457205a36e7099a34e4 100644 (file)
 
 #include <config.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "dictionary.h"
-#include "message.h"
-#include "lexer.h"
-#include "str.h"
-#include "variable.h"
+#include <libpspp/alloc.h>
+#include <language/command.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 int
 cmd_split_file (void)
index 0234b833ca9fed36b8ff70336df5790dab740161..98cc90ddfb9e600114de1b8712ff97b65c08c729 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <ctype.h>
 #include <stdlib.h>
-#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 <libpspp/array.h>
+#include <libpspp/alloc.h>
+#include <language/command.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <data/file-handle-def.h>
+#include <libpspp/hash.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/magic.h>
+#include <libpspp/misc.h>
+#include <output/output.h>
+#include <data/sys-file-reader.h>
+#include <output/manager.h>
+#include <output/table.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 96b80ba735294adad2dd73852c464eed45c3f933..976d54790965ff26ab6598216ea9de72ecb9ca00 100644 (file)
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
-#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 <libpspp/alloc.h>
+#include <language/command.h>
+#include <libpspp/message.h>
+#include <libpspp/hash.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/str.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index b7dd8126c25a157a632ce71d363b96c12a32c6d5..c1b6e1e7b847a29f447cac84ab50864666649d37 100644 (file)
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
-#include "str.h"
-#include "variable.h"
-
-#include "debug-print.h"
+#include <libpspp/alloc.h>
+#include <language/command.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
+
+#include <libpspp/debug-print.h>
 
 /* Set variables' alignment
    This is the alignment for GUI display only.
index 6ddb00a5ef6f8443e9b0e166e179af9fd71a329a..bc171a296ebb8c02c65db2843a3569d77633b836 100644 (file)
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
-#include "str.h"
-#include "variable.h"
+#include <libpspp/alloc.h>
+#include <language/command.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 int
 cmd_variable_labels (void)
index 9b1eb2cda54bd01257a5064d766f9f66142a3e04..20cb5f849992c5f4bad7c1cc905dfd6c79431f7c 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
-#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 <libpspp/alloc.h>
+#include <language/command.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/misc.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index b6d63c972c33348861635fc27ceedeb2a3f257f7..6528141f8e81f4127f1a29f804d891189502712c 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdio.h>
-#include "command.h"
-#include "dictionary.h"
-#include "message.h"
-#include "lexer.h"
-#include "str.h"
-#include "variable.h"
+#include <language/command.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 1ad694b02649f68053869641fe46c714e464c4b5..f1687486eaaf10baae3e5a91db5224c640a8e576 100644 (file)
@@ -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)
 
index e5f605b797966f7009ca5c48ef0d09694f530e2e..cd84482462e4e10d6610e494a3d68c9a750fb2b5 100644 (file)
 #include "private.h"
 
 #include <ctype.h>
-#include "alloc.h"
-#include "message.h"
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
 #include "helpers.h"
 #include "evaluate.h"
-#include "pool.h"
+#include <libpspp/pool.h>
 
 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);
 }
 \f
-#include "lexer.h"
-#include "command.h"
+#include <language/lexer/lexer.h>
+#include <language/command.h>
 
 int
 cmd_debug_evaluate (void)
index b4534c8111719e8e1f9de3ac73d3b9a3cf66dffd..ff1621479505e151cabb289cdd97d2d80ed9962d 100644 (file)
@@ -2,7 +2,7 @@
 #include "helpers.h"
 #include <gsl/gsl_roots.h>
 #include <gsl/gsl_sf.h>
-#include "pool.h"
+#include <libpspp/pool.h>
 #include "private.h"
 
 const struct fixed_string empty_string = {NULL, 0};
index 54e56bbdb1873e1e0d305cc85fca9fb32092e5a5..c8355550ed22f44919f57ea829cc64f020e3f494 100644 (file)
@@ -9,21 +9,21 @@
 #include <limits.h>
 #include <math.h>
 #include <stdbool.h>
-#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 <data/case.h>
+#include <libpspp/compiler.h>
+#include <data/data-in.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <data/calendar.h>
+#include <gsl-extras/gsl-extras.h>
+#include <libpspp/misc.h>
+#include <math/moments.h>
+#include <math/random.h>
+#include <data/settings.h>
+#include <libpspp/str.h>
+#include <data/value.h>
+#include <data/variable.h>
+#include <procedure.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index b280b6d737485527d92e5fde4b6d48af97d63e99..9f9626bc06329c95a3b75312eb60b7aa149d8e8b 100644 (file)
 #include <ctype.h>
 #include <errno.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "calendar.h"
-#include "data-in.h"
-#include "message.h"
+#include <libpspp/alloc.h>
+#include <data/calendar.h>
+#include <data/data-in.h>
+#include <libpspp/message.h>
 #include "evaluate.h"
 #include "helpers.h"
-#include "misc.h"
-#include "pool.h"
+#include <libpspp/misc.h>
+#include <libpspp/pool.h>
 #include "public.h"
-#include "str.h"
-#include "variable.h"
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 static union any_node *evaluate_tree (struct composite_node *,
                                       struct expression *);
index c348361b01291c6a178f6f913d7409feb7bba893..e063acb5cae2995009a70dfef36ca5929b00f50c 100644 (file)
 #include <float.h>
 #include <limits.h>
 #include <stdlib.h>
-#include "array.h"
-#include "alloc.h"
-#include "case.h"
-#include "dictionary.h"
-#include "message.h"
+#include <libpspp/array.h>
+#include <libpspp/alloc.h>
+#include <data/case.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
 #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 <language/lexer/lexer.h>
+#include <libpspp/misc.h>
+#include <libpspp/pool.h>
+#include <data/settings.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
+#include <procedure.h>
 \f
 /* Declarations. */
 
index 85b82587f5f895e4f0d8bb4eed29d1cb61b67ce5..9e00bdf41b02574e44064e2244c9bc79e9212751 100644 (file)
@@ -22,8 +22,8 @@
 
 #include <assert.h>
 #include <stddef.h>
-#include "format.h"
-#include "str.h"
+#include <data/format.h>
+#include <libpspp/str.h>
 
 #include "public.h"
 #include "operations.h"
index ed172773e9c22010b6c4cf3aed6145e70d42f957..73dfa30f4f4ad59de5fe35efe0e8e8b67f055e93 100644 (file)
@@ -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 = \
index b3ccba55ced7b4d559966817c438b878ce87a1f8..69a83b78676fe5f8ec6d1ceb73595461012ccf61 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "format.h"
+#include <data/format.h>
 #include <ctype.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include "lexer.h"
-#include "misc.h"
-#include "str.h"
-#include "variable.h"
+#include <libpspp/misc.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 391fa79a3e1332fb324e4aa2871be3dba8d0b9c8..ec8c45103bc9378fa88df355fa18a5c173c07ea0 100644 (file)
 
 #include <config.h>
 #include "lexer.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
 #include <math.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "message.h"
-#include "line-buffer.h"
-#include "magic.h"
-#include "settings.h"
-#include "str.h"
+#include <libpspp/alloc.h>
+#include <language/command.h>
+#include <libpspp/message.h>
+#include <language/line-buffer.h>
+#include <libpspp/magic.h>
+#include <data/settings.h>
+#include <libpspp/str.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index ad162c8e5ca4b99420a86ad39572937f81ec4cf9..4ea80707c2bd0a1affe002e2b11744b2dae03999 100644 (file)
 #if !lexer_h
 #define lexer_h 1
 
-#include "variable.h"
+#include <data/variable.h>
 #include <ctype.h>
 #include <stdbool.h>
 
-#include "identifier.h"
+#include <data/identifier.h>
 
 
 extern int token;
index 46255e34aa391b904c1d644ad268425e20e619ad..9e8af0a246998d55babd943e2a6de952b8de52be 100644 (file)
@@ -18,6 +18,7 @@
    02110-1301, USA. */
 
 #include <config.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -28,8 +29,8 @@
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include "compiler.h"
-#include "str.h"
+#include <libpspp/compiler.h>
+#include <libpspp/str.h>
 
 
 /* Brokenness. */
 #define EXIT_FAILURE 1
 #endif
 
-/* 
-#if !HAVE_STRERROR
-#include "misc/strerror.c"
-#endif
-*/
      
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* 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 <stdlib.h>");
-         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 <libpspp/alloc.h>");
+         dump (0, "#include <libpspp/message.h>");
+         dump (0, "#include <language/lexer/lexer.h>");
+          dump (0, "#include <data/settings.h>");
+         dump (0, "#include <libpspp/str.h>");
+          dump (0, "#include <language/lexer/subcommand-list.h>");
+         dump (0, "#include <data/variable.h>");
          dump (0, nullstr);
 
           dump (0, "#include \"gettext.h\"");
index 41d01984fb5528dc7ff1b09e90ad07cdf57e3f8e..334987a3e611d41151ca9cb0bb1f3cf484a9d2e4 100644 (file)
@@ -1,12 +1,12 @@
 #include <config.h>
 #include "range-parser.h"
 #include <stdbool.h>
-#include "data-in.h"
-#include "message.h"
+#include <data/data-in.h>
+#include <libpspp/message.h>
 #include "lexer.h"
-#include "magic.h"
-#include "str.h"
-#include "value.h"
+#include <libpspp/magic.h>
+#include <libpspp/str.h>
+#include <data/value.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 937e51ca697a25740817540368305ff9a68a8e8c..7037ccbf44ece95a87fa8e37037d573ee8bec1cf 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "variable.h"
+#include <data/variable.h>
 #include <ctype.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "bit-vector.h"
-#include "dictionary.h"
-#include "message.h"
-#include "hash.h"
+#include <libpspp/alloc.h>
+#include <libpspp/bit-vector.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <libpspp/hash.h>
 #include "lexer.h"
-#include "misc.h"
-#include "pool.h"
+#include <libpspp/misc.h>
+#include <libpspp/pool.h>
 #include "size_max.h"
-#include "str.h"
+#include <libpspp/str.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index ef0e74d34c06cee903c1a9a0926ecb6f94c5fa29..0803f0825ed712e2be08b27f19263adc28fb0d9c 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "line-buffer.h"
-#include "message.h"
+#include <language/line-buffer.h>
+#include <libpspp/message.h>
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
-#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 <libpspp/alloc.h>
+#include <language/command.h>
+#include <libpspp/message.h>
+#include <data/filename.h>
+#include <language/lexer/lexer.h>
+#include <data/settings.h>
+#include <libpspp/str.h>
+#include <output/table.h>
+#include <data/variable.h>
+#include <libpspp/version.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 1ca8a7b4a5e30191dd1e0571fdcb8c83b834c38d..59dab0a58d830f35e1272339579ed699f9a96646 100644 (file)
@@ -21,7 +21,7 @@
 #define GETL_H 1
 
 #include <stdbool.h>
-#include "str.h"
+#include <libpspp/str.h>
 
 /* Current line.  This line may be modified by modules other than
    getl.c, and by lexer.c in particular.  (Ugh.) */
index 0485ccaecad5d65f38b825be3bf96dec5d93c91a..793a7256f2ee792e9cf04e81075a8bc17aa9f7f4 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
-#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 <libpspp/alloc.h>
+#include <data/any-writer.h>
+#include <data/case.h>
+#include <data/casefile.h>
+#include <language/command.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <data/file-handle-def.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/misc.h>
+#include <math/moments.h>
+#include <libpspp/pool.h>
+#include <data/settings.h>
+#include <data/sys-file-writer.h>
+#include <math/sort.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
+#include <procedure.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index aebae9686bc4b0015ed86a3f3c92b3cc9047d3d4..a8a23590d3d1283eb2215b48dc9c53a44bbd74aa 100644 (file)
@@ -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 =  \
index 1aea061f5af3f6e45b893245aeceb9a51b418bf5..89ac44db42e2c8c2606bf58789901e4460d20b02 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
-#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 <libpspp/alloc.h>
+#include <data/case.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <libpspp/hash.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/pool.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
+#include <procedure.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 59f06e48d08ac9ed42df89069512d36d102643a2..10818591e521ee31b1f63c57101218db9679668c 100644 (file)
 
 #include <config.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "compiler.h"
-#include "dictionary.h"
-#include "file-handle-def.h"
-#include "command.h"
-#include "lexer.h"
-#include "variable.h"
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
+#include <data/dictionary.h>
+#include <data/file-handle-def.h>
+#include <language/command.h>
+#include <language/lexer/lexer.h>
+#include <data/variable.h>
 /* (headers) */
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 struct cor_set
   {
index 18eb26ec3fdc2ec0c55be2efe9bdd8743d2d13e4..2818a17992656726401f1ee1dc2318605c3c3f41 100644 (file)
 */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <gsl/gsl_cdf.h>
-#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 <libpspp/array.h>
+#include <libpspp/alloc.h>
+#include <data/case.h>
+#include <data/dictionary.h>
+#include <libpspp/hash.h>
+#include <libpspp/pool.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/message.h>
+#include <libpspp/magic.h>
+#include <libpspp/misc.h>
+#include <output/output.h>
+#include <libpspp/str.h>
+#include <output/table.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
+#include <procedure.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -60,7 +60,7 @@
 
 /* (headers) */
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* (specification)
    crosstabs (crs_):
index 6704fe5d2408db4ff920e3f82e2c38e1ae3d7d63..b305deea0f1aa022add52c4b0199daeb5a33c0c6 100644 (file)
 /* FIXME: Many possible optimizations. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <limits.h>
 #include <math.h>
 #include <stdlib.h>
-#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 <libpspp/array.h>
+#include <libpspp/alloc.h>
+#include <data/case.h>
+#include <data/casefile.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <data/dictionary.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/message.h>
+#include <libpspp/magic.h>
+#include <math/moments.h>
+#include <output/manager.h>
+#include <output/table.h>
+#include <data/variable.h>
+#include <procedure.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 14981e884e0469ae3c2ab080904684cc13ca7608..8248ff18c9c5d5cb1f17fe389da28fa270e79def 100644 (file)
@@ -20,41 +20,41 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 #include <config.h>
 #include <gsl/gsl_cdf.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#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 <libpspp/alloc.h>
+#include <libpspp/str.h>
+#include <data/case.h>
+#include <data/dictionary.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/message.h>
+#include <libpspp/magic.h>
+#include <libpspp/misc.h>
+#include <output/table.h>
+#include <output/manager.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
+#include <procedure.h>
+#include <libpspp/hash.h>
+#include <data/casefile.h>
+#include <math/factor-stats.h>
+#include <math/moments.h>
+#include <math/percentiles.h>
+#include <output/charts/box-whisker.h>
+#include <output/charts/cartesian.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
 /* (headers) */
-#include "chart.h"
-#include "plot-hist.h"
-#include "plot-chart.h"
+#include <output/chart.h>
+#include <output/charts/plot-hist.h>
+#include <output/charts/plot-chart.h>
 
 /* (specification)
    "EXAMINE" (xmn_):
index bc5399a7b3ca500165f1f2585693a21175cbba5c..43d6d0f5b2a7916b5690625a03d322682d14fa17 100644 (file)
    02110-1301, USA. */
 
 #include "config.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <ctype.h>
 #include <errno.h>
 #include <float.h>
 #include <limits.h>
 #include <stdlib.h>
-#include "array.h"
-#include "alloc.h"
-#include "case.h"
-#include "command.h"
-#include "dictionary.h"
-#include "message.h"
+#include <libpspp/array.h>
+#include <libpspp/alloc.h>
+#include <data/case.h>
+#include <language/command.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
 #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 <language/lexer/lexer.h>
+#include <libpspp/misc.h>
+#include <libpspp/pool.h>
+#include <data/settings.h>
+#include <libpspp/str.h>
+#include <data/value.h>
+#include <data/variable.h>
+#include <procedure.h>
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
index 0bc6b555aed9239f7284fbb6d61529bf65277ae4..9b338a83535de77aa11863706114efd0b6fa8943 100644 (file)
 */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <math.h>
 #include <stdlib.h>
 #include <gsl/gsl_histogram.h>
 
-#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 <libpspp/alloc.h>
+#include <libpspp/bit-vector.h>
+#include <data/case.h>
+#include <libpspp/compiler.h>
+#include <data/dictionary.h>
+#include <libpspp/hash.h>
+#include <libpspp/pool.h>
+#include <language/command.h>
+#include <language/lexer/lexer.h>
+#include <math/moments.h>
+#include <libpspp/message.h>
+#include <libpspp/array.h>
+#include <libpspp/magic.h>
+#include <libpspp/misc.h>
+#include <output/output.h>
+#include <output/manager.h>
+#include <libpspp/str.h>
+#include <output/table.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
+#include <procedure.h>
+#include <data/settings.h>
+#include <output/charts/piechart.h>
+#include <output/chart.h>
+#include <output/charts/plot-hist.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -61,7 +61,7 @@
 
 /* (headers) */
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* (specification)
    FREQUENCIES (frq_):
index 017b53fe96278c06c1d00dbfa86f6dcd7c75f6d8..51644ac8a42a4239868332528503f94446f7b7ab 100644 (file)
 #include <config.h>
 #include <stdlib.h>
 #include <stdio.h>
-#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 <data/dictionary.h>
+#include <libpspp/message.h>
+#include <libpspp/alloc.h>
+#include <language/command.h>
+#include <libpspp/hash.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/message.h>
+#include <libpspp/magic.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
 /* (headers) */
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* (specification)
    means (mns_):
index 6c745cd15367fdab19724bc6e63a57b77ed25a2e..a2d6ab9cb0bde3a4daf336674b97bce338bf9029 100644 (file)
@@ -20,30 +20,30 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 #include <config.h>
 #include <gsl/gsl_cdf.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#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 <libpspp/alloc.h>
+#include <libpspp/str.h>
+#include <data/case.h>
+#include <data/dictionary.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/message.h>
+#include <libpspp/magic.h>
+#include <libpspp/misc.h>
+#include <output/table.h>
+#include <output/manager.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
+#include <procedure.h>
+#include <libpspp/hash.h>
+#include <data/casefile.h>
+#include <math/group-proc.h>
+#include <math/group.h>
+#include <math/levene.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index a138fc8f75dac40b028d5cb48421e377667621c7..dc0b9ddd8969276097569a7015a7da8f2192f0b0 100644 (file)
@@ -19,11 +19,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA. */
 
 #include <config.h>
-#include "command.h"
-#include "compiler.h"
-#include "dictionary.h"
-#include "sort.h"
-#include "variable.h"
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <data/dictionary.h>
+#include <math/sort.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 874e7bc2a145ae320570c83367c5586b8f1c7b21..4359d6f7f734de1fabb4fdfd7af4830211a5f6d5 100644 (file)
 #include <gsl/gsl_vector.h>
 #include <gsl/gsl_matrix.h>
 #include <math.h>
-#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 <libpspp/alloc.h>
+#include <data/case.h>
+#include <data/casefile.h>
+#include <data/category.h>
+#include <data/cat-routines.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <math/design-matrix.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <data/file-handle-def.h>
 #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 <language/lexer/lexer.h>
+#include <math/linreg/linreg.h>
+#include <math/linreg/coefficient.h>
+#include <data/missing-values.h>
+#include <language/stats/regression-export.h>
+#include <output/table.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
+#include <procedure.h>
 
 #define REG_LARGE_DATA 1000
 
index ed442f74f1aa55134e27890c3d0db22518f97053..dd0387418ac30a9c92b25ba84aa1ed4e2bc25bf5 100644 (file)
 #include <assert.h>
 #include <stdlib.h>
 #include <limits.h>
-#include "alloc.h"
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
-#include "settings.h"
+#include <libpspp/alloc.h>
+#include <language/command.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <data/settings.h>
 #include "sort-criteria.h"
-#include "sort.h"
-#include "variable.h"
+#include <math/sort.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 5bc26d9abfae6b1b89f06ede6904b994b1c9c0b1..fd90af22ff85958b2a00ef0523606d70846fe48b 100644 (file)
 #include <assert.h>
 #include <stdlib.h>
 #include <limits.h>
-#include "alloc.h"
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
-#include "settings.h"
-#include "variable.h"
+#include <libpspp/alloc.h>
+#include <language/command.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <data/settings.h>
+#include <data/variable.h>
 #include "sort-criteria.h"
-#include "sort.h"
+#include <math/sort.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index fac23714fe577496155c169b129a4ed216c7f652..c558d60acc1be8ad1d08ce94b156260148b8e28c 100644 (file)
 
 #include <config.h>
 #include <gsl/gsl_cdf.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#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 <libpspp/alloc.h>
+#include <data/case.h>
+#include <data/casefile.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <math/group-proc.h>
+#include <libpspp/hash.h>
+#include <math/levene.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/magic.h>
+#include <libpspp/misc.h>
 #include "size_max.h"
-#include "manager.h"
-#include "str.h"
-#include "table.h"
-#include "value-labels.h"
-#include "variable.h"
-#include "procedure.h"
+#include <output/manager.h>
+#include <libpspp/str.h>
+#include <output/table.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
+#include <procedure.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 1aceb88e72c9a0aa5998650fcf6e1d7f57e374ea..28e37d5c5875531cfb45d0f34e87d23de090e214 100644 (file)
@@ -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 = \
index 4a0c699c3ec5b5865ba6bf215de0f40d71fa23b4..10722dcbaf17152c9f62740e1586a19ab7585e07 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "casefile.h"
-#include "case.h"
+#include <data/casefile.h>
+#include <data/case.h>
 
 #include <gsl/gsl_rng.h>
 #include <stdarg.h>
-#include "command.h"
-#include "lexer.h"
+#include <language/command.h>
+#include <language/lexer/lexer.h>
 
 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,
index c038a63c42fce13257b60e7b04bcc3af975b3921..4b685231454eaa2a17de5d9d9dab861c6dcdd84e 100644 (file)
@@ -20,9 +20,9 @@
 #include <config.h>
 #include <stdio.h>
 #include "gettext.h"
-#include "command.h"
-#include "lexer.h"
-#include "moments.h"
+#include <language/command.h>
+#include <language/lexer/lexer.h>
+#include <math/moments.h>
 
 #define _(msgid) gettext (msgid)
 
index 86d50fccf8b8a00740f6cb82d74f2b496878fff3..17674fbdba28bb48e4f912a77317ce12bcaaa135 100644 (file)
@@ -18,8 +18,8 @@
    02110-1301, USA. */
 
 #include <config.h>
-#include "pool.h"
-#include "command.h"
+#include <libpspp/pool.h>
+#include <language/command.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
index ba7ab45cc497904b111e74344692efcf0faa9bee..9ec8db1d2778670a1a99451e9d114607e0b4992c 100644 (file)
@@ -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
 
index aa6cb2205d934d3f888088e6e42813c244845544..06115f9176ea0a1e35cd9444727f1ed91acedb09 100644 (file)
@@ -18,9 +18,9 @@
    02110-1301, USA. */
 
 #include <config.h>
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
+#include <language/command.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 33d569f4acc9e80ff176ef649cedc88257f95631..09c42382ead50dcdd78fe0d352ff3e01934cf508 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
-#include "alloc.h"
-#include "str.h"
-#include "lexer.h"
-#include "command.h"
-#include "table.h"
-#include "manager.h"
+#include <libpspp/message.h>
+#include <libpspp/alloc.h>
+#include <libpspp/str.h>
+#include <language/lexer/lexer.h>
+#include <language/command.h>
+#include <output/table.h>
+#include <output/manager.h>
 
 /* Echos a string to the output stream */
 int
index aab817cb5b07e5d2cb1cd79da2a069e1b9704331..a148d6fac7e401f2ec97a9bc3ada89b15a604620 100644 (file)
 #include <config.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "message.h"
-#include "line-buffer.h"
-#include "lexer.h"
-#include "str.h"
+#include <libpspp/alloc.h>
+#include <language/command.h>
+#include <libpspp/message.h>
+#include <language/line-buffer.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/str.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 05a503ca2894b65d280c614e8d6b010867df8c1e..940b2d2bfb3655b269020022e065bdfd035c3e48 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
-#include "settings.h"
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
-#include "misc.h"
+#include <data/settings.h>
+#include <language/command.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/misc.h>
 #include "stat-macros.h"
-#include "str.h"
+#include <libpspp/str.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 23559589dd2744a211e9d3f828be3413237ea220..19a287b219d0e6d32947614a1db6a91b843217c8 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "settings.h"
-#include "message.h"
+#include <data/settings.h>
+#include <libpspp/message.h>
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <time.h>
-#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 <libpspp/alloc.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <data/dictionary.h>
+#include <language/line-buffer.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/message.h>
+#include <libpspp/magic.h>
+#include <output/output.h>
+#include <math/random.h>
+#include <data/variable.h>
+#include <data/format.h>
+#include <libpspp/copyleft.h>
+#include <data/variable.h>
 
 
 #if HAVE_LIBTERMCAP
index 759208d35122f38405fbe4e5529f780aa50260c4..15e5a404983a1d85fa321b825691b52b927b993c 100644 (file)
 #include <config.h>
 #include <ctype.h>
 #include <stdlib.h>
-#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 <libpspp/alloc.h>
+#include <language/command.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <output/output.h>
+#include <libpspp/start-date.h>
+#include <data/variable.h>
+#include <libpspp/version.h>
+#include <procedure.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 static int get_title (const char *cmd, char **title);
 
index db5b206d79cbca0ecf4b31cf25dca53fd2ca6f14..3e88a98452afb5c891b2b09110d8e0eaacbb6e9b 100644 (file)
@@ -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 = \
index 13499a067fb125754a4feff5816d97ca66fcc981..ae2ceaf50a51eaeb7eb05aaa397eb0fdd7df2b3d 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
-#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 <libpspp/alloc.h>
+#include <data/case.h>
+#include <language/command.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <language/expressions/public.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/misc.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 43576235284a34109afb7956c9d5b0dad2b99b48..e3f8f35805970ec579a537a98414f4eeab374c6d 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
-#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 <libpspp/alloc.h>
+#include <data/case.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/pool.h>
+#include <language/lexer/range-parser.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 38bb5508e1260149e54b02a1d4b71d4eb80c75f2..d2548f31dc7361c66cf0de3f1486a96f45fed182 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>
-#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 <libpspp/alloc.h>
+#include <data/case.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <data/data-in.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/magic.h>
+#include <libpspp/pool.h>
+#include <language/lexer/range-parser.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index f0bfab98e4f49b73c41649d84437d33ea0ff5af6..fc463123d2a8be27a32029a3b44a2b942770ff31 100644 (file)
 #include <limits.h>
 #include <stdio.h>
 #include <math.h>
-#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 <libpspp/alloc.h>
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <math/random.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* The two different types of samples. */
 enum
index 23426edd48327ddeda91259dc87b5151fb67ed80..5f15b43ebe1aed6d932e55490d07e57677a1d155 100644 (file)
 
 #include <config.h>
 #include <stdlib.h>
-#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 <libpspp/alloc.h>
+#include <language/command.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <language/expressions/public.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index f1a772f17ad155fdb88c58a6a96d911594efb140..5341c0728b19c691937de7f4a33d32a1af1681c8 100644 (file)
@@ -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 <config.h>" > $@
-       echo "#include <libpspp/version.h>" > $@
+       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\";" >> $@
 
+
index b0341fb7493733de13f50c1af6768ee073284c36..77a71c28a8ea741f8c033642dd7b1124aba2c892 100644 (file)
@@ -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 = \
index 138813d7fb20f47d432a27bc0b7bf3fd98bc5f9b..63c1dd9ecc6417dfef852e5122d99e9c3f61c1dc 100644 (file)
 */
 #include <config.h>
 #include <stdlib.h>
-#include <message.h>
-#include "alloc.h"
-#include "message.h"
-#include "variable.h"
-#include "category.h"
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
+#include <data/variable.h>
+#include <data/category.h>
 #include "design-matrix.h"
 #include <string.h>
 #include <math.h>
index 7f13fe87d5bc276422ac9537142e6a1ce850c1d9..8c268de42422f36504f75e87e05f2e8c85afa0d8 100644 (file)
@@ -26,8 +26,8 @@
 
 #include <gsl/gsl_matrix.h>
 #include <stdbool.h>
-#include "category.h"
-#include "cat-routines.h"
+#include <data/category.h>
+#include <data/cat-routines.h>
 struct design_matrix_var
 {
   size_t first_column;         /* First column for this variable in
index 8b6f4e8436357c7ff38665cb538951087e162668..47d17706fe85e96e3d4c3360c7337a7c2f4530af 100644 (file)
@@ -20,10 +20,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 #include <config.h>
 #include "factor-stats.h"
-#include "value.h"
-#include "hash.h"
-#include "array.h"
-#include "alloc.h"
+#include <data/value.h>
+#include <libpspp/hash.h>
+#include <libpspp/array.h>
+#include <libpspp/alloc.h>
 #include "moments.h"
 #include "percentiles.h"
 
index 6fa8650b261c31425b2ebd420f23bdf747e718b1..720ea017b5453a0a75354a072f28ddb14db283e7 100644 (file)
@@ -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 <libpspp/hash.h>
+#include <data/value.h>
 #include <string.h>
 #include <gsl/gsl_histogram.h>
 #include "percentiles.h"
index 07803183fee58e04679e0ffe51dcba82a054e8c8..c3dcbaadda5f8c8eccfd307294e782d1f2a9f65c 100644 (file)
 
 #include <config.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "compiler.h"
-#include "hash.h"
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
+#include <libpspp/hash.h>
 #include "group.h"
 #include "group-proc.h"
-#include "str.h"
-#include "variable.h"
-#include "misc.h"
+#include <libpspp/str.h>
+#include <data/variable.h>
+#include <libpspp/misc.h>
 
 
 /* Return -1 if the id of a is less than b; +1 if greater than and 
index 43714d9c05281c6eaaf3750eabc5dff334929e77..3fa7c862181d734ee60563aada65f96ccdc92c15 100644 (file)
@@ -22,7 +22,7 @@
 #define GROUP_H
 
 
-#include "value.h"
+#include <data/value.h>
 
 
 /* Statistics for grouped data */
index 105fc09303e5cce49bd797f1c9509a3278e77408..7a034621d507605574010dd87ac722a4069023f4 100644 (file)
 
 #include <config.h>
 #include "levene.h"
-#include "message.h"
-#include "case.h"
-#include "casefile.h"
-#include "dictionary.h"
+#include <libpspp/message.h>
+#include <data/case.h>
+#include <data/casefile.h>
+#include <data/dictionary.h>
 #include "group-proc.h"
-#include "hash.h"
-#include "str.h"
-#include "variable.h"
-#include "procedure.h"
-#include "alloc.h"
-#include "misc.h"
+#include <libpspp/hash.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
+#include <procedure.h>
+#include <libpspp/alloc.h>
+#include <libpspp/misc.h>
 #include "group.h"
 
 #include <math.h>
index edbcd80e3fbe1d17b8b6a639e421eda26a8362aa..886d3a36535ff7b831f41ca88cc9954ce0f06628 100644 (file)
@@ -23,8 +23,8 @@
 #define levene_h 1
 
 
-#include "variable.h"
-#include "casefile.h"
+#include <data/variable.h>
+#include <data/casefile.h>
 
 /* What to do with missing values */
 enum lev_missing { LEV_ANALYSIS, LEV_LISTWISE };
index 931b38ed27e9b79f362c19d03e4ee4129dabaddc..61263bb837134735cd287f86f3e05ed810bd6cbc 100644 (file)
@@ -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 = \
index ce75958814a4b8bd8d0fa6a008ca8b2fcf95b2d0..5c85af5e86d00e194ef068ec90a6abf4f80c6c52 100644 (file)
@@ -23,8 +23,8 @@
   Accessor functions for matching coefficients and variables.
  */
 #include <assert.h>
-#include "coefficient.h"
-#include "linreg.h"
+#include <math/linreg/coefficient.h>
+#include <math/linreg/linreg.h>
 #include "src/math/design-matrix.h"
 #include "src/data/variable.h"
 #include "src/data/value.h"
index 9b8b945e7fc761106a7e83f1bcf6b522563847e1..a82b54200f88e03a11df9c1319118b3ae7be2c39 100644 (file)
@@ -24,7 +24,7 @@
 #define COEFFICIENT_H
 
 
-#include "linreg.h"
+#include <math/linreg/linreg.h>
 
 struct design_matrix;
 
index e7e3a001d21ebd32ca7b9e680104b4322158a734..08d620b8c271d4a90290577dffe507365a3660a7 100644 (file)
   Springer. 1998. ISBN 0-387-98542-5.
 */
 
-#include "linreg.h"
-#include "coefficient.h"
-#include "sweep.h"
+#include <math/linreg/linreg.h>
+#include <math/linreg/coefficient.h>
 #include <gsl/gsl_errno.h>
+#include <linreg/sweep.h>
 /*
   Get the mean and standard deviation of a vector
   of doubles via a form of the Kalman filter as
index ce2f825c8e0156cc0e3d27dca54415da74512906..e73efad101ae3128c1a47d954ba92dfa62b95aa5 100644 (file)
@@ -22,9 +22,9 @@
 #include <assert.h>
 #include <math.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "misc.h"
-#include "value.h"
+#include <libpspp/alloc.h>
+#include <libpspp/misc.h>
+#include <data/value.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index d872280131f5245b710bd1d264971f9cd921f265..0725df6db6b9fa6b551562d12d855c4237a7e246 100644 (file)
@@ -21,7 +21,7 @@
 #define HEADER_MOMENTS
 
 #include <stddef.h>
-#include "value.h"
+#include <data/value.h>
 
 /* Moments of the mean.
    Higher-order moments have higher values. */
index 372bd4ca08bfd2dedc38c116e3f3cdf11c5da41d..d00cf3e0eea4d28772f43dcd0138412d032f7e60 100644 (file)
@@ -19,10 +19,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA. */
 
 #include <config.h>
-#include "compiler.h"
+#include <libpspp/compiler.h>
 #include "factor-stats.h"
 #include "percentiles.h"
-#include "misc.h"
+#include <libpspp/misc.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 8f4271f56753a8e7c7e047df04958ff30eed9faa..efe26918b976272d05c6f4048372b8c1516b0028 100644 (file)
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #define PERCENTILES_H
 
 
-#include "hash.h"
+#include <libpspp/hash.h>
 
 struct weighted_value ;
 
index 46fcb60a78875dfb0907e7b4eba516468d48372f..20d8dde73cb81a34fca282eab444d10760a300ec 100644 (file)
 
 #include <config.h>
 #include "sort.h"
-#include "message.h"
-#include "alloc.h"
+#include <libpspp/message.h>
+#include <libpspp/alloc.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-#include "array.h"
+#include <libpspp/array.h>
 #include <stdbool.h>
-#include "case.h"
-#include "casefile.h"
-#include "message.h"
+#include <data/case.h>
+#include <data/casefile.h>
+#include <libpspp/message.h>
 
-#include "misc.h"
-#include "settings.h"
-#include "str.h"
-#include "variable.h"
-#include "procedure.h"
+#include <libpspp/misc.h>
+#include <data/settings.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
+#include <procedure.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* These should only be changed for testing purposes. */
 int min_buffers = 64;
index b77e7b627fe1e9eacb5eae6b3a110f1ebcee72f9..ed9036510c59e1a579cc2bebcc76f1089b0464b0 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "filename.h"
-#include "line-buffer.h"
-#include "lexer.h"
-#include "settings.h"
-#include "read-line.h"
-#include "version.h"
+#include <libpspp/alloc.h>
+#include <data/filename.h>
+#include <language/line-buffer.h>
+#include <language/lexer/lexer.h>
+#include <data/settings.h>
+#include <ui/terminal/read-line.h>
+#include <libpspp/version.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 63f64be5523d8f85f84bd17b0bf896f0e983838c..f6bc7a6f91b3bb6fbe96f920f46639ac5819071f 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "message.h"
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
 #include "chart.h"
-#include "compiler.h"
-#include "filename.h"
-#include "misc.h"
+#include <libpspp/compiler.h>
+#include <data/filename.h>
+#include <libpspp/misc.h>
 #include "output.h"
-#include "pool.h"
-#include "start-date.h"
-#include "version.h"
+#include <libpspp/pool.h>
+#include <libpspp/start-date.h>
+#include <libpspp/version.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 0d3a10971bf976de4dbc890772d016d37e8d94b4..3c423203ace2c2d7763af3fb96a753b7471e35f5 100644 (file)
@@ -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
 
 
index 958695ae30a28cbc180816a2ec49689c9884dad0..0fda467602981802a8fced9c18e890a2093f9740 100644 (file)
@@ -28,8 +28,8 @@
 #include <math.h>
 
 #include "chart.h"
-#include "str.h"
-#include "alloc.h"
+#include <libpspp/str.h>
+#include <libpspp/alloc.h>
 #include "manager.h"
 #include "output.h"
 
index 546c6c716eccb0601f23b0ff2a5eb7f92e9e614b..98052f28efe88503ca2f6bcde4ba262f07a2018d 100644 (file)
@@ -26,9 +26,9 @@
 #include <assert.h>
 #include <math.h>
 
-#include "chart-geometry.h"
-#include "str.h"
-#include "alloc.h"
+#include <math/chart-geometry.h>
+#include <libpspp/str.h>
+#include <libpspp/alloc.h>
 #include "manager.h"
 #include "output.h"
 
index 6db4bf28a3a357b1826fc21f5ed576acb8e2d8de..f1d71264fb9e54179667d1a36e4a96a7fb8db615 100644 (file)
@@ -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 \
index efa0ce82bef12664104176e138be5eba16ccd621..c49ebf027480db1c977f74d74ec4fdf121a0e22f 100644 (file)
@@ -22,9 +22,9 @@
 #include <plot.h>
 #include <stdarg.h>
 #include <math.h>
-#include "barchart.h"
-#include "chart.h"
-#include "plot-chart.h"
+#include <output/charts/barchart.h>
+#include <output/chart.h>
+#include <output/charts/plot-chart.h>
 
 #define CATAGORIES 6
 #define SUB_CATAGORIES 3
index 97fd758bfa29ad6da84257fe57ef6f70967d16f3..4a6e3b725c62334a6a06d314d91271ff94a63fcf 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef BARCHART_H
 #define BARCHART_H
 
-#include "chart.h"
+#include <output/chart.h>
 
 enum  bar_opts {
   BAR_GROUPED =  0,
index 173906644508c727e4315d184ecbcfd9e2e64e39..8c0160dfa1ae6a21f7742fa6bf204aa664a671ae 100644 (file)
    02110-1301, USA. */
 
 
-#include "chart.h"
-#include "chart-geometry.h"
 #include <math.h>
 #include <assert.h>
-#include "misc.h"
+#include <libpspp/misc.h>
+
+#include <output/charts/box-whisker.h>
+#include <output/charts/plot-chart.h>
+
+#include <output/chart.h>
+#include <math/chart-geometry.h>
+#include <math/factor-stats.h>
+
 
-#include "factor-stats.h"
-#include "box-whisker.h"
-#include "plot-chart.h"
 
 
 /* Draw a box-and-whiskers plot
index cf4d2e689dbac2784a39e4dac94c374a9d446cc7..9c6df314057f4ed017aec2b6e0a599b4a5787f4a 100644 (file)
@@ -23,6 +23,8 @@
 #include <config.h>
 
 struct chart ;
+struct weighted_value;
+struct metrics;
 
 /* Draw an outlier on the plot CH
  * at CENTRELINE
index 2a9b1c5fcbbf33f30bf00e28cf53f59d39531ad5..a8057ba43b8152276c9ebfbb66bdbe7b130e1643 100644 (file)
 
 
 #include <math.h>
-#include "chart.h"
 #include <assert.h>
-#include "plot-chart.h"
-#include "cartesian.h"
-#include "compiler.h"
+
+#include <output/chart.h>
+
+#include <output/charts/plot-chart.h>
+#include <output/charts/cartesian.h>
+#include <libpspp/compiler.h>
 
 
 
index a255f23795d254b8527ff42a129e3842f25c5392..b77700ba0f0a3cf7fc96229984af668e819982c4 100644 (file)
    This module is linked only when charts are not supported */
 
 #include "config.h"
-#include "chart.h"
-#include "plot-chart.h"
-#include "cartesian.h"
+#include <output/chart.h>
+#include <output/charts/plot-chart.h>
+#include <output/charts/cartesian.h>
 #include <gsl/gsl_histogram.h>
-#include "compiler.h"
+#include <libpspp/compiler.h>
 
 
 #ifndef NO_CHARTS
index 3fceaf20f5b016bec4d798cdcd298206e87ebd2b..37788380a87ccf5c495cfb71836d138b95544750 100644 (file)
@@ -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 <config.h>
+
 #include <float.h>
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>
-#include "str.h"
-#include "value-labels.h"
-#include "misc.h"
-#include "plot-chart.h"
+
+
+#include <output/charts/piechart.h>
+#include <output/charts/plot-chart.h>
+
+#include <output/chart.h>
+#include <libpspp/str.h>
+#include <data/value-labels.h>
+#include <libpspp/misc.h>
+
 
 /* Pie charts of course need to know Pi :) */
 #ifndef M_PI
index f965a6fed1aa746779f21960a6eaf15018bfa9f7..6b91045273122af627eeba060f163d3a90cc1283 100644 (file)
@@ -18,6 +18,7 @@
    02110-1301, USA. */
 
 #include <config.h>
+
 #include <stdio.h>
 #include <plot.h>
 #include <stdarg.h>
 #include <assert.h>
 #include <math.h>
 
-#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 <output/charts/plot-chart.h>
+#include <output/charts/plot-chart.h>
+
+#include <math/chart-geometry.h>
+
+
+
+#include <libpspp/str.h>
+#include <libpspp/alloc.h>
+#include <output/manager.h>
+#include <output/output.h>
+
 
 const char *data_colour[] = {
   "brown",
index ffcf3b0180f7e807969d38fbe282a5d97fcaffb4..e8bb7d42ce8befdbcbf27c4e2bfb2e68959771c4 100644 (file)
 #include <math.h>
 
 
-#include "chart-geometry.h"
-#include "chart.h"
-#include "str.h"
-#include "alloc.h"
-#include "manager.h"
-#include "output.h"
+#include <math/chart-geometry.h>
+#include <output/chart.h>
+
+#include <libpspp/str.h>
+#include <libpspp/alloc.h>
+#include <output/manager.h>
+#include <output/output.h>
 
 
 #ifndef PLOT_CHART_H
index 68c0a6a8d4173b971373a075f112354982614e79..a500d5bf627933b125a39cbfbbd9a9766970ca8d 100644 (file)
 #include <config.h>
 
 #include <stdio.h>
-#include "plot-hist.h"
-#include "plot-chart.h"
 #include <plot.h>
 #include <math.h>
 #include <gsl/gsl_histogram.h>
 #include <gsl/gsl_randist.h>
 #include <assert.h>
-#include "hash.h"
-#include "variable.h"
-#include "chart.h"
+
+#include <output/charts/plot-hist.h>
+#include <output/charts/plot-chart.h>
+
+#include <data/variable.h>
+#include <libpspp/hash.h>
+#include <output/chart.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 5b651c4a8228b203b13729c81de73cbfc5de4ae3..4817084f6db006fd66a9f501ea1a17a563e30c11 100644 (file)
 
 #include <config.h>
 #include "font.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <limits.h>
 #include <stdarg.h>
-#include "alloc.h"
-#include "compiler.h"
-#include "message.h"
-#include "filename.h"
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
+#include <libpspp/message.h>
+#include <data/filename.h>
 #include "getline.h"
-#include "hash.h"
+#include <libpspp/hash.h>
 #include "intprops.h"
-#include "pool.h"
-#include "str.h"
-#include "version.h"
+#include <libpspp/pool.h>
+#include <libpspp/str.h>
+#include <libpspp/version.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 1cf65839bb3751eb56069fd0b7e39371e0d409df..48aead065f95f9b59dffcc2cbd5ea230edaa5208 100644 (file)
@@ -20,7 +20,7 @@
 #include <config.h>
 #include "chart.h"
 #include "htmlP.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <unistd.h>
 #endif
 
-#include "alloc.h"
-#include "compiler.h"
-#include "message.h"
-#include "filename.h"
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
+#include <libpspp/message.h>
+#include <data/filename.h>
 #include "getline.h"
 #include "getlogin_r.h"
 #include "output.h"
 #include "manager.h"
 #include "table.h"
-#include "version.h"
-#include "make-file.h"
+#include <libpspp/version.h>
+#include <data/make-file.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index ee86141426d9b6d1d00c2fd51c3ee6961e8e712b..673ca48410f928496654ada31b69bb4871a3ab20 100644 (file)
@@ -20,7 +20,7 @@
 #if !htmlP_h
 #define htmlP_h 1
 
-#include "filename.h"
+#include <data/filename.h>
 
 /* HTML output driver extension record. */
 struct html_driver_ext
index 404c3bf2dbc5ae3eff2f4e8bf6299814d6944098..f7d0b5eb749483a30ef7530fa89394b07e098c38 100644 (file)
 
 #include <config.h>
 #include "manager.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "output.h"
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* Table. */
 int table_num = 1;
index 8af1a7b8043033209ba867986c794373d0ed8e40..4a915fe2ef6e3acd2635ada098ccf0b6a0b3f982 100644 (file)
 
 #include <config.h>
 #include "output.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
 #include <ctype.h>
-#include "alloc.h"
-#include "message.h"
-#include "filename.h"
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
+#include <data/filename.h>
 #include "htmlP.h"
 #include "intprops.h"
-#include "misc.h"
-#include "settings.h"
-#include "str.h"
+#include <libpspp/misc.h>
+#include <data/settings.h>
+#include <libpspp/str.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 7d6f81cb856e0b85ac93a54aabd77a14f998f227..9694fcb4d88bef10a0cd7395737d0e2fa556a1e4 100644 (file)
 #if !output_h
 #define output_h 1
 
-#include "str.h"
-#include "config.h"
+#include <config.h>
+
+#include <libpspp/str.h>
+
 
 /* A rectangle. */
 struct rect
index a4c54015bcce1a60766cb73bbbd77e19cbb2a437..e6ce8614825b6554adae61b6ea5478ce642e08b3 100644 (file)
@@ -21,7 +21,7 @@
 
 #include <ctype.h>
 #include "chart.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <unistd.h>
 #endif
 
-#include "alloc.h"
-#include "bit-vector.h"
-#include "compiler.h"
-#include "message.h"
-#include "filename.h"
+#include <libpspp/alloc.h>
+#include <libpspp/bit-vector.h>
+#include <libpspp/compiler.h>
+#include <libpspp/message.h>
+#include <data/filename.h>
 #include "font.h"
 #include "getline.h"
-#include "hash.h"
+#include <libpspp/hash.h>
 #include "intprops.h"
-#include "misc.h"
+#include <libpspp/misc.h>
 #include "output.h"
 #include "manager.h"
-#include "start-date.h"
-#include "version.h"
+#include <libpspp/start-date.h>
+#include <libpspp/version.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 4f5007c2a5016450f17490d323eb0eef93e6cf5d..7306ee3cfb76d26016e45d640caf46d6bf3b2be9 100644 (file)
 #include <stdarg.h>
 #include <limits.h>
 #include <stdlib.h>
-#include "message.h"
-#include "alloc.h"
-#include "compiler.h"
-#include "format.h"
-#include "magic.h"
-#include "misc.h"
+#include <libpspp/message.h>
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
+#include <data/format.h>
+#include <libpspp/magic.h>
+#include <libpspp/misc.h>
 #include "output.h"
-#include "pool.h"
+#include <libpspp/pool.h>
 #include "manager.h"
-#include "variable.h"
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 \f
 struct som_table_class tab_table_class;
 static char *command_name;
index 4fa459759e178e76b909162637dd9e7b0ad85c82..678d6aa3a84b05e57364505c6ae0457485b653d4 100644 (file)
@@ -21,7 +21,7 @@
 #define tab_h 1
 
 #include <limits.h>
-#include "str.h"
+#include <libpspp/str.h>
 
 /* Cell options. */
 enum
index e7f61933ace503e54db5f5fe04b375c7e8a0b585..c6209af266451267a8de102df4131b22f40c40b5 100644 (file)
    02110-1301, USA. */
 
 #include <config.h>
-#include "procedure.h"
-#include "message.h"
+#include <procedure.h>
+#include <libpspp/message.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>    /* 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 <libpspp/alloc.h>
+#include <data/case.h>
+#include <data/casefile.h>
+#include <language/command.h>
+#include <data/dictionary.h>
+#include <language/control/control-stack.h>
+#include <libpspp/message.h>
 #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 <data/file-handle-def.h>
+#include <libpspp/misc.h>
+#include <data/settings.h>
+#include <output/manager.h>
+#include <output/table.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
+#include <data/value-labels.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 545e9345217f45bd93ae541d9428063b12eba33a..f802c776eaa012f0647b937d69efe448b1a6e40e 100644 (file)
@@ -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 = \
index 1edeb330f8d101abae48aebd58a22ece2f89e433..bff1af9706765d8853275642cfd8d54c17b357a1 100644 (file)
 
 #include <ctype.h>
 
-#include "gtksheet.h"
+#include <gtksheet/gtksheet.h>
 
-#include "gsheet-uniform-row.h"
+#include <gtksheet/gsheet-uniform-row.h>
 
 #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 <data/value-labels.h>
+#include <data/case.h>
+#include <data/data-in.h>
 
 #include "menu-actions.h"
 #include "data-sheet.h"
index e89433807f6c04e3a16b9c22eb3e16101533e4e4..9189edddda78aec229603c6d42e4a97a086c7600 100644 (file)
@@ -22,9 +22,9 @@
 #ifndef DATA_SHEET_H
 #define DATA_SHEET_H
 
-#include <gtksheet.h>
-#include <psppire-case-array.h>
-#include <psppire-dict.h>
+#include <gtksheet/gtksheet.h>
+#include "psppire-case-array.h"
+#include "psppire-dict.h"
 
 void psppire_data_sheet_clear(GtkSheet *sheet);
 
index 061e4dc77668be0c431fcbee3e8e7d0a1b9299f5..b3d83da270472ea6b62cf3d2ea1405d82870b727 100644 (file)
@@ -1,7 +1,7 @@
 
 #include "helper.h"
-#include "data-in.h"
-#include "message.h"
+#include <data/data-in.h>
+#include <libpspp/message.h>
 
 #include <ctype.h>
 #include <string.h>
index 6097041e04af95391cfcf3328f34c8c5027a9607..eef64213c2c229735af0f8b03db5c6a2a68523dd 100644 (file)
@@ -22,8 +22,8 @@
 #ifndef __MISC_H__
 #define __MISC_H__
 
-#include "value.h"
-#include "format.h"
+#include <data/value.h>
+#include <data/format.h>
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
index 175fd5d19fc5a8e9c1a78b10499c70d6815275b4..d10cd5153adee192c945bc7c10bd57a187f2b0de 100644 (file)
 
 #include <config.h>
 #include <stdlib.h>
-#include <file-handle-def.h>
-#include <sys-file-reader.h>
-#include <case.h>
+
+#include <data/file-handle-def.h>
+#include <data/sys-file-reader.h>
+#include <data/case.h>
 
 #include <glade/glade.h>
 #include <gtk/gtk.h>
 
-#include <gtksheet.h>
+#include <gtksheet/gtksheet.h>
 #include "helper.h"
 #include "menu-actions.h"
 #include "psppire-variable.h"
index 624b4147de81160e6a2560190828ea72725ff482..6e93f7e6b3a7d77d8d10a5918de1c58be87778ec 100644 (file)
@@ -24,7 +24,7 @@
 #include <stdarg.h>
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include "message-dialog.h"
 
 
index 8a17e8bcba978642aaf00d8232524b031772c740..3b85e60f2c1834f7f3db428fe8321e99eccf6c86 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef ERROR_DIALOG_H
 #define ERROR_DIALOG_H
 
-#include "message.h"
+#include <libpspp/message.h>
 
 void vmsg(int klass, const char *fmt, va_list args);
 void  msg(int klass, const char *fmt, ...);
index 74bc6755537229f13f3ad2d59248369ce712dbd6..ec136cd0cf918a429ae0249ec34756c616e43c39 100644 (file)
@@ -23,9 +23,9 @@
 
 #include "helper.h"
 #include "missing-val-dialog.h"
-#include "missing-values.h"
-#include "variable.h"
-#include "data-in.h"
+#include <data/missing-values.h>
+#include <data/variable.h>
+#include <data/data-in.h>
 #include "psppire-variable.h"
 
 #include <gtk/gtk.h>
index 4129d07cbffbc820fb77a87f3cd43bd0b1a295b3..44f025e68c252a974eb4f26488350d0f939d4a32 100644 (file)
@@ -28,7 +28,7 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
-#include "missing-values.h"
+#include <data/missing-values.h>
 
 struct missing_val_dialog
 {
index 159b3cc122fc42e0fb5c8348cffce97453f15440..e6ab7f7f3d5472dc344704c67d535fde480a237b 100644 (file)
 
 #include "psppire-object.h"
 #include "psppire-case-array.h"
-#include "gtkextra-marshal.h"
 
-#include "case.h"
+#include <gtksheet/gtkextra-marshal.h>
+
+#include <data/case.h>
 
 /* --- prototypes --- */
 static void psppire_case_array_class_init      (PsppireCaseArrayClass  *class);
index aa118593608a52b0aba1e5d03f2097cb9e6e2a63..63e6f9c15689de5a3fa2baacc323d8a90ad4c1fa 100644 (file)
 #include <string.h>
 #include <stdlib.h>
 
-#include "gtksheet.h"
-#include "gsheetmodel.h"
-#include "gsheet-column-iface.h"
+#include <gtksheet/gtksheet.h>
+#include <gtksheet/gsheetmodel.h>
+#include <gtksheet/gsheet-column-iface.h>
 
 #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 <data/dictionary.h>
+#include <data/missing-values.h>
+#include <data/value-labels.h>
+#include <data/data-in.h>
 
-#include "file-handle-def.h"
-#include "sys-file-writer.h"
+#include <data/file-handle-def.h>
+#include <data/sys-file-writer.h>
 
 #define _(A) A
 #define N_(A) A
index 508f0cd68800079360ea483743b658e672bc5ce8..2f0d42ca102c8f93b17922d385c562451bbbb6ac 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef __PSPPIRE_DATA_STORE_H__
 #define __PSPPIRE_DATA_STORE_H__
 
-#include "gsheetmodel.h"
+#include <gtksheet/gsheetmodel.h>
 #include "psppire-dict.h"
 #include "psppire-case-array.h"
 
index d5ea9094175f2c429cd1b378205120d9d2a27d52..357ec031b5504aae5de48c72355b4dbf146642df 100644 (file)
 #include <string.h>
 #include <stdlib.h>
 
-#include "gtkextra-marshal.c"
+#include <gtksheet/gtkextra-marshal.c>
 
 #include "psppire-object.h"
 #include "psppire-dict.h"
-#include "format.h"
-#include "dictionary.h"
-#include "missing-values.h"
-#include "value-labels.h"
+#include <data/format.h>
+#include <data/dictionary.h>
+#include <data/missing-values.h>
+#include <data/value-labels.h>
 
 
 #include "message-dialog.h"
index b36ccf9e6156297ade8b892e74ef3ef798f4ae47..173ed486973613d8c6543b822f28394bfd50d6b4 100644 (file)
@@ -26,8 +26,8 @@
 #include <glib-object.h>
 #include <glib.h>
 
-#include <dictionary.h>
-#include <variable.h>
+#include <data/dictionary.h>
+#include <data/variable.h>
 
 
 G_BEGIN_DECLS
index dfae46b1e443464ab5f26166f812a7449e1b18c5..b6966f6a83f719c04b4e53fc90b0ad7047d282e5 100644 (file)
 
 #include <gobject/gvaluecollector.h>
 
-#include "gsheetmodel.h"
+#include <gtksheet/gsheetmodel.h>
 
 #include "psppire-variable.h"
 #include "psppire-var-store.h"
 #include "var-sheet.h"
 
-#include "dictionary.h"
-#include "variable.h"
-#include "missing-values.h"
+#include <data/dictionary.h>
+#include <data/variable.h>
+#include <data/missing-values.h>
 
 #include "val-labs-dialog.h"
 #include "missing-val-dialog.h"
-#include "value-labels.h"
+#include <data/value-labels.h>
 
 #define _(A) A
 #define N_(A) A
index b4da027ee4f83e9a6763287139ee1559159e0f80..7a4eee8e3b4b3ab2402567634de09ce9a8d88364 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef __PSPPIRE_VAR_STORE_H__
 #define __PSPPIRE_VAR_STORE_H__
 
-#include "gsheetmodel.h"
+#include <gtksheet/gsheetmodel.h>
 #include "psppire-dict.h"
 #include <gdk/gdk.h>
 
index 6443ee901ed2c069744c9cd9943956afcc100fb6..7d23f48bfbcaf6bea6dbdc3e1c96ac8793acb101 100644 (file)
@@ -21,9 +21,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "missing-values.h"
-#include "value-labels.h"
-#include "format.h"
+#include <data/missing-values.h>
+#include <data/value-labels.h>
+#include <data/format.h>
 
 #include "psppire-variable.h"
 #include "psppire-dict.h"
index 19e7ecc80d74ce3c01351da4efb20871f934e1d1..815086a64b5b10b3e16a0d7c2379e5ea00859025 100644 (file)
@@ -25,7 +25,7 @@
 #include <glib-object.h>
 #include <glib.h>
 
-#include <variable.h>
+#include <data/variable.h>
 #include "psppire-dict.h"
 
 /* Don't use any of these members.
index d5a8256592ca23ed1cebebb74e8b382ff2d9443b..070a4f50da0aa93db7ea00f294bbce785a025b47 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "helper.h"
 #include "val-labs-dialog.h"
-#include "value-labels.h"
+#include <data/value-labels.h>
 #include "psppire-variable.h"
 
 /* This callback occurs when the text in the label entry box 
index 8a2ba9855c6206a7494c8b893f90e8b845fa9986..b38806bb1644dea49f20010011d65ac682b25baa 100644 (file)
@@ -22,7 +22,7 @@
 /* This module creates the Variable Sheet used for inputing the
    variables in the  dictonary */
 
-#include <value-labels.h>
+#include <data/value-labels.h>
 
 #include <glade/glade.h>
 #include <gtk/gtk.h>
 
 #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 <gtksheet/gtksheet.h>
+#include <gtksheet/gsheet-hetero-column.h>
+#include <gtksheet/gsheet-uniform-row.h>
 
+#include "psppire-var-store.h"
 #include "helper.h"
 #include "menu-actions.h"
 #include "psppire-dict.h"
index 09bcb728734d638f41387f72f6231f7b43e883b4..fda222b90ad74c3643a768a07e7cdc426a54d1ab 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef VAR_SHEET_H
 #define VAR_SHEET_H
 
-#include "gtksheet.h"
+#include <gtksheet/gtksheet.h>
 
 #include "psppire-dict.h"
 
index d1569f8f4092f0a942ca7654be92c3d1d48876b6..3a6f67eb13bcdbba372400b05b523c54c8c3f0f6 100644 (file)
@@ -32,8 +32,8 @@
 
 #include "psppire-variable.h"
 
-#include "variable.h"
-#include "settings.h"
+#include <data/variable.h>
+#include <data/settings.h>
 
 
 struct tgs
index 28e7d8bda682d35d152d8a7a29881dd658cb9953..d259fa1a71617d56105f33b3b6b5fa4a43729217 100644 (file)
@@ -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 <data/format.h>
 
 enum 
   {
index d68f5c18eb2c3540aa14cd5e14433001c44fb4ae..7411bbd33161430ef5d4452571c4683db48386c2 100644 (file)
@@ -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 = \
index 39e17e325d8e6ec3b4f89b1f04fe6ef960928bc3..9c5af7c8e406b8682e3bd94ccec1cfe0bec052bc 100644 (file)
 
 #include <config.h>
 #include "command-line.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <errno.h>
 #include <getopt.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "copyleft.h"
-#include "message.h"
-#include "line-buffer.h"
+#include <libpspp/alloc.h>
+#include <libpspp/copyleft.h>
+#include <libpspp/message.h>
+#include <language/line-buffer.h>
 #include "progname.h"
-#include "settings.h"
+#include <data/settings.h>
 #include "read-line.h"
-#include "output.h"
-#include "filename.h"
-#include "str.h"
-#include "version.h"
+#include <output/output.h>
+#include <data/filename.h>
+#include <libpspp/str.h>
+#include <libpspp/version.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 7712df83d903cb81c578a9fbdee5f1ad0b52e97e..84cd2a6d562253432735c453b0aed506f36e9a10 100644 (file)
 #include <signal.h>
 #include <stdio.h>
 #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 <language/command.h>
+#include <libpspp/compiler.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
+#include <data/file-handle-def.h>
+#include <data/filename.h>
+#include <language/line-buffer.h>
+#include <language/lexer/lexer.h>
+#include <output/output.h>
 #include "progname.h"
-#include "random.h"
+#include <math/random.h>
 #include "read-line.h"
-#include "settings.h"
-#include "variable.h"
-#include "version.h"
+#include <data/settings.h>
+#include <data/variable.h>
+#include <libpspp/version.h>
 
 #if HAVE_FPU_CONTROL_H
 #include <fpu_control.h>
@@ -55,7 +55,7 @@
 
 #include <stdlib.h>
 
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 static void i18n_init (void);
 static void fpu_init (void);
index 562a6fcbbf008dcbfcbd4fdd8ed001c70ea56370..e92113514aae370953d1a582322c393b8e690533 100644 (file)
 #include <errno.h>
 
 #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 <language/command.h>
+#include <data/filename.h>
+#include <libpspp/version.h>
+#include <libpspp/str.h>
+#include <output/table.h>
+#include <libpspp/message.h>
+#include <data/filename.h>
+#include <data/settings.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
index 0c32dec5123da8706fdc150108fa37f029c4f710..cadd2cce1410e9f130d07840364c5d1e7f0eeed4 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef READLN_H
 #define READLN_H
 
-#include "str.h"
+#include <libpspp/str.h>
 
 void readln_initialize (void);
 void readln_uninitialize (void);