From 81fff61a96bece351e381ad3fef8ab1248a952ba Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 5 May 2006 04:53:12 +0000 Subject: [PATCH] Continue reforming procedure execution. In this phase, move procedure.c and procedure.h from src to src/data. Update makefiles and #includes accordingly. --- src/ChangeLog | 12 ++++++++ src/automake.mk | 9 ------ src/data/ChangeLog | 10 +++++++ src/data/automake.mk | 2 ++ src/{ => data}/procedure.c | 5 ++-- src/{ => data}/procedure.h | 0 src/data/transformations.c | 1 - src/language/command.c | 2 +- src/language/control/do-if.c | 2 +- src/language/control/loop.c | 2 +- src/language/control/repeat.c | 2 +- src/language/control/temporary.c | 2 +- src/language/data-io/data-list.c | 2 +- src/language/data-io/data-reader.c | 15 ++++++---- src/language/data-io/get.c | 2 +- src/language/data-io/inpt-pgm.c | 2 +- src/language/data-io/list.q | 24 ++++++++------- src/language/data-io/matrix-data.c | 2 +- src/language/data-io/print.c | 2 +- src/language/dictionary/apply-dictionary.c | 2 +- src/language/dictionary/formats.c | 2 +- src/language/dictionary/missing-values.c | 2 +- src/language/dictionary/modify-variables.c | 2 +- src/language/dictionary/numeric.c | 2 +- src/language/dictionary/rename-variables.c | 2 +- src/language/dictionary/split-file.c | 2 +- src/language/dictionary/sys-file-info.c | 2 +- src/language/dictionary/value-labels.c | 2 +- src/language/dictionary/variable-display.c | 2 +- src/language/dictionary/variable-label.c | 2 +- src/language/dictionary/vector.c | 2 +- src/language/dictionary/weight.c | 2 +- src/language/expressions/helpers.h | 17 ++++++----- src/language/expressions/parse.c | 1 - src/language/lexer/variable-parser.c | 2 +- src/language/stats/aggregate.c | 3 +- src/language/stats/autorecode.c | 2 +- src/language/stats/correlations.q | 2 +- src/language/stats/crosstabs.q | 26 ++++++++-------- src/language/stats/descriptives.c | 2 +- src/language/stats/examine.q | 26 ++++++++-------- src/language/stats/flip.c | 3 +- src/language/stats/frequencies.q | 35 +++++++++++----------- src/language/stats/means.q | 2 +- src/language/stats/oneway.q | 29 +++++++++--------- src/language/stats/rank.q | 3 +- src/language/stats/regression.q | 2 +- src/language/stats/sort-cases.c | 2 +- src/language/stats/t-test.q | 29 ++++++++++-------- src/language/utilities/set.q | 2 +- src/language/utilities/title.c | 14 +++++---- src/language/xforms/compute.c | 2 +- src/language/xforms/count.c | 2 +- src/language/xforms/recode.c | 2 +- src/language/xforms/sample.c | 2 +- src/language/xforms/select-if.c | 2 +- src/math/levene.c | 2 +- src/math/sort.c | 2 +- src/ui/terminal/ChangeLog | 11 +++++++ src/ui/terminal/automake.mk | 6 ++-- src/ui/terminal/main.c | 3 +- 61 files changed, 198 insertions(+), 162 deletions(-) rename src/{ => data}/procedure.c (99%) rename src/{ => data}/procedure.h (100%) diff --git a/src/ChangeLog b/src/ChangeLog index 0fded64c..d64ac34a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +Thu May 4 21:47:48 2006 Ben Pfaff + + Continue reforming procedure execution. In this phase, move + procedure.c and procedure.h from src to src/data. Update + makefiles and #includes accordingly. + + * automake.mk: Remove special rule for src/procedure.o. + + * procedure.c: Moved to src/data. + + * procedure.h: Moved to src/data. + Wed May 3 22:24:34 2006 Ben Pfaff Continue reforming procedure execution. In this phase, get rid of diff --git a/src/automake.mk b/src/automake.mk index 64b49284..3d309a6c 100644 --- a/src/automake.mk +++ b/src/automake.mk @@ -14,12 +14,3 @@ include $(top_srcdir)/src/ui/gui/automake.mk endif AM_CPPFLAGS += -DPKGDATADIR=\"$(pkgdatadir)\" - -src/procedure.o: AM_CPPFLAGS += \ - -I$(top_srcdir)/src/language \ - -I$(top_srcdir)/src/language/control \ - -I$(top_srcdir)/src/output \ - -I$(top_srcdir)/src/data \ - -I$(top_srcdir)/src/libpspp - - diff --git a/src/data/ChangeLog b/src/data/ChangeLog index 49c1af84..0da663bf 100644 --- a/src/data/ChangeLog +++ b/src/data/ChangeLog @@ -1,3 +1,13 @@ +Thu May 4 21:50:11 2006 Ben Pfaff + + Continue reforming procedure execution. In this phase, move + procedure.c and procedure.h from src to src/data. Update + makefiles and #includes accordingly. + + * procedure.c: Moved here from src/. + + * procedure.h: Moved here from src/. + Wed May 3 22:42:12 2006 Ben Pfaff Continue reforming procedure execution. In this phase, get rid of diff --git a/src/data/automake.mk b/src/data/automake.mk index 2084e4f6..d79828b7 100644 --- a/src/data/automake.mk +++ b/src/data/automake.mk @@ -38,6 +38,8 @@ src_data_libdata_a_SOURCES = \ src/data/missing-values.h \ src/data/make-file.c \ src/data/make-file.h \ + src/data/procedure.c \ + src/data/procedure.h \ src/data/por-file-reader.c \ src/data/por-file-reader.h \ src/data/por-file-writer.c \ diff --git a/src/procedure.c b/src/data/procedure.c similarity index 99% rename from src/procedure.c rename to src/data/procedure.c index 9b94da01..4a5e9ddb 100644 --- a/src/procedure.c +++ b/src/data/procedure.c @@ -19,25 +19,24 @@ #include -#include - #include #include #include #include -#include "expressions/public.h" #include #include #include #include #include #include +#include #include #include #include #include #include +#include #include #include #include diff --git a/src/procedure.h b/src/data/procedure.h similarity index 100% rename from src/procedure.h rename to src/data/procedure.h diff --git a/src/data/transformations.c b/src/data/transformations.c index e5542b88..675e1c91 100644 --- a/src/data/transformations.c +++ b/src/data/transformations.c @@ -25,7 +25,6 @@ #include #include -#include #include "xalloc.h" diff --git a/src/language/command.c b/src/language/command.c index b5002cae..1e040d6c 100644 --- a/src/language/command.c +++ b/src/language/command.c @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -38,7 +39,6 @@ #include #include #include -#include #if HAVE_SYS_WAIT_H #include diff --git a/src/language/control/do-if.c b/src/language/control/do-if.c index 0c0ead94..47fceee6 100644 --- a/src/language/control/do-if.c +++ b/src/language/control/do-if.c @@ -22,7 +22,7 @@ #include #include "control-stack.h" -#include +#include #include #include #include diff --git a/src/language/control/loop.c b/src/language/control/loop.c index abbc4467..f31486f6 100644 --- a/src/language/control/loop.c +++ b/src/language/control/loop.c @@ -22,7 +22,7 @@ #include "control-stack.h" #include #include -#include +#include #include #include #include diff --git a/src/language/control/repeat.c b/src/language/control/repeat.c index ec37382b..bc4b8295 100644 --- a/src/language/control/repeat.c +++ b/src/language/control/repeat.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/language/control/temporary.c b/src/language/control/temporary.c index 2424c255..6cfd48ec 100644 --- a/src/language/control/temporary.c +++ b/src/language/control/temporary.c @@ -24,7 +24,7 @@ #include "control-stack.h" #include -#include +#include #include #include #include diff --git a/src/language/data-io/data-list.c b/src/language/data-io/data-list.c index a778b5d8..89505dbc 100644 --- a/src/language/data-io/data-list.c +++ b/src/language/data-io/data-list.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -45,7 +46,6 @@ #include #include #include -#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/data-reader.c b/src/language/data-io/data-reader.c index 8fc7a80a..a8b484d4 100644 --- a/src/language/data-io/data-reader.c +++ b/src/language/data-io/data-reader.c @@ -18,21 +18,24 @@ 02110-1301, USA. */ #include + #include + #include #include #include #include -#include -#include -#include -#include + #include #include -#include +#include +#include +#include #include +#include +#include +#include #include -#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/get.c b/src/language/data-io/get.c index b9634b19..0cc628be 100644 --- a/src/language/data-io/get.c +++ b/src/language/data-io/get.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -44,7 +45,6 @@ #include #include #include -#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/inpt-pgm.c b/src/language/data-io/inpt-pgm.c index fbf1d342..51c36981 100644 --- a/src/language/data-io/inpt-pgm.c +++ b/src/language/data-io/inpt-pgm.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -41,7 +42,6 @@ #include #include #include -#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q index a79c51ad..dd9a8ae1 100644 --- a/src/language/data-io/list.q +++ b/src/language/data-io/list.q @@ -18,27 +18,29 @@ 02110-1301, USA. */ #include -#include + #include #include -#include + +#include "intprops.h" +#include "size_max.h" #include -#include -#include #include -#include "intprops.h" +#include +#include +#include +#include #include -#include +#include +#include #include +#include +#include #include #include -#include -#include "size_max.h" #include +#include #include -#include -#include -#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/matrix-data.c b/src/language/data-io/matrix-data.c index ff008caa..d5b489c3 100644 --- a/src/language/data-io/matrix-data.c +++ b/src/language/data-io/matrix-data.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -40,7 +41,6 @@ #include #include #include -#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/print.c b/src/language/data-io/print.c index f6633652..63270160 100644 --- a/src/language/data-io/print.c +++ b/src/language/data-io/print.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/dictionary/apply-dictionary.c index 87b71eee..1c9e7ef8 100644 --- a/src/language/dictionary/apply-dictionary.c +++ b/src/language/dictionary/apply-dictionary.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/language/dictionary/formats.c b/src/language/dictionary/formats.c index 2d5e1c35..8658634b 100644 --- a/src/language/dictionary/formats.c +++ b/src/language/dictionary/formats.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/language/dictionary/missing-values.c b/src/language/dictionary/missing-values.c index 0757fb1d..e37fa987 100644 --- a/src/language/dictionary/missing-values.c +++ b/src/language/dictionary/missing-values.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/language/dictionary/modify-variables.c b/src/language/dictionary/modify-variables.c index ad6a48e4..1b0a27b0 100644 --- a/src/language/dictionary/modify-variables.c +++ b/src/language/dictionary/modify-variables.c @@ -31,8 +31,8 @@ #include #include #include +#include #include -#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c index f946e74a..37934883 100644 --- a/src/language/dictionary/numeric.c +++ b/src/language/dictionary/numeric.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/language/dictionary/rename-variables.c b/src/language/dictionary/rename-variables.c index eedc84d4..6165787f 100644 --- a/src/language/dictionary/rename-variables.c +++ b/src/language/dictionary/rename-variables.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/language/dictionary/split-file.c b/src/language/dictionary/split-file.c index 149523d3..7e003018 100644 --- a/src/language/dictionary/split-file.c +++ b/src/language/dictionary/split-file.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c index 97bf3df5..13c3275e 100644 --- a/src/language/dictionary/sys-file-info.c +++ b/src/language/dictionary/sys-file-info.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c index a9d3d875..89e0160a 100644 --- a/src/language/dictionary/value-labels.c +++ b/src/language/dictionary/value-labels.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c index ef43c531..2348b721 100644 --- a/src/language/dictionary/variable-display.c +++ b/src/language/dictionary/variable-display.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/language/dictionary/variable-label.c b/src/language/dictionary/variable-label.c index 3692a6c4..7380d3d6 100644 --- a/src/language/dictionary/variable-label.c +++ b/src/language/dictionary/variable-label.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/language/dictionary/vector.c b/src/language/dictionary/vector.c index 90f245c8..82870d9d 100644 --- a/src/language/dictionary/vector.c +++ b/src/language/dictionary/vector.c @@ -21,7 +21,7 @@ #include -#include +#include #include #include #include diff --git a/src/language/dictionary/weight.c b/src/language/dictionary/weight.c index 121728b6..5d492c4f 100644 --- a/src/language/dictionary/weight.c +++ b/src/language/dictionary/weight.c @@ -21,7 +21,7 @@ #include -#include +#include #include #include #include diff --git a/src/language/expressions/helpers.h b/src/language/expressions/helpers.h index c8355550..f5cfb67b 100644 --- a/src/language/expressions/helpers.h +++ b/src/language/expressions/helpers.h @@ -9,21 +9,22 @@ #include #include #include + +#include #include -#include #include #include -#include -#include +#include +#include +#include +#include #include +#include +#include #include +#include #include #include -#include -#include -#include -#include -#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/expressions/parse.c b/src/language/expressions/parse.c index b6c8076c..71543008 100644 --- a/src/language/expressions/parse.c +++ b/src/language/expressions/parse.c @@ -35,7 +35,6 @@ #include #include #include -#include /* Declarations. */ diff --git a/src/language/lexer/variable-parser.c b/src/language/lexer/variable-parser.c index 6475caf4..64792aaa 100644 --- a/src/language/lexer/variable-parser.c +++ b/src/language/lexer/variable-parser.c @@ -25,7 +25,7 @@ #include "lexer.h" #include -#include +#include #include #include #include diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c index e51a5a6a..aa289716 100644 --- a/src/language/stats/aggregate.c +++ b/src/language/stats/aggregate.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -44,7 +44,6 @@ #include #include #include -#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/autorecode.c b/src/language/stats/autorecode.c index a4177be8..e808359b 100644 --- a/src/language/stats/autorecode.c +++ b/src/language/stats/autorecode.c @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -33,7 +34,6 @@ #include #include #include -#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/correlations.q b/src/language/stats/correlations.q index 68d55635..594a5387 100644 --- a/src/language/stats/correlations.q +++ b/src/language/stats/correlations.q @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/language/stats/crosstabs.q b/src/language/stats/crosstabs.q index 8f1e42b4..55c92d8c 100644 --- a/src/language/stats/crosstabs.q +++ b/src/language/stats/crosstabs.q @@ -30,29 +30,31 @@ */ #include -#include + #include +#include #include #include -#include -#include -#include + #include #include -#include -#include +#include +#include +#include #include -#include #include -#include +#include +#include +#include +#include #include +#include +#include #include -#include +#include #include +#include #include -#include -#include -#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c index b7237148..4c5b7ff0 100644 --- a/src/language/stats/descriptives.c +++ b/src/language/stats/descriptives.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -40,7 +41,6 @@ #include #include #include -#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/examine.q b/src/language/stats/examine.q index 4f8e45de..bf2c3fd1 100644 --- a/src/language/stats/examine.q +++ b/src/language/stats/examine.q @@ -19,33 +19,35 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include + #include #include +#include #include #include -#include -#include -#include + #include +#include #include +#include +#include +#include #include -#include #include -#include +#include +#include +#include #include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include #include #include #include #include #include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/flip.c b/src/language/stats/flip.c index 02c764b5..3aed8323 100644 --- a/src/language/stats/flip.c +++ b/src/language/stats/flip.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include @@ -45,7 +45,6 @@ #include #include #include -#include #include "intprops.h" diff --git a/src/language/stats/frequencies.q b/src/language/stats/frequencies.q index 5de38ad5..db480bce 100644 --- a/src/language/stats/frequencies.q +++ b/src/language/stats/frequencies.q @@ -24,37 +24,38 @@ */ #include -#include + #include #include #include -#include -#include #include -#include #include -#include -#include +#include +#include +#include +#include #include #include -#include -#include +#include #include +#include +#include +#include #include +#include +#include #include -#include -#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include #include +#include #include -#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/means.q b/src/language/stats/means.q index 7fc176f7..a1aa7229 100644 --- a/src/language/stats/means.q +++ b/src/language/stats/means.q @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/language/stats/oneway.q b/src/language/stats/oneway.q index 2ef2d486..ab221e03 100644 --- a/src/language/stats/oneway.q +++ b/src/language/stats/oneway.q @@ -19,32 +19,33 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include + #include -#include +#include #include #include -#include -#include -#include + #include +#include #include +#include +#include +#include #include -#include #include -#include +#include +#include +#include #include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include #include #include #include - +#include +#include #include "sort-criteria.h" #include "gettext.h" diff --git a/src/language/stats/rank.q b/src/language/stats/rank.q index d3ac8edd..2022aaaf 100644 --- a/src/language/stats/rank.q +++ b/src/language/stats/rank.q @@ -21,8 +21,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA #include #include "sort-criteria.h" + #include -#include +#include #include #include #include diff --git a/src/language/stats/regression.q b/src/language/stats/regression.q index b5dabb15..d79007ac 100644 --- a/src/language/stats/regression.q +++ b/src/language/stats/regression.q @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -45,7 +46,6 @@ #include #include #include -#include #include "gettext.h" diff --git a/src/language/stats/sort-cases.c b/src/language/stats/sort-cases.c index 156c5b42..f50b67fe 100644 --- a/src/language/stats/sort-cases.c +++ b/src/language/stats/sort-cases.c @@ -24,7 +24,7 @@ #include #include "sort-criteria.h" -#include +#include #include #include #include diff --git a/src/language/stats/t-test.q b/src/language/stats/t-test.q index 4754b211..6d3f4ba2 100644 --- a/src/language/stats/t-test.q +++ b/src/language/stats/t-test.q @@ -20,31 +20,34 @@ 02110-1301, USA. */ #include + #include -#include +#include #include #include -#include -#include + #include #include +#include +#include +#include +#include #include +#include +#include #include -#include -#include -#include #include -#include -#include #include +#include +#include #include -#include "size_max.h" -#include #include +#include +#include +#include #include -#include -#include -#include + +#include "size_max.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q index 2ad52b77..a230c7d5 100644 --- a/src/language/utilities/set.q +++ b/src/language/utilities/set.q @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/language/utilities/title.c b/src/language/utilities/title.c index d494e35e..9fa1309d 100644 --- a/src/language/utilities/title.c +++ b/src/language/utilities/title.c @@ -18,18 +18,20 @@ 02110-1301, USA. */ #include + #include #include -#include -#include + #include -#include +#include +#include +#include #include -#include +#include +#include #include -#include #include -#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/xforms/compute.c b/src/language/xforms/compute.c index 0a399285..0bc6e4d3 100644 --- a/src/language/xforms/compute.c +++ b/src/language/xforms/compute.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/language/xforms/count.c b/src/language/xforms/count.c index a8a208b3..8673c6de 100644 --- a/src/language/xforms/count.c +++ b/src/language/xforms/count.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/language/xforms/recode.c b/src/language/xforms/recode.c index c9cb2039..09eafb6a 100644 --- a/src/language/xforms/recode.c +++ b/src/language/xforms/recode.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/language/xforms/sample.c b/src/language/xforms/sample.c index 830c981e..41b47f86 100644 --- a/src/language/xforms/sample.c +++ b/src/language/xforms/sample.c @@ -24,6 +24,7 @@ #include #include +#include #include #include #include @@ -32,7 +33,6 @@ #include #include #include -#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/xforms/select-if.c b/src/language/xforms/select-if.c index f6be43c2..4666f52d 100644 --- a/src/language/xforms/select-if.c +++ b/src/language/xforms/select-if.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/math/levene.c b/src/math/levene.c index 7a034621..86a32e7a 100644 --- a/src/math/levene.c +++ b/src/math/levene.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include "group.h" diff --git a/src/math/sort.c b/src/math/sort.c index 8ce95538..1d2257b2 100644 --- a/src/math/sort.c +++ b/src/math/sort.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -40,7 +41,6 @@ #include #include #include -#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/ui/terminal/ChangeLog b/src/ui/terminal/ChangeLog index 330d94ab..f86d6c8c 100644 --- a/src/ui/terminal/ChangeLog +++ b/src/ui/terminal/ChangeLog @@ -1,3 +1,14 @@ +Thu May 4 21:50:59 2006 Ben Pfaff + + Continue reforming procedure execution. In this phase, move + procedure.c and procedure.h from src to src/data. Update + makefiles and #includes accordingly. + + * automake.mk: (src_ui_terminal_pspp_SOURCES) Remove + src/procedure.c and src/procedure.h. + (src_ui_terminal_pspp_LDADD) Move libexpressions.a later in list + to make the link work. + Wed May 3 23:09:37 2006 Ben Pfaff Continue reforming procedure execution. In this phase, get rid of diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk index c1377146..105a6b26 100644 --- a/src/ui/terminal/automake.mk +++ b/src/ui/terminal/automake.mk @@ -14,17 +14,15 @@ src_ui_terminal_libui_a_SOURCES = \ bin_PROGRAMS += src/ui/terminal/pspp -src_ui_terminal_pspp_SOURCES = \ - src/procedure.c \ - src/procedure.h +src_ui_terminal_pspp_SOURCES = src_ui_terminal_pspp_LDADD = \ $(top_builddir)/src/ui/terminal/libui.a \ - $(top_builddir)/src/language/expressions/libexpressions.a \ $(top_builddir)/src/language/liblanguage.a \ $(top_builddir)/src/language/tests/libtests.a \ $(top_builddir)/src/language/utilities/libutilities.a \ $(top_builddir)/src/language/control/libcontrol.a \ + $(top_builddir)/src/language/expressions/libexpressions.a \ $(top_builddir)/src/language/stats/libstats.a \ $(top_builddir)/src/language/xforms/libxforms.a \ $(top_builddir)/src/language/dictionary/libcmddict.a \ diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index 7560dcfe..e19dd0c7 100644 --- a/src/ui/terminal/main.c +++ b/src/ui/terminal/main.c @@ -25,12 +25,12 @@ #include "command-line.h" #include "msg-ui.h" #include "progname.h" -#include "procedure.h" #include "read-line.h" #include #include #include +#include #include #include #include @@ -42,7 +42,6 @@ #include #include #include -#include #if HAVE_FPU_CONTROL_H #include -- 2.30.2