From 4d86bb87eedc899cdfe0df8f9f2367080db8c7cc Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 25 Apr 2006 18:11:08 +0000 Subject: [PATCH] Finish reforming error message support. In this phase, move message.c into libpspp. --- src/ChangeLog | 7 +++++++ src/libpspp/ChangeLog | 10 ++++++++++ src/libpspp/automake.mk | 1 + src/{ => libpspp}/message.c | 3 --- src/ui/gui/ChangeLog | 7 +++++++ src/ui/gui/automake.mk | 3 +-- src/ui/terminal/ChangeLog | 7 +++++++ src/ui/terminal/automake.mk | 1 - 8 files changed, 33 insertions(+), 6 deletions(-) rename src/{ => libpspp}/message.c (97%) diff --git a/src/ChangeLog b/src/ChangeLog index e656b93a..e4e5014f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +Tue Apr 25 11:06:49 2006 Ben Pfaff + + Finish reforming error message support. In this phase, move + message.c into libpspp. + + * message.c: Move to libpspp. + Tue Apr 25 10:47:37 2006 Ben Pfaff Continue reforming error message support. In this phase, drop diff --git a/src/libpspp/ChangeLog b/src/libpspp/ChangeLog index ce4acf90..b3c5b065 100644 --- a/src/libpspp/ChangeLog +++ b/src/libpspp/ChangeLog @@ -1,3 +1,13 @@ +Tue Apr 25 11:07:19 2006 Ben Pfaff + + Finish reforming error message support. In this phase, move + message.c into libpspp. + + * message.c: Move here from src/. Also remove a few unneeded + headers. + + * automake.mk (src_libpspp_libpspp_a_SOURCES): Add message.c. + Tue Apr 25 10:54:44 2006 Ben Pfaff Continue reforming error message support. In this phase, drop diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk index 4d796953..82fe0573 100644 --- a/src/libpspp/automake.mk +++ b/src/libpspp/automake.mk @@ -22,6 +22,7 @@ src_libpspp_libpspp_a_SOURCES = \ src/libpspp/misc.h \ src/libpspp/pool.c \ src/libpspp/pool.h \ + src/libpspp/message.c \ src/libpspp/message.h \ src/libpspp/start-date.c \ src/libpspp/start-date.h \ diff --git a/src/message.c b/src/libpspp/message.c similarity index 97% rename from src/message.c rename to src/libpspp/message.c index 27fe62d3..34ca65ce 100644 --- a/src/message.c +++ b/src/libpspp/message.c @@ -21,13 +21,10 @@ #include -#include #include #include #include -#include -#include #include #include diff --git a/src/ui/gui/ChangeLog b/src/ui/gui/ChangeLog index f4d3b0d2..7f87bbda 100644 --- a/src/ui/gui/ChangeLog +++ b/src/ui/gui/ChangeLog @@ -1,3 +1,10 @@ +Tue Apr 25 11:08:04 2006 Ben Pfaff + + Finish reforming error message support. In this phase, move + message.c into libpspp. + + * automake.mk: (src_ui_gui_psppire_SOURCES) Remove src/message.c. + Tue Apr 25 10:56:53 2006 Ben Pfaff Continue reforming error message support. In this phase, drop diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index f1dea453..5365451c 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -55,5 +55,4 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/var-sheet.c \ src/ui/gui/var-sheet.h \ src/ui/gui/var-type-dialog.c \ - src/ui/gui/var-type-dialog.h \ - src/message.c + src/ui/gui/var-type-dialog.h diff --git a/src/ui/terminal/ChangeLog b/src/ui/terminal/ChangeLog index fedd9e3f..a1efa112 100644 --- a/src/ui/terminal/ChangeLog +++ b/src/ui/terminal/ChangeLog @@ -1,3 +1,10 @@ +Tue Apr 25 11:08:17 2006 Ben Pfaff + + Finish reforming error message support. In this phase, move + message.c into libpspp. + + * automake.mk: Remove message.c from sources. + Tue Apr 25 10:58:19 2006 Ben Pfaff Continue reforming error message support. In this phase, drop diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk index 805cd6c2..cc33e32b 100644 --- a/src/ui/terminal/automake.mk +++ b/src/ui/terminal/automake.mk @@ -14,7 +14,6 @@ src_ui_terminal_libui_a_SOURCES = \ bin_PROGRAMS += src/ui/terminal/pspp src_ui_terminal_pspp_SOURCES = \ - src/message.c \ src/procedure.c \ src/procedure.h -- 2.30.2