[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp lib/gsl-extras/automake.mk lib/gtksheet/au...
|
From: |
John Darrington |
|
Subject: |
[Pspp-cvs] pspp lib/gsl-extras/automake.mk lib/gtksheet/au... |
|
Date: |
Wed, 15 Mar 2006 03:29:13 +0000 |
CVSROOT: /cvsroot/pspp
Module name: pspp
Branch:
Changes by: John Darrington <address@hidden> 06/03/15 03:29:11
Modified files:
lib/gsl-extras : automake.mk
lib/gtksheet : automake.mk
lib/linreg : automake.mk
po : en_GB.po pspp.pot
src : message.c procedure.c
src/data : any-reader.c any-writer.c automake.mk case.c
case.h casefile.c category.c data-in.c
data-out.c dictionary.c file-handle-def.c
filename.c format.c make-file.c
missing-values.c por-file-reader.c
por-file-writer.c scratch-reader.c
sfm-private.h sys-file-reader.c
sys-file-writer.c value-labels.c variable.c
src/language : automake.mk command.c line-buffer.c
line-buffer.h
src/language/control: automake.mk control-stack.c do-if.c loop.c
repeat.c temporary.c
src/language/data-io: automake.mk data-list.c data-list.h
data-reader.c data-writer.c file-handle.h
file-handle.q file-type.c get.c inpt-pgm.c
list.q matrix-data.c print.c
src/language/dictionary: apply-dictionary.c automake.mk
formats.c missing-values.c
modify-variables.c numeric.c
rename-variables.c split-file.c
sys-file-info.c value-labels.c
variable-display.c variable-label.c
vector.c weight.c
src/language/expressions: automake.mk evaluate.c helpers.c
helpers.h optimize.c parse.c private.h
src/language/lexer: automake.mk format-parser.c lexer.c lexer.h
q2c.c range-parser.c variable-parser.c
src/language/stats: aggregate.c automake.mk autorecode.c
correlations.q crosstabs.q descriptives.c
examine.q flip.c frequencies.q means.q
oneway.q rank.q regression.q sort-cases.c
sort-criteria.c t-test.q
src/language/tests: automake.mk casefile-test.c moments-test.c
pool-test.c
src/language/utilities: automake.mk date.c echo.c include.c
permissions.c set.q title.c
src/language/xforms: automake.mk compute.c count.c recode.c
sample.c select-if.c
src/libpspp : automake.mk
src/math : automake.mk design-matrix.c design-matrix.h
factor-stats.c factor-stats.h group.c group.h
levene.c levene.h moments.c moments.h
percentiles.c percentiles.h sort.c
src/math/linreg: automake.mk coefficient.c coefficient.h
linreg.c
src/output : ascii.c automake.mk chart.c chart.h
groff-font.c html.c htmlP.h manager.c output.c
output.h postscript.c table.c table.h
src/output/charts: automake.mk barchart.c barchart.h
box-whisker.c box-whisker.h cartesian.c
dummy-chart.c piechart.c plot-chart.c
plot-chart.h plot-hist.c
src/ui/gui : automake.mk data-sheet.c data-sheet.h helper.c
helper.h menu-actions.c message-dialog.c
message-dialog.h missing-val-dialog.c
missing-val-dialog.h psppire-case-array.c
psppire-data-store.c psppire-data-store.h
psppire-dict.c psppire-dict.h
psppire-var-store.c psppire-var-store.h
psppire-variable.c psppire-variable.h
val-labs-dialog.c var-sheet.c var-sheet.h
var-type-dialog.c var-type-dialog.h
src/ui/terminal: automake.mk command-line.c main.c read-line.c
read-line.h
Log message:
Changed include paths to be explicitly specified in the #include
directive.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/lib/gsl-extras/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/lib/gtksheet/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/lib/linreg/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/po/en_GB.po.diff?tr1=1.69&tr2=1.70&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/po/pspp.pot.diff?tr1=1.72&tr2=1.73&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/message.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/procedure.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/any-reader.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/any-writer.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/case.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/case.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/casefile.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/category.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/data-in.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/data-out.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/dictionary.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/file-handle-def.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/filename.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/format.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/make-file.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/missing-values.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/por-file-reader.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/por-file-writer.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/scratch-reader.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/sfm-private.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/sys-file-reader.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/sys-file-writer.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/value-labels.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/variable.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/command.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/line-buffer.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/line-buffer.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/control/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/control/control-stack.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/control/do-if.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/control/loop.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/control/repeat.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/control/temporary.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/data-list.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/data-list.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/data-reader.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/data-writer.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/file-handle.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/file-handle.q.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/file-type.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/get.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/inpt-pgm.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/list.q.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/matrix-data.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/print.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/apply-dictionary.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/formats.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/missing-values.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/modify-variables.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/numeric.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/rename-variables.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/split-file.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/sys-file-info.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/value-labels.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/variable-display.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/variable-label.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/vector.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/weight.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/expressions/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/expressions/evaluate.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/expressions/helpers.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/expressions/helpers.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/expressions/optimize.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/expressions/parse.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/expressions/private.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/lexer/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/lexer/format-parser.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/lexer/lexer.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/lexer/lexer.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/lexer/q2c.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/lexer/range-parser.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/lexer/variable-parser.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/aggregate.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/autorecode.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/correlations.q.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/crosstabs.q.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/descriptives.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/examine.q.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/flip.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/frequencies.q.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/means.q.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/oneway.q.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/rank.q.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/regression.q.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/sort-cases.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/sort-criteria.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/t-test.q.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/tests/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/tests/casefile-test.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/tests/moments-test.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/tests/pool-test.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/utilities/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/utilities/date.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/utilities/echo.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/utilities/include.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/utilities/permissions.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/utilities/set.q.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/utilities/title.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/xforms/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/xforms/compute.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/xforms/count.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/xforms/recode.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/xforms/sample.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/xforms/select-if.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/libpspp/automake.mk.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/design-matrix.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/design-matrix.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/factor-stats.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/factor-stats.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/group.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/group.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/levene.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/levene.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/moments.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/moments.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/percentiles.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/percentiles.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/sort.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/linreg/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/linreg/coefficient.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/linreg/coefficient.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/linreg/linreg.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/ascii.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/chart.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/chart.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/groff-font.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/html.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/htmlP.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/manager.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/output.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/output.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/postscript.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/table.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/table.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/charts/automake.mk.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/charts/barchart.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/charts/barchart.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/charts/box-whisker.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/charts/box-whisker.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/charts/cartesian.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/charts/dummy-chart.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/charts/piechart.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/charts/plot-chart.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/charts/plot-chart.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/charts/plot-hist.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/automake.mk.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/data-sheet.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/data-sheet.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/helper.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/helper.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/menu-actions.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/message-dialog.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/message-dialog.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/missing-val-dialog.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/missing-val-dialog.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/psppire-case-array.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/psppire-data-store.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/psppire-data-store.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/psppire-dict.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/psppire-dict.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/psppire-var-store.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/psppire-var-store.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/psppire-variable.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/psppire-variable.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/val-labs-dialog.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/var-sheet.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/var-sheet.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/var-type-dialog.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/gui/var-type-dialog.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/terminal/automake.mk.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/terminal/command-line.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/terminal/main.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/terminal/read-line.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/terminal/read-line.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: pspp/lib/gsl-extras/automake.mk
diff -u pspp/lib/gsl-extras/automake.mk:1.1 pspp/lib/gsl-extras/automake.mk:1.2
--- pspp/lib/gsl-extras/automake.mk:1.1 Sat Mar 4 00:56:38 2006
+++ pspp/lib/gsl-extras/automake.mk Wed Mar 15 03:29:10 2006
@@ -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: pspp/lib/gtksheet/automake.mk
diff -u pspp/lib/gtksheet/automake.mk:1.1 pspp/lib/gtksheet/automake.mk:1.2
--- pspp/lib/gtksheet/automake.mk:1.1 Sat Mar 4 01:11:56 2006
+++ pspp/lib/gtksheet/automake.mk Wed Mar 15 03:29:10 2006
@@ -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: pspp/lib/linreg/automake.mk
diff -u pspp/lib/linreg/automake.mk:1.1 pspp/lib/linreg/automake.mk:1.2
--- pspp/lib/linreg/automake.mk:1.1 Sat Mar 4 00:53:47 2006
+++ pspp/lib/linreg/automake.mk Wed Mar 15 03:29:10 2006
@@ -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: pspp/po/en_GB.po
diff -u pspp/po/en_GB.po:1.69 pspp/po/en_GB.po:1.70
--- pspp/po/en_GB.po:1.69 Mon Mar 13 09:03:47 2006
+++ pspp/po/en_GB.po Wed Mar 15 03:29:10 2006
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.3.1\n"
"Report-Msgid-Bugs-To: address@hidden"
-"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 <address@hidden>\n"
"Language-Team: John Darrington <address@hidden>\n"
@@ -1086,7 +1086,7 @@
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 @@
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 @@
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 @@
"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: pspp/po/pspp.pot
diff -u pspp/po/pspp.pot:1.72 pspp/po/pspp.pot:1.73
--- pspp/po/pspp.pot:1.72 Mon Mar 13 09:03:47 2006
+++ pspp/po/pspp.pot Wed Mar 15 03:29:10 2006
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"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 <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -1087,7 +1087,7 @@
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 @@
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 @@
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 @@
"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: pspp/src/data/any-reader.c
diff -u pspp/src/data/any-reader.c:1.1 pspp/src/data/any-reader.c:1.2
--- pspp/src/data/any-reader.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/data/any-reader.c Wed Mar 15 03:29:10 2006
@@ -24,12 +24,12 @@
#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: pspp/src/data/any-writer.c
diff -u pspp/src/data/any-writer.c:1.1 pspp/src/data/any-writer.c:1.2
--- pspp/src/data/any-writer.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/data/any-writer.c Wed Mar 15 03:29:10 2006
@@ -24,12 +24,12 @@
#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: pspp/src/data/automake.mk
diff -u pspp/src/data/automake.mk:1.1 pspp/src/data/automake.mk:1.2
--- pspp/src/data/automake.mk:1.1 Sat Mar 4 01:58:23 2006
+++ pspp/src/data/automake.mk Wed Mar 15 03:29:10 2006
@@ -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: pspp/src/data/case.c
diff -u pspp/src/data/case.c:1.2 pspp/src/data/case.c:1.3
--- pspp/src/data/case.c:1.2 Sat Mar 4 21:26:39 2006
+++ pspp/src/data/case.c Wed Mar 15 03:29:10 2006
@@ -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: pspp/src/data/case.h
diff -u pspp/src/data/case.h:1.2 pspp/src/data/case.h:1.3
--- pspp/src/data/case.h:1.2 Sat Mar 4 21:26:39 2006
+++ pspp/src/data/case.h Wed Mar 15 03:29:10 2006
@@ -91,7 +91,7 @@
#ifndef DEBUGGING
#include <stdlib.h>
-#include "str.h"
+#include <libpspp/str.h>
static inline void
case_nullify (struct ccase *c)
Index: pspp/src/data/casefile.c
diff -u pspp/src/data/casefile.c:1.2 pspp/src/data/casefile.c:1.3
--- pspp/src/data/casefile.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/data/casefile.c Wed Mar 15 03:29:10 2006
@@ -26,13 +26,13 @@
#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: pspp/src/data/category.c
diff -u pspp/src/data/category.c:1.1 pspp/src/data/category.c:1.2
--- pspp/src/data/category.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/data/category.c Wed Mar 15 03:29:10 2006
@@ -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: pspp/src/data/data-in.c
diff -u pspp/src/data/data-in.c:1.2 pspp/src/data/data-in.c:1.3
--- pspp/src/data/data-in.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/data/data-in.c Wed Mar 15 03:29:10 2006
@@ -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>
@@ -27,20 +27,20 @@
#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>
/* Specialized error routine. */
Index: pspp/src/data/data-out.c
diff -u pspp/src/data/data-out.c:1.1 pspp/src/data/data-out.c:1.2
--- pspp/src/data/data-out.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/data/data-out.c Wed Mar 15 03:29:10 2006
@@ -18,26 +18,26 @@
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>
/* Public functions. */
Index: pspp/src/data/dictionary.c
diff -u pspp/src/data/dictionary.c:1.3 pspp/src/data/dictionary.c:1.4
--- pspp/src/data/dictionary.c:1.3 Sun Mar 12 21:10:20 2006
+++ pspp/src/data/dictionary.c Wed Mar 15 03:29:10 2006
@@ -21,17 +21,17 @@
#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: pspp/src/data/file-handle-def.c
diff -u pspp/src/data/file-handle-def.c:1.2 pspp/src/data/file-handle-def.c:1.3
--- pspp/src/data/file-handle-def.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/data/file-handle-def.c Wed Mar 15 03:29:10 2006
@@ -19,15 +19,15 @@
#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: pspp/src/data/filename.c
diff -u pspp/src/data/filename.c:1.2 pspp/src/data/filename.c:1.3
--- pspp/src/data/filename.c:1.2 Sat Mar 4 20:38:51 2006
+++ pspp/src/data/filename.c Wed Mar 15 03:29:10 2006
@@ -18,24 +18,24 @@
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: pspp/src/data/format.c
diff -u pspp/src/data/format.c:1.2 pspp/src/data/format.c:1.3
--- pspp/src/data/format.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/data/format.c Wed Mar 15 03:29:10 2006
@@ -20,12 +20,12 @@
#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: pspp/src/data/make-file.c
diff -u pspp/src/data/make-file.c:1.2 pspp/src/data/make-file.c:1.3
--- pspp/src/data/make-file.c:1.2 Sat Mar 4 21:26:39 2006
+++ pspp/src/data/make-file.c Wed Mar 15 03:29:10 2006
@@ -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: pspp/src/data/missing-values.c
diff -u pspp/src/data/missing-values.c:1.1 pspp/src/data/missing-values.c:1.2
--- pspp/src/data/missing-values.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/data/missing-values.c Wed Mar 15 03:29:10 2006
@@ -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: pspp/src/data/por-file-reader.c
diff -u pspp/src/data/por-file-reader.c:1.2 pspp/src/data/por-file-reader.c:1.3
--- pspp/src/data/por-file-reader.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/data/por-file-reader.c Wed Mar 15 03:29:10 2006
@@ -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>
@@ -29,25 +29,25 @@
#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: pspp/src/data/por-file-writer.c
diff -u pspp/src/data/por-file-writer.c:1.1 pspp/src/data/por-file-writer.c:1.2
--- pspp/src/data/por-file-writer.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/data/por-file-writer.c Wed Mar 15 03:29:10 2006
@@ -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>
@@ -30,24 +30,24 @@
#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: pspp/src/data/scratch-reader.c
diff -u pspp/src/data/scratch-reader.c:1.1 pspp/src/data/scratch-reader.c:1.2
--- pspp/src/data/scratch-reader.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/data/scratch-reader.c Wed Mar 15 03:29:10 2006
@@ -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: pspp/src/data/sfm-private.h
diff -u pspp/src/data/sfm-private.h:1.3 pspp/src/data/sfm-private.h:1.4
--- pspp/src/data/sfm-private.h:1.3 Sat Mar 4 21:26:39 2006
+++ pspp/src/data/sfm-private.h Wed Mar 15 03:29:10 2006
@@ -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: pspp/src/data/sys-file-reader.c
diff -u pspp/src/data/sys-file-reader.c:1.3 pspp/src/data/sys-file-reader.c:1.4
--- pspp/src/data/sys-file-reader.c:1.3 Sat Mar 4 21:00:38 2006
+++ pspp/src/data/sys-file-reader.c Wed Mar 15 03:29:10 2006
@@ -20,30 +20,30 @@
#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: pspp/src/data/sys-file-writer.c
diff -u pspp/src/data/sys-file-writer.c:1.1 pspp/src/data/sys-file-writer.c:1.2
--- pspp/src/data/sys-file-writer.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/data/sys-file-writer.c Wed Mar 15 03:29:10 2006
@@ -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>
@@ -30,25 +30,25 @@
#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: pspp/src/data/value-labels.c
diff -u pspp/src/data/value-labels.c:1.2 pspp/src/data/value-labels.c:1.3
--- pspp/src/data/value-labels.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/data/value-labels.c Wed Mar 15 03:29:10 2006
@@ -19,12 +19,12 @@
#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: pspp/src/data/variable.c
diff -u pspp/src/data/variable.c:1.2 pspp/src/data/variable.c:1.3
--- pspp/src/data/variable.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/data/variable.c Wed Mar 15 03:29:10 2006
@@ -19,15 +19,15 @@
#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: pspp/src/language/automake.mk
diff -u pspp/src/language/automake.mk:1.1 pspp/src/language/automake.mk:1.2
--- pspp/src/language/automake.mk:1.1 Sat Mar 4 02:03:32 2006
+++ pspp/src/language/automake.mk Wed Mar 15 03:29:10 2006
@@ -20,8 +20,3 @@
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: pspp/src/language/command.c
diff -u pspp/src/language/command.c:1.2 pspp/src/language/command.c:1.3
--- pspp/src/language/command.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/command.c Wed Mar 15 03:29:10 2006
@@ -18,23 +18,23 @@
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: pspp/src/language/control/automake.mk
diff -u pspp/src/language/control/automake.mk:1.1
pspp/src/language/control/automake.mk:1.2
--- pspp/src/language/control/automake.mk:1.1 Sat Mar 4 02:03:32 2006
+++ pspp/src/language/control/automake.mk Wed Mar 15 03:29:10 2006
@@ -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: pspp/src/language/control/control-stack.c
diff -u pspp/src/language/control/control-stack.c:1.2
pspp/src/language/control/control-stack.c:1.3
--- pspp/src/language/control/control-stack.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/control/control-stack.c Wed Mar 15 03:29:10 2006
@@ -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: pspp/src/language/control/do-if.c
diff -u pspp/src/language/control/do-if.c:1.2
pspp/src/language/control/do-if.c:1.3
--- pspp/src/language/control/do-if.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/control/do-if.c Wed Mar 15 03:29:10 2006
@@ -18,17 +18,19 @@
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: pspp/src/language/control/loop.c
diff -u pspp/src/language/control/loop.c:1.2
pspp/src/language/control/loop.c:1.3
--- pspp/src/language/control/loop.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/control/loop.c Wed Mar 15 03:29:10 2006
@@ -18,21 +18,21 @@
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: pspp/src/language/control/repeat.c
diff -u pspp/src/language/control/repeat.c:1.2
pspp/src/language/control/repeat.c:1.3
--- pspp/src/language/control/repeat.c:1.2 Sat Mar 4 20:38:51 2006
+++ pspp/src/language/control/repeat.c Wed Mar 15 03:29:10 2006
@@ -19,27 +19,27 @@
#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: pspp/src/language/control/temporary.c
diff -u pspp/src/language/control/temporary.c:1.1
pspp/src/language/control/temporary.c:1.2
--- pspp/src/language/control/temporary.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/control/temporary.c Wed Mar 15 03:29:10 2006
@@ -18,19 +18,19 @@
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: pspp/src/language/data-io/automake.mk
diff -u pspp/src/language/data-io/automake.mk:1.1
pspp/src/language/data-io/automake.mk:1.2
--- pspp/src/language/data-io/automake.mk:1.1 Sat Mar 4 02:03:32 2006
+++ pspp/src/language/data-io/automake.mk Wed Mar 15 03:29:10 2006
@@ -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: pspp/src/language/data-io/data-list.c
diff -u pspp/src/language/data-io/data-list.c:1.2
pspp/src/language/data-io/data-list.c:1.3
--- pspp/src/language/data-io/data-list.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/data-io/data-list.c Wed Mar 15 03:29:10 2006
@@ -18,30 +18,30 @@
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: pspp/src/language/data-io/data-list.h
diff -u pspp/src/language/data-io/data-list.h:1.1
pspp/src/language/data-io/data-list.h:1.2
--- pspp/src/language/data-io/data-list.h:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/data-io/data-list.h Wed Mar 15 03:29:10 2006
@@ -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: pspp/src/language/data-io/data-reader.c
diff -u pspp/src/language/data-io/data-reader.c:1.1
pspp/src/language/data-io/data-reader.c:1.2
--- pspp/src/language/data-io/data-reader.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/data-io/data-reader.c Wed Mar 15 03:29:10 2006
@@ -18,26 +18,26 @@
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: pspp/src/language/data-io/data-writer.c
diff -u pspp/src/language/data-io/data-writer.c:1.1
pspp/src/language/data-io/data-writer.c:1.2
--- pspp/src/language/data-io/data-writer.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/data-io/data-writer.c Wed Mar 15 03:29:10 2006
@@ -18,15 +18,15 @@
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: pspp/src/language/data-io/file-handle.h
diff -u pspp/src/language/data-io/file-handle.h:1.1
pspp/src/language/data-io/file-handle.h:1.2
--- pspp/src/language/data-io/file-handle.h:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/data-io/file-handle.h Wed Mar 15 03:29:10 2006
@@ -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: pspp/src/language/data-io/file-handle.q
diff -u pspp/src/language/data-io/file-handle.q:1.1
pspp/src/language/data-io/file-handle.q:1.2
--- pspp/src/language/data-io/file-handle.q:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/data-io/file-handle.q Wed Mar 15 03:29:10 2006
@@ -18,20 +18,20 @@
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: pspp/src/language/data-io/file-type.c
diff -u pspp/src/language/data-io/file-type.c:1.2
pspp/src/language/data-io/file-type.c:1.3
--- pspp/src/language/data-io/file-type.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/data-io/file-type.c Wed Mar 15 03:29:10 2006
@@ -19,20 +19,20 @@
#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: pspp/src/language/data-io/get.c
diff -u pspp/src/language/data-io/get.c:1.2 pspp/src/language/data-io/get.c:1.3
--- pspp/src/language/data-io/get.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/data-io/get.c Wed Mar 15 03:29:10 2006
@@ -18,32 +18,32 @@
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 @@
/* MATCH FILES. */
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
/* File types. */
enum
Index: pspp/src/language/data-io/inpt-pgm.c
diff -u pspp/src/language/data-io/inpt-pgm.c:1.2
pspp/src/language/data-io/inpt-pgm.c:1.3
--- pspp/src/language/data-io/inpt-pgm.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/data-io/inpt-pgm.c Wed Mar 15 03:29:10 2006
@@ -18,29 +18,29 @@
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: pspp/src/language/data-io/list.q
diff -u pspp/src/language/data-io/list.q:1.3
pspp/src/language/data-io/list.q:1.4
--- pspp/src/language/data-io/list.q:1.3 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/data-io/list.q Wed Mar 15 03:29:10 2006
@@ -18,34 +18,34 @@
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: pspp/src/language/data-io/matrix-data.c
diff -u pspp/src/language/data-io/matrix-data.c:1.2
pspp/src/language/data-io/matrix-data.c:1.3
--- pspp/src/language/data-io/matrix-data.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/data-io/matrix-data.c Wed Mar 15 03:29:10 2006
@@ -18,31 +18,31 @@
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: pspp/src/language/data-io/print.c
diff -u pspp/src/language/data-io/print.c:1.2
pspp/src/language/data-io/print.c:1.3
--- pspp/src/language/data-io/print.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/data-io/print.c Wed Mar 15 03:29:10 2006
@@ -20,21 +20,21 @@
/* 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: pspp/src/language/dictionary/apply-dictionary.c
diff -u pspp/src/language/dictionary/apply-dictionary.c:1.1
pspp/src/language/dictionary/apply-dictionary.c:1.2
--- pspp/src/language/dictionary/apply-dictionary.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/dictionary/apply-dictionary.c Wed Mar 15 03:29:10 2006
@@ -19,21 +19,21 @@
#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: pspp/src/language/dictionary/automake.mk
diff -u pspp/src/language/dictionary/automake.mk:1.1
pspp/src/language/dictionary/automake.mk:1.2
--- pspp/src/language/dictionary/automake.mk:1.1 Sat Mar 4 02:03:32 2006
+++ pspp/src/language/dictionary/automake.mk Wed Mar 15 03:29:10 2006
@@ -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: pspp/src/language/dictionary/formats.c
diff -u pspp/src/language/dictionary/formats.c:1.1
pspp/src/language/dictionary/formats.c:1.2
--- pspp/src/language/dictionary/formats.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/dictionary/formats.c Wed Mar 15 03:29:10 2006
@@ -21,17 +21,17 @@
#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: pspp/src/language/dictionary/missing-values.c
diff -u pspp/src/language/dictionary/missing-values.c:1.1
pspp/src/language/dictionary/missing-values.c:1.2
--- pspp/src/language/dictionary/missing-values.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/dictionary/missing-values.c Wed Mar 15 03:29:10 2006
@@ -18,21 +18,21 @@
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: pspp/src/language/dictionary/modify-variables.c
diff -u pspp/src/language/dictionary/modify-variables.c:1.2
pspp/src/language/dictionary/modify-variables.c:1.3
--- pspp/src/language/dictionary/modify-variables.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/dictionary/modify-variables.c Wed Mar 15 03:29:10 2006
@@ -19,20 +19,20 @@
#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: pspp/src/language/dictionary/numeric.c
diff -u pspp/src/language/dictionary/numeric.c:1.1
pspp/src/language/dictionary/numeric.c:1.2
--- pspp/src/language/dictionary/numeric.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/dictionary/numeric.c Wed Mar 15 03:29:10 2006
@@ -18,19 +18,19 @@
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: pspp/src/language/dictionary/rename-variables.c
diff -u pspp/src/language/dictionary/rename-variables.c:1.1
pspp/src/language/dictionary/rename-variables.c:1.2
--- pspp/src/language/dictionary/rename-variables.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/dictionary/rename-variables.c Wed Mar 15 03:29:10 2006
@@ -19,15 +19,15 @@
#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: pspp/src/language/dictionary/split-file.c
diff -u pspp/src/language/dictionary/split-file.c:1.1
pspp/src/language/dictionary/split-file.c:1.2
--- pspp/src/language/dictionary/split-file.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/dictionary/split-file.c Wed Mar 15 03:29:10 2006
@@ -19,13 +19,13 @@
#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: pspp/src/language/dictionary/sys-file-info.c
diff -u pspp/src/language/dictionary/sys-file-info.c:1.1
pspp/src/language/dictionary/sys-file-info.c:1.2
--- pspp/src/language/dictionary/sys-file-info.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/dictionary/sys-file-info.c Wed Mar 15 03:29:10 2006
@@ -18,25 +18,25 @@
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: pspp/src/language/dictionary/value-labels.c
diff -u pspp/src/language/dictionary/value-labels.c:1.1
pspp/src/language/dictionary/value-labels.c:1.2
--- pspp/src/language/dictionary/value-labels.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/dictionary/value-labels.c Wed Mar 15 03:29:10 2006
@@ -20,14 +20,14 @@
#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: pspp/src/language/dictionary/variable-display.c
diff -u pspp/src/language/dictionary/variable-display.c:1.1
pspp/src/language/dictionary/variable-display.c:1.2
--- pspp/src/language/dictionary/variable-display.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/dictionary/variable-display.c Wed Mar 15 03:29:10 2006
@@ -20,14 +20,14 @@
#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 "debug-print.h"
+#include <libpspp/debug-print.h>
/* Set variables' alignment
This is the alignment for GUI display only.
Index: pspp/src/language/dictionary/variable-label.c
diff -u pspp/src/language/dictionary/variable-label.c:1.1
pspp/src/language/dictionary/variable-label.c:1.2
--- pspp/src/language/dictionary/variable-label.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/dictionary/variable-label.c Wed Mar 15 03:29:10 2006
@@ -20,17 +20,17 @@
#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: pspp/src/language/dictionary/vector.c
diff -u pspp/src/language/dictionary/vector.c:1.1
pspp/src/language/dictionary/vector.c:1.2
--- pspp/src/language/dictionary/vector.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/dictionary/vector.c Wed Mar 15 03:29:10 2006
@@ -18,16 +18,16 @@
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: pspp/src/language/dictionary/weight.c
diff -u pspp/src/language/dictionary/weight.c:1.1
pspp/src/language/dictionary/weight.c:1.2
--- pspp/src/language/dictionary/weight.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/dictionary/weight.c Wed Mar 15 03:29:10 2006
@@ -18,14 +18,14 @@
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: pspp/src/language/expressions/automake.mk
diff -u pspp/src/language/expressions/automake.mk:1.1
pspp/src/language/expressions/automake.mk:1.2
--- pspp/src/language/expressions/automake.mk:1.1 Sat Mar 4 02:03:32 2006
+++ pspp/src/language/expressions/automake.mk Wed Mar 15 03:29:10 2006
@@ -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 @@
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: pspp/src/language/expressions/evaluate.c
diff -u pspp/src/language/expressions/evaluate.c:1.1
pspp/src/language/expressions/evaluate.c:1.2
--- pspp/src/language/expressions/evaluate.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/expressions/evaluate.c Wed Mar 15 03:29:10 2006
@@ -21,11 +21,11 @@
#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 @@
buf_copy_rpad (dst, dst_size, s.string, s.length);
}
-#include "lexer.h"
-#include "command.h"
+#include <language/lexer/lexer.h>
+#include <language/command.h>
int
cmd_debug_evaluate (void)
Index: pspp/src/language/expressions/helpers.c
diff -u pspp/src/language/expressions/helpers.c:1.1
pspp/src/language/expressions/helpers.c:1.2
--- pspp/src/language/expressions/helpers.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/expressions/helpers.c Wed Mar 15 03:29:10 2006
@@ -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: pspp/src/language/expressions/helpers.h
diff -u pspp/src/language/expressions/helpers.h:1.2
pspp/src/language/expressions/helpers.h:1.3
--- pspp/src/language/expressions/helpers.h:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/expressions/helpers.h Wed Mar 15 03:29:10 2006
@@ -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: pspp/src/language/expressions/optimize.c
diff -u pspp/src/language/expressions/optimize.c:1.1
pspp/src/language/expressions/optimize.c:1.2
--- pspp/src/language/expressions/optimize.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/expressions/optimize.c Wed Mar 15 03:29:10 2006
@@ -23,17 +23,17 @@
#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: pspp/src/language/expressions/parse.c
diff -u pspp/src/language/expressions/parse.c:1.1
pspp/src/language/expressions/parse.c:1.2
--- pspp/src/language/expressions/parse.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/expressions/parse.c Wed Mar 15 03:29:10 2006
@@ -23,19 +23,19 @@
#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>
/* Declarations. */
Index: pspp/src/language/expressions/private.h
diff -u pspp/src/language/expressions/private.h:1.1
pspp/src/language/expressions/private.h:1.2
--- pspp/src/language/expressions/private.h:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/expressions/private.h Wed Mar 15 03:29:10 2006
@@ -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: pspp/src/language/lexer/automake.mk
diff -u pspp/src/language/lexer/automake.mk:1.1
pspp/src/language/lexer/automake.mk:1.2
--- pspp/src/language/lexer/automake.mk:1.1 Sat Mar 4 02:03:32 2006
+++ pspp/src/language/lexer/automake.mk Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/language/lexer/format-parser.c
diff -u pspp/src/language/lexer/format-parser.c:1.1
pspp/src/language/lexer/format-parser.c:1.2
--- pspp/src/language/lexer/format-parser.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/lexer/format-parser.c Wed Mar 15 03:29:11 2006
@@ -18,15 +18,15 @@
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: pspp/src/language/lexer/lexer.c
diff -u pspp/src/language/lexer/lexer.c:1.1 pspp/src/language/lexer/lexer.c:1.2
--- pspp/src/language/lexer/lexer.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/lexer/lexer.c Wed Mar 15 03:29:11 2006
@@ -19,20 +19,20 @@
#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: pspp/src/language/lexer/lexer.h
diff -u pspp/src/language/lexer/lexer.h:1.1 pspp/src/language/lexer/lexer.h:1.2
--- pspp/src/language/lexer/lexer.h:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/lexer/lexer.h Wed Mar 15 03:29:11 2006
@@ -20,11 +20,11 @@
#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: pspp/src/language/lexer/q2c.c
diff -u pspp/src/language/lexer/q2c.c:1.3 pspp/src/language/lexer/q2c.c:1.4
--- pspp/src/language/lexer/q2c.c:1.3 Fri Mar 10 16:30:34 2006
+++ pspp/src/language/lexer/q2c.c Wed Mar 15 03:29:11 2006
@@ -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. */
@@ -41,13 +42,8 @@
#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 @@
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: pspp/src/language/lexer/range-parser.c
diff -u pspp/src/language/lexer/range-parser.c:1.1
pspp/src/language/lexer/range-parser.c:1.2
--- pspp/src/language/lexer/range-parser.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/lexer/range-parser.c Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/language/lexer/variable-parser.c
diff -u pspp/src/language/lexer/variable-parser.c:1.1
pspp/src/language/lexer/variable-parser.c:1.2
--- pspp/src/language/lexer/variable-parser.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/lexer/variable-parser.c Wed Mar 15 03:29:11 2006
@@ -18,20 +18,20 @@
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: pspp/src/language/line-buffer.c
diff -u pspp/src/language/line-buffer.c:1.1 pspp/src/language/line-buffer.c:1.2
--- pspp/src/language/line-buffer.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/line-buffer.c Wed Mar 15 03:29:10 2006
@@ -18,21 +18,21 @@
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: pspp/src/language/line-buffer.h
diff -u pspp/src/language/line-buffer.h:1.1 pspp/src/language/line-buffer.h:1.2
--- pspp/src/language/line-buffer.h:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/line-buffer.h Wed Mar 15 03:29:10 2006
@@ -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: pspp/src/language/stats/aggregate.c
diff -u pspp/src/language/stats/aggregate.c:1.1
pspp/src/language/stats/aggregate.c:1.2
--- pspp/src/language/stats/aggregate.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/stats/aggregate.c Wed Mar 15 03:29:11 2006
@@ -18,26 +18,26 @@
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: pspp/src/language/stats/automake.mk
diff -u pspp/src/language/stats/automake.mk:1.1
pspp/src/language/stats/automake.mk:1.2
--- pspp/src/language/stats/automake.mk:1.1 Sat Mar 4 02:03:32 2006
+++ pspp/src/language/stats/automake.mk Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/language/stats/autorecode.c
diff -u pspp/src/language/stats/autorecode.c:1.2
pspp/src/language/stats/autorecode.c:1.3
--- pspp/src/language/stats/autorecode.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/stats/autorecode.c Wed Mar 15 03:29:11 2006
@@ -18,20 +18,20 @@
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: pspp/src/language/stats/correlations.q
diff -u pspp/src/language/stats/correlations.q:1.2
pspp/src/language/stats/correlations.q:1.3
--- pspp/src/language/stats/correlations.q:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/stats/correlations.q Wed Mar 15 03:29:11 2006
@@ -19,16 +19,16 @@
#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: pspp/src/language/stats/crosstabs.q
diff -u pspp/src/language/stats/crosstabs.q:1.2
pspp/src/language/stats/crosstabs.q:1.3
--- pspp/src/language/stats/crosstabs.q:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/stats/crosstabs.q Wed Mar 15 03:29:11 2006
@@ -30,29 +30,29 @@
*/
#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: pspp/src/language/stats/descriptives.c
diff -u pspp/src/language/stats/descriptives.c:1.2
pspp/src/language/stats/descriptives.c:1.3
--- pspp/src/language/stats/descriptives.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/stats/descriptives.c Wed Mar 15 03:29:11 2006
@@ -20,25 +20,25 @@
/* 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: pspp/src/language/stats/examine.q
diff -u pspp/src/language/stats/examine.q:1.2
pspp/src/language/stats/examine.q:1.3
--- pspp/src/language/stats/examine.q:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/stats/examine.q Wed Mar 15 03:29:11 2006
@@ -20,41 +20,41 @@
#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: pspp/src/language/stats/flip.c
diff -u pspp/src/language/stats/flip.c:1.2 pspp/src/language/stats/flip.c:1.3
--- pspp/src/language/stats/flip.c:1.2 Sat Mar 4 20:38:51 2006
+++ pspp/src/language/stats/flip.c Wed Mar 15 03:29:11 2006
@@ -18,27 +18,27 @@
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: pspp/src/language/stats/frequencies.q
diff -u pspp/src/language/stats/frequencies.q:1.2
pspp/src/language/stats/frequencies.q:1.3
--- pspp/src/language/stats/frequencies.q:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/stats/frequencies.q Wed Mar 15 03:29:11 2006
@@ -24,36 +24,36 @@
*/
#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: pspp/src/language/stats/means.q
diff -u pspp/src/language/stats/means.q:1.1 pspp/src/language/stats/means.q:1.2
--- pspp/src/language/stats/means.q:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/stats/means.q Wed Mar 15 03:29:11 2006
@@ -20,22 +20,22 @@
#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: pspp/src/language/stats/oneway.q
diff -u pspp/src/language/stats/oneway.q:1.2
pspp/src/language/stats/oneway.q:1.3
--- pspp/src/language/stats/oneway.q:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/stats/oneway.q Wed Mar 15 03:29:11 2006
@@ -20,30 +20,30 @@
#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: pspp/src/language/stats/rank.q
diff -u pspp/src/language/stats/rank.q:1.2 pspp/src/language/stats/rank.q:1.3
--- pspp/src/language/stats/rank.q:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/stats/rank.q Wed Mar 15 03:29:11 2006
@@ -19,11 +19,11 @@
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: pspp/src/language/stats/regression.q
diff -u pspp/src/language/stats/regression.q:1.2
pspp/src/language/stats/regression.q:1.3
--- pspp/src/language/stats/regression.q:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/stats/regression.q Wed Mar 15 03:29:11 2006
@@ -23,27 +23,27 @@
#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: pspp/src/language/stats/sort-cases.c
diff -u pspp/src/language/stats/sort-cases.c:1.1
pspp/src/language/stats/sort-cases.c:1.2
--- pspp/src/language/stats/sort-cases.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/stats/sort-cases.c Wed Mar 15 03:29:11 2006
@@ -22,14 +22,14 @@
#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: pspp/src/language/stats/sort-criteria.c
diff -u pspp/src/language/stats/sort-criteria.c:1.1
pspp/src/language/stats/sort-criteria.c:1.2
--- pspp/src/language/stats/sort-criteria.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/stats/sort-criteria.c Wed Mar 15 03:29:11 2006
@@ -22,14 +22,14 @@
#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: pspp/src/language/stats/t-test.q
diff -u pspp/src/language/stats/t-test.q:1.2
pspp/src/language/stats/t-test.q:1.3
--- pspp/src/language/stats/t-test.q:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/stats/t-test.q Wed Mar 15 03:29:11 2006
@@ -21,30 +21,30 @@
#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: pspp/src/language/tests/automake.mk
diff -u pspp/src/language/tests/automake.mk:1.1
pspp/src/language/tests/automake.mk:1.2
--- pspp/src/language/tests/automake.mk:1.1 Sat Mar 4 02:03:32 2006
+++ pspp/src/language/tests/automake.mk Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/language/tests/casefile-test.c
diff -u pspp/src/language/tests/casefile-test.c:1.1
pspp/src/language/tests/casefile-test.c:1.2
--- pspp/src/language/tests/casefile-test.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/tests/casefile-test.c Wed Mar 15 03:29:11 2006
@@ -18,13 +18,13 @@
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: pspp/src/language/tests/moments-test.c
diff -u pspp/src/language/tests/moments-test.c:1.1
pspp/src/language/tests/moments-test.c:1.2
--- pspp/src/language/tests/moments-test.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/tests/moments-test.c Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/language/tests/pool-test.c
diff -u pspp/src/language/tests/pool-test.c:1.1
pspp/src/language/tests/pool-test.c:1.2
--- pspp/src/language/tests/pool-test.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/tests/pool-test.c Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/language/utilities/automake.mk
diff -u pspp/src/language/utilities/automake.mk:1.1
pspp/src/language/utilities/automake.mk:1.2
--- pspp/src/language/utilities/automake.mk:1.1 Sat Mar 4 02:03:32 2006
+++ pspp/src/language/utilities/automake.mk Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/language/utilities/date.c
diff -u pspp/src/language/utilities/date.c:1.1
pspp/src/language/utilities/date.c:1.2
--- pspp/src/language/utilities/date.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/utilities/date.c Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/language/utilities/echo.c
diff -u pspp/src/language/utilities/echo.c:1.1
pspp/src/language/utilities/echo.c:1.2
--- pspp/src/language/utilities/echo.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/utilities/echo.c Wed Mar 15 03:29:11 2006
@@ -19,13 +19,13 @@
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: pspp/src/language/utilities/include.c
diff -u pspp/src/language/utilities/include.c:1.1
pspp/src/language/utilities/include.c:1.2
--- pspp/src/language/utilities/include.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/utilities/include.c Wed Mar 15 03:29:11 2006
@@ -20,12 +20,12 @@
#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: pspp/src/language/utilities/permissions.c
diff -u pspp/src/language/utilities/permissions.c:1.1
pspp/src/language/utilities/permissions.c:1.2
--- pspp/src/language/utilities/permissions.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/utilities/permissions.c Wed Mar 15 03:29:11 2006
@@ -18,19 +18,19 @@
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: pspp/src/language/utilities/set.q
diff -u pspp/src/language/utilities/set.q:1.2
pspp/src/language/utilities/set.q:1.3
--- pspp/src/language/utilities/set.q:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/utilities/set.q Wed Mar 15 03:29:11 2006
@@ -18,26 +18,26 @@
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: pspp/src/language/utilities/title.c
diff -u pspp/src/language/utilities/title.c:1.1
pspp/src/language/utilities/title.c:1.2
--- pspp/src/language/utilities/title.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/utilities/title.c Wed Mar 15 03:29:11 2006
@@ -20,21 +20,21 @@
#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: pspp/src/language/xforms/automake.mk
diff -u pspp/src/language/xforms/automake.mk:1.1
pspp/src/language/xforms/automake.mk:1.2
--- pspp/src/language/xforms/automake.mk:1.1 Sat Mar 4 02:03:32 2006
+++ pspp/src/language/xforms/automake.mk Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/language/xforms/compute.c
diff -u pspp/src/language/xforms/compute.c:1.1
pspp/src/language/xforms/compute.c:1.2
--- pspp/src/language/xforms/compute.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/xforms/compute.c Wed Mar 15 03:29:11 2006
@@ -18,18 +18,18 @@
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: pspp/src/language/xforms/count.c
diff -u pspp/src/language/xforms/count.c:1.2
pspp/src/language/xforms/count.c:1.3
--- pspp/src/language/xforms/count.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/xforms/count.c Wed Mar 15 03:29:11 2006
@@ -18,19 +18,19 @@
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: pspp/src/language/xforms/recode.c
diff -u pspp/src/language/xforms/recode.c:1.2
pspp/src/language/xforms/recode.c:1.3
--- pspp/src/language/xforms/recode.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/xforms/recode.c Wed Mar 15 03:29:11 2006
@@ -18,23 +18,23 @@
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: pspp/src/language/xforms/sample.c
diff -u pspp/src/language/xforms/sample.c:1.2
pspp/src/language/xforms/sample.c:1.3
--- pspp/src/language/xforms/sample.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/language/xforms/sample.c Wed Mar 15 03:29:11 2006
@@ -22,19 +22,19 @@
#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: pspp/src/language/xforms/select-if.c
diff -u pspp/src/language/xforms/select-if.c:1.1
pspp/src/language/xforms/select-if.c:1.2
--- pspp/src/language/xforms/select-if.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/language/xforms/select-if.c Wed Mar 15 03:29:11 2006
@@ -19,14 +19,14 @@
#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: pspp/src/libpspp/automake.mk
diff -u pspp/src/libpspp/automake.mk:1.2 pspp/src/libpspp/automake.mk:1.3
--- pspp/src/libpspp/automake.mk:1.2 Mon Mar 13 09:03:47 2006
+++ pspp/src/libpspp/automake.mk Wed Mar 15 03:29:11 2006
@@ -30,12 +30,14 @@
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[] = \"@address@hidden";" >> $@
echo "const char version[] = \"GNU @PACKAGE@ @address@hidden";" >> $@
echo "const char stat_version[] = \"GNU @PACKAGE@ @VERSION@ \
@@ -54,3 +56,4 @@
echo " \"/usr/share/groff/font\";" >> $@
echo "const char locale_dir[] = \"$(datadir)/locale\";" >> $@
+
Index: pspp/src/math/automake.mk
diff -u pspp/src/math/automake.mk:1.1 pspp/src/math/automake.mk:1.2
--- pspp/src/math/automake.mk:1.1 Sat Mar 4 01:23:16 2006
+++ pspp/src/math/automake.mk Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/math/design-matrix.c
diff -u pspp/src/math/design-matrix.c:1.1 pspp/src/math/design-matrix.c:1.2
--- pspp/src/math/design-matrix.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/math/design-matrix.c Wed Mar 15 03:29:11 2006
@@ -22,11 +22,10 @@
*/
#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: pspp/src/math/design-matrix.h
diff -u pspp/src/math/design-matrix.h:1.1 pspp/src/math/design-matrix.h:1.2
--- pspp/src/math/design-matrix.h:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/math/design-matrix.h Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/math/factor-stats.c
diff -u pspp/src/math/factor-stats.c:1.1 pspp/src/math/factor-stats.c:1.2
--- pspp/src/math/factor-stats.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/math/factor-stats.c Wed Mar 15 03:29:11 2006
@@ -20,10 +20,10 @@
#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: pspp/src/math/factor-stats.h
diff -u pspp/src/math/factor-stats.h:1.1 pspp/src/math/factor-stats.h:1.2
--- pspp/src/math/factor-stats.h:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/math/factor-stats.h Wed Mar 15 03:29:11 2006
@@ -25,8 +25,8 @@
/* 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: pspp/src/math/group.c
diff -u pspp/src/math/group.c:1.2 pspp/src/math/group.c:1.3
--- pspp/src/math/group.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/math/group.c Wed Mar 15 03:29:11 2006
@@ -19,14 +19,14 @@
#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: pspp/src/math/group.h
diff -u pspp/src/math/group.h:1.1 pspp/src/math/group.h:1.2
--- pspp/src/math/group.h:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/math/group.h Wed Mar 15 03:29:11 2006
@@ -22,7 +22,7 @@
#define GROUP_H
-#include "value.h"
+#include <data/value.h>
/* Statistics for grouped data */
Index: pspp/src/math/levene.c
diff -u pspp/src/math/levene.c:1.1 pspp/src/math/levene.c:1.2
--- pspp/src/math/levene.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/math/levene.c Wed Mar 15 03:29:11 2006
@@ -21,17 +21,17 @@
#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: pspp/src/math/levene.h
diff -u pspp/src/math/levene.h:1.1 pspp/src/math/levene.h:1.2
--- pspp/src/math/levene.h:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/math/levene.h Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/math/linreg/automake.mk
diff -u pspp/src/math/linreg/automake.mk:1.1
pspp/src/math/linreg/automake.mk:1.2
--- pspp/src/math/linreg/automake.mk:1.1 Sat Mar 4 01:29:08 2006
+++ pspp/src/math/linreg/automake.mk Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/math/linreg/coefficient.c
diff -u pspp/src/math/linreg/coefficient.c:1.1
pspp/src/math/linreg/coefficient.c:1.2
--- pspp/src/math/linreg/coefficient.c:1.1 Sat Mar 4 01:29:08 2006
+++ pspp/src/math/linreg/coefficient.c Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/math/linreg/coefficient.h
diff -u pspp/src/math/linreg/coefficient.h:1.1
pspp/src/math/linreg/coefficient.h:1.2
--- pspp/src/math/linreg/coefficient.h:1.1 Sat Mar 4 01:29:08 2006
+++ pspp/src/math/linreg/coefficient.h Wed Mar 15 03:29:11 2006
@@ -24,7 +24,7 @@
#define COEFFICIENT_H
-#include "linreg.h"
+#include <math/linreg/linreg.h>
struct design_matrix;
Index: pspp/src/math/linreg/linreg.c
diff -u pspp/src/math/linreg/linreg.c:1.1 pspp/src/math/linreg/linreg.c:1.2
--- pspp/src/math/linreg/linreg.c:1.1 Sat Mar 4 01:29:08 2006
+++ pspp/src/math/linreg/linreg.c Wed Mar 15 03:29:11 2006
@@ -53,10 +53,10 @@
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: pspp/src/math/moments.c
diff -u pspp/src/math/moments.c:1.1 pspp/src/math/moments.c:1.2
--- pspp/src/math/moments.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/math/moments.c Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/math/moments.h
diff -u pspp/src/math/moments.h:1.1 pspp/src/math/moments.h:1.2
--- pspp/src/math/moments.h:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/math/moments.h Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/math/percentiles.c
diff -u pspp/src/math/percentiles.c:1.2 pspp/src/math/percentiles.c:1.3
--- pspp/src/math/percentiles.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/math/percentiles.c Wed Mar 15 03:29:11 2006
@@ -19,10 +19,10 @@
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: pspp/src/math/percentiles.h
diff -u pspp/src/math/percentiles.h:1.1 pspp/src/math/percentiles.h:1.2
--- pspp/src/math/percentiles.h:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/math/percentiles.h Wed Mar 15 03:29:11 2006
@@ -22,7 +22,7 @@
#define PERCENTILES_H
-#include "hash.h"
+#include <libpspp/hash.h>
struct weighted_value ;
Index: pspp/src/math/sort.c
diff -u pspp/src/math/sort.c:1.1 pspp/src/math/sort.c:1.2
--- pspp/src/math/sort.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/math/sort.c Wed Mar 15 03:29:11 2006
@@ -19,28 +19,28 @@
#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 "misc.h"
-#include "settings.h"
-#include "str.h"
-#include "variable.h"
-#include "procedure.h"
+#include <data/case.h>
+#include <data/casefile.h>
+#include <libpspp/message.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: pspp/src/message.c
diff -u pspp/src/message.c:1.1 pspp/src/message.c:1.2
--- pspp/src/message.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/message.c Wed Mar 15 03:29:10 2006
@@ -18,18 +18,18 @@
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: pspp/src/output/ascii.c
diff -u pspp/src/output/ascii.c:1.3 pspp/src/output/ascii.c:1.4
--- pspp/src/output/ascii.c:1.3 Sat Mar 4 21:26:39 2006
+++ pspp/src/output/ascii.c Wed Mar 15 03:29:11 2006
@@ -18,21 +18,21 @@
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: pspp/src/output/automake.mk
diff -u pspp/src/output/automake.mk:1.1 pspp/src/output/automake.mk:1.2
--- pspp/src/output/automake.mk:1.1 Sat Mar 4 02:00:57 2006
+++ pspp/src/output/automake.mk Wed Mar 15 03:29:11 2006
@@ -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 @@
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: pspp/src/output/chart.c
diff -u pspp/src/output/chart.c:1.1 pspp/src/output/chart.c:1.2
--- pspp/src/output/chart.c:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/output/chart.c Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/output/chart.h
diff -u pspp/src/output/chart.h:1.1 pspp/src/output/chart.h:1.2
--- pspp/src/output/chart.h:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/output/chart.h Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/output/charts/automake.mk
diff -u pspp/src/output/charts/automake.mk:1.3
pspp/src/output/charts/automake.mk:1.4
--- pspp/src/output/charts/automake.mk:1.3 Sat Mar 11 07:16:40 2006
+++ pspp/src/output/charts/automake.mk Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/output/charts/barchart.c
diff -u pspp/src/output/charts/barchart.c:1.1
pspp/src/output/charts/barchart.c:1.2
--- pspp/src/output/charts/barchart.c:1.1 Sat Mar 4 02:00:57 2006
+++ pspp/src/output/charts/barchart.c Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/output/charts/barchart.h
diff -u pspp/src/output/charts/barchart.h:1.1
pspp/src/output/charts/barchart.h:1.2
--- pspp/src/output/charts/barchart.h:1.1 Sat Mar 4 02:00:57 2006
+++ pspp/src/output/charts/barchart.h Wed Mar 15 03:29:11 2006
@@ -20,7 +20,7 @@
#ifndef BARCHART_H
#define BARCHART_H
-#include "chart.h"
+#include <output/chart.h>
enum bar_opts {
BAR_GROUPED = 0,
Index: pspp/src/output/charts/box-whisker.c
diff -u pspp/src/output/charts/box-whisker.c:1.1
pspp/src/output/charts/box-whisker.c:1.2
--- pspp/src/output/charts/box-whisker.c:1.1 Sat Mar 4 02:00:57 2006
+++ pspp/src/output/charts/box-whisker.c Wed Mar 15 03:29:11 2006
@@ -18,15 +18,18 @@
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: pspp/src/output/charts/box-whisker.h
diff -u pspp/src/output/charts/box-whisker.h:1.1
pspp/src/output/charts/box-whisker.h:1.2
--- pspp/src/output/charts/box-whisker.h:1.1 Sat Mar 4 02:00:57 2006
+++ pspp/src/output/charts/box-whisker.h Wed Mar 15 03:29:11 2006
@@ -23,6 +23,8 @@
#include <config.h>
struct chart ;
+struct weighted_value;
+struct metrics;
/* Draw an outlier on the plot CH
* at CENTRELINE
Index: pspp/src/output/charts/cartesian.c
diff -u pspp/src/output/charts/cartesian.c:1.2
pspp/src/output/charts/cartesian.c:1.3
--- pspp/src/output/charts/cartesian.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/output/charts/cartesian.c Wed Mar 15 03:29:11 2006
@@ -19,11 +19,13 @@
#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: pspp/src/output/charts/dummy-chart.c
diff -u pspp/src/output/charts/dummy-chart.c:1.2
pspp/src/output/charts/dummy-chart.c:1.3
--- pspp/src/output/charts/dummy-chart.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/output/charts/dummy-chart.c Wed Mar 15 03:29:11 2006
@@ -22,11 +22,11 @@
This module is linked only when charts are not supported */
#include "config.h"
-#include "chart.h"
-#include "plot-chart.h"
-#include "cartesian.h"
+#include <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: pspp/src/output/charts/piechart.c
diff -u pspp/src/output/charts/piechart.c:1.1
pspp/src/output/charts/piechart.c:1.2
--- pspp/src/output/charts/piechart.c:1.1 Sat Mar 4 02:00:57 2006
+++ pspp/src/output/charts/piechart.c Wed Mar 15 03:29:11 2006
@@ -19,17 +19,22 @@
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: pspp/src/output/charts/plot-chart.c
diff -u pspp/src/output/charts/plot-chart.c:1.1
pspp/src/output/charts/plot-chart.c:1.2
--- pspp/src/output/charts/plot-chart.c:1.1 Sat Mar 4 02:00:57 2006
+++ pspp/src/output/charts/plot-chart.c Wed Mar 15 03:29:11 2006
@@ -18,6 +18,7 @@
02110-1301, USA. */
#include <config.h>
+
#include <stdio.h>
#include <plot.h>
#include <stdarg.h>
@@ -27,13 +28,18 @@
#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: pspp/src/output/charts/plot-chart.h
diff -u pspp/src/output/charts/plot-chart.h:1.1
pspp/src/output/charts/plot-chart.h:1.2
--- pspp/src/output/charts/plot-chart.h:1.1 Sat Mar 4 02:00:57 2006
+++ pspp/src/output/charts/plot-chart.h Wed Mar 15 03:29:11 2006
@@ -27,12 +27,13 @@
#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: pspp/src/output/charts/plot-hist.c
diff -u pspp/src/output/charts/plot-hist.c:1.1
pspp/src/output/charts/plot-hist.c:1.2
--- pspp/src/output/charts/plot-hist.c:1.1 Sat Mar 4 02:00:57 2006
+++ pspp/src/output/charts/plot-hist.c Wed Mar 15 03:29:11 2006
@@ -21,16 +21,18 @@
#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: pspp/src/output/groff-font.c
diff -u pspp/src/output/groff-font.c:1.3 pspp/src/output/groff-font.c:1.4
--- pspp/src/output/groff-font.c:1.3 Sat Mar 4 21:00:38 2006
+++ pspp/src/output/groff-font.c Wed Mar 15 03:29:11 2006
@@ -19,22 +19,22 @@
#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: pspp/src/output/html.c
diff -u pspp/src/output/html.c:1.3 pspp/src/output/html.c:1.4
--- pspp/src/output/html.c:1.3 Sat Mar 4 21:51:08 2006
+++ pspp/src/output/html.c Wed Mar 15 03:29:11 2006
@@ -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>
@@ -30,17 +30,17 @@
#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: pspp/src/output/htmlP.h
diff -u pspp/src/output/htmlP.h:1.1 pspp/src/output/htmlP.h:1.2
--- pspp/src/output/htmlP.h:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/output/htmlP.h Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/output/manager.c
diff -u pspp/src/output/manager.c:1.2 pspp/src/output/manager.c:1.3
--- pspp/src/output/manager.c:1.2 Sat Mar 4 21:26:39 2006
+++ pspp/src/output/manager.c Wed Mar 15 03:29:11 2006
@@ -19,11 +19,11 @@
#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: pspp/src/output/output.c
diff -u pspp/src/output/output.c:1.4 pspp/src/output/output.c:1.5
--- pspp/src/output/output.c:1.4 Sat Mar 4 21:51:08 2006
+++ pspp/src/output/output.c Wed Mar 15 03:29:11 2006
@@ -19,19 +19,19 @@
#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: pspp/src/output/output.h
diff -u pspp/src/output/output.h:1.1 pspp/src/output/output.h:1.2
--- pspp/src/output/output.h:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/output/output.h Wed Mar 15 03:29:11 2006
@@ -20,8 +20,10 @@
#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: pspp/src/output/postscript.c
diff -u pspp/src/output/postscript.c:1.5 pspp/src/output/postscript.c:1.6
--- pspp/src/output/postscript.c:1.5 Sun Mar 5 21:21:29 2006
+++ pspp/src/output/postscript.c Wed Mar 15 03:29:11 2006
@@ -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>
@@ -31,20 +31,20 @@
#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: pspp/src/output/table.c
diff -u pspp/src/output/table.c:1.3 pspp/src/output/table.c:1.4
--- pspp/src/output/table.c:1.3 Sat Mar 4 21:26:39 2006
+++ pspp/src/output/table.c Wed Mar 15 03:29:11 2006
@@ -23,21 +23,21 @@
#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>
struct som_table_class tab_table_class;
static char *command_name;
Index: pspp/src/output/table.h
diff -u pspp/src/output/table.h:1.2 pspp/src/output/table.h:1.3
--- pspp/src/output/table.h:1.2 Sat Mar 4 21:26:39 2006
+++ pspp/src/output/table.h Wed Mar 15 03:29:11 2006
@@ -21,7 +21,7 @@
#define tab_h 1
#include <limits.h>
-#include "str.h"
+#include <libpspp/str.h>
/* Cell options. */
enum
Index: pspp/src/procedure.c
diff -u pspp/src/procedure.c:1.1 pspp/src/procedure.c:1.2
--- pspp/src/procedure.c:1.1 Sat Mar 4 01:11:57 2006
+++ pspp/src/procedure.c Wed Mar 15 03:29:10 2006
@@ -18,30 +18,30 @@
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: pspp/src/ui/gui/automake.mk
diff -u pspp/src/ui/gui/automake.mk:1.2 pspp/src/ui/gui/automake.mk:1.3
--- pspp/src/ui/gui/automake.mk:1.2 Mon Mar 13 09:03:47 2006
+++ pspp/src/ui/gui/automake.mk Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/ui/gui/data-sheet.c
diff -u pspp/src/ui/gui/data-sheet.c:1.1 pspp/src/ui/gui/data-sheet.c:1.2
--- pspp/src/ui/gui/data-sheet.c:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/data-sheet.c Wed Mar 15 03:29:11 2006
@@ -24,18 +24,18 @@
#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: pspp/src/ui/gui/data-sheet.h
diff -u pspp/src/ui/gui/data-sheet.h:1.1 pspp/src/ui/gui/data-sheet.h:1.2
--- pspp/src/ui/gui/data-sheet.h:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/data-sheet.h Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/ui/gui/helper.c
diff -u pspp/src/ui/gui/helper.c:1.1 pspp/src/ui/gui/helper.c:1.2
--- pspp/src/ui/gui/helper.c:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/helper.c Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/ui/gui/helper.h
diff -u pspp/src/ui/gui/helper.h:1.1 pspp/src/ui/gui/helper.h:1.2
--- pspp/src/ui/gui/helper.h:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/helper.h Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/ui/gui/menu-actions.c
diff -u pspp/src/ui/gui/menu-actions.c:1.1 pspp/src/ui/gui/menu-actions.c:1.2
--- pspp/src/ui/gui/menu-actions.c:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/menu-actions.c Wed Mar 15 03:29:11 2006
@@ -20,14 +20,15 @@
#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: pspp/src/ui/gui/message-dialog.c
diff -u pspp/src/ui/gui/message-dialog.c:1.1
pspp/src/ui/gui/message-dialog.c:1.2
--- pspp/src/ui/gui/message-dialog.c:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/message-dialog.c Wed Mar 15 03:29:11 2006
@@ -24,7 +24,7 @@
#include <stdarg.h>
#include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
#include "message-dialog.h"
Index: pspp/src/ui/gui/message-dialog.h
diff -u pspp/src/ui/gui/message-dialog.h:1.1
pspp/src/ui/gui/message-dialog.h:1.2
--- pspp/src/ui/gui/message-dialog.h:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/message-dialog.h Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/ui/gui/missing-val-dialog.c
diff -u pspp/src/ui/gui/missing-val-dialog.c:1.1
pspp/src/ui/gui/missing-val-dialog.c:1.2
--- pspp/src/ui/gui/missing-val-dialog.c:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/missing-val-dialog.c Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/ui/gui/missing-val-dialog.h
diff -u pspp/src/ui/gui/missing-val-dialog.h:1.1
pspp/src/ui/gui/missing-val-dialog.h:1.2
--- pspp/src/ui/gui/missing-val-dialog.h:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/missing-val-dialog.h Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/ui/gui/psppire-case-array.c
diff -u pspp/src/ui/gui/psppire-case-array.c:1.1
pspp/src/ui/gui/psppire-case-array.c:1.2
--- pspp/src/ui/gui/psppire-case-array.c:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/psppire-case-array.c Wed Mar 15 03:29:11 2006
@@ -24,9 +24,10 @@
#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: pspp/src/ui/gui/psppire-data-store.c
diff -u pspp/src/ui/gui/psppire-data-store.c:1.1
pspp/src/ui/gui/psppire-data-store.c:1.2
--- pspp/src/ui/gui/psppire-data-store.c:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/psppire-data-store.c Wed Mar 15 03:29:11 2006
@@ -23,20 +23,20 @@
#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: pspp/src/ui/gui/psppire-data-store.h
diff -u pspp/src/ui/gui/psppire-data-store.h:1.1
pspp/src/ui/gui/psppire-data-store.h:1.2
--- pspp/src/ui/gui/psppire-data-store.h:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/psppire-data-store.h Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/ui/gui/psppire-dict.c
diff -u pspp/src/ui/gui/psppire-dict.c:1.1 pspp/src/ui/gui/psppire-dict.c:1.2
--- pspp/src/ui/gui/psppire-dict.c:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/psppire-dict.c Wed Mar 15 03:29:11 2006
@@ -22,14 +22,14 @@
#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: pspp/src/ui/gui/psppire-dict.h
diff -u pspp/src/ui/gui/psppire-dict.h:1.1 pspp/src/ui/gui/psppire-dict.h:1.2
--- pspp/src/ui/gui/psppire-dict.h:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/psppire-dict.h Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/ui/gui/psppire-var-store.c
diff -u pspp/src/ui/gui/psppire-var-store.c:1.1
pspp/src/ui/gui/psppire-var-store.c:1.2
--- pspp/src/ui/gui/psppire-var-store.c:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/psppire-var-store.c Wed Mar 15 03:29:11 2006
@@ -25,19 +25,19 @@
#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: pspp/src/ui/gui/psppire-var-store.h
diff -u pspp/src/ui/gui/psppire-var-store.h:1.1
pspp/src/ui/gui/psppire-var-store.h:1.2
--- pspp/src/ui/gui/psppire-var-store.h:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/psppire-var-store.h Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/ui/gui/psppire-variable.c
diff -u pspp/src/ui/gui/psppire-variable.c:1.1
pspp/src/ui/gui/psppire-variable.c:1.2
--- pspp/src/ui/gui/psppire-variable.c:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/psppire-variable.c Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/ui/gui/psppire-variable.h
diff -u pspp/src/ui/gui/psppire-variable.h:1.1
pspp/src/ui/gui/psppire-variable.h:1.2
--- pspp/src/ui/gui/psppire-variable.h:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/psppire-variable.h Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/ui/gui/val-labs-dialog.c
diff -u pspp/src/ui/gui/val-labs-dialog.c:1.1
pspp/src/ui/gui/val-labs-dialog.c:1.2
--- pspp/src/ui/gui/val-labs-dialog.c:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/val-labs-dialog.c Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/ui/gui/var-sheet.c
diff -u pspp/src/ui/gui/var-sheet.c:1.1 pspp/src/ui/gui/var-sheet.c:1.2
--- pspp/src/ui/gui/var-sheet.c:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/var-sheet.c Wed Mar 15 03:29:11 2006
@@ -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>
@@ -32,11 +32,11 @@
#define min(A,B) ((A < B)?A:B)
-#include "gtksheet.h"
-#include "gsheet-hetero-column.h"
-#include "gsheet-uniform-row.h"
-#include "psppire-var-store.h"
+#include <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: pspp/src/ui/gui/var-sheet.h
diff -u pspp/src/ui/gui/var-sheet.h:1.1 pspp/src/ui/gui/var-sheet.h:1.2
--- pspp/src/ui/gui/var-sheet.h:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/var-sheet.h Wed Mar 15 03:29:11 2006
@@ -22,7 +22,7 @@
#ifndef VAR_SHEET_H
#define VAR_SHEET_H
-#include "gtksheet.h"
+#include <gtksheet/gtksheet.h>
#include "psppire-dict.h"
Index: pspp/src/ui/gui/var-type-dialog.c
diff -u pspp/src/ui/gui/var-type-dialog.c:1.1
pspp/src/ui/gui/var-type-dialog.c:1.2
--- pspp/src/ui/gui/var-type-dialog.c:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/var-type-dialog.c Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/ui/gui/var-type-dialog.h
diff -u pspp/src/ui/gui/var-type-dialog.h:1.1
pspp/src/ui/gui/var-type-dialog.h:1.2
--- pspp/src/ui/gui/var-type-dialog.h:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/gui/var-type-dialog.h Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/ui/terminal/automake.mk
diff -u pspp/src/ui/terminal/automake.mk:1.2
pspp/src/ui/terminal/automake.mk:1.3
--- pspp/src/ui/terminal/automake.mk:1.2 Sat Mar 11 07:16:40 2006
+++ pspp/src/ui/terminal/automake.mk Wed Mar 15 03:29:11 2006
@@ -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: pspp/src/ui/terminal/command-line.c
diff -u pspp/src/ui/terminal/command-line.c:1.1
pspp/src/ui/terminal/command-line.c:1.2
--- pspp/src/ui/terminal/command-line.c:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/terminal/command-line.c Wed Mar 15 03:29:11 2006
@@ -19,23 +19,23 @@
#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: pspp/src/ui/terminal/main.c
diff -u pspp/src/ui/terminal/main.c:1.2 pspp/src/ui/terminal/main.c:1.3
--- pspp/src/ui/terminal/main.c:1.2 Sat Mar 4 21:00:38 2006
+++ pspp/src/ui/terminal/main.c Wed Mar 15 03:29:11 2006
@@ -22,21 +22,21 @@
#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: pspp/src/ui/terminal/read-line.c
diff -u pspp/src/ui/terminal/read-line.c:1.1
pspp/src/ui/terminal/read-line.c:1.2
--- pspp/src/ui/terminal/read-line.c:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/terminal/read-line.c Wed Mar 15 03:29:11 2006
@@ -25,14 +25,14 @@
#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: pspp/src/ui/terminal/read-line.h
diff -u pspp/src/ui/terminal/read-line.h:1.1
pspp/src/ui/terminal/read-line.h:1.2
--- pspp/src/ui/terminal/read-line.h:1.1 Sat Mar 4 01:11:58 2006
+++ pspp/src/ui/terminal/read-line.h Wed Mar 15 03:29:11 2006
@@ -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);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp lib/gsl-extras/automake.mk lib/gtksheet/au...,
John Darrington <=