diff options
| author | Marcus Brinkmann <marcus@gnu.org> | 2002-08-22 21:25:04 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <marcus@gnu.org> | 2002-08-22 21:25:04 +0000 |
| commit | 7fdb626470facba99422511754f0e6be11c7f81c (patch) | |
| tree | c0629d437a4f3136b3a424762509d5e8d71a50d0 /console | |
| parent | a7b52d0087e0e533c0c7fe426ba33c799c3c87eb (diff) | |
2002-08-22 Marcus Brinkmann <marcus@gnu.org>
* aclocal.m4 (hurd_LIB_NCURSESW): New test, modified from GNU
inetutils 1.4.0.
* configure.in: Use hurd_LIB_NCURSESW.
* config.make.in (LIBNCURSESW): New variable, substituted by
configure.
(NCURSESW_INCLUDE): Likewise.
* Makefile (lib-subdirs): Add libcons.
(prog-subdirs): Add console.
console/
2002-08-22 Marcus Brinkmann <marcus@gnu.org>
* console.h: Move file to ../hurd/.
* Makefile (LCLHDRS): Remove console.h.
* display.c: Include <hurd/console.h> instead "console.h".
* console.c: Likewise.
hurd/
2002-08-22 Marcus Brinkmann <marcus@gnu.org>
* console.h: Move here from ../console/.
* Makefile (INSTHDRS): Add console.h.
utils/
2002-08-22 Marcus Brinkmann <marcus@gnu.org>
* Makefile: Include `../config.make' early on to get LIBNCURSESW
variable from configure before including Makeconf.
(targets) [LIBNCURSES]: Add console-ncurses.
(SRCS) [LIBNCURSES]: Add console-ncurses.c.
(HURDLIBS) [LIBNCURSES]: Add cons.
(console-ncurses): New target.
(console-ncurses-CPPFLAGS): New variable.
(console-ncurses-LDLIBS): Likewise.
Diffstat (limited to 'console')
| -rw-r--r-- | console/ChangeLog | 5 | ||||
| -rw-r--r-- | console/Makefile | 2 | ||||
| -rw-r--r-- | console/console.c | 4 | ||||
| -rw-r--r-- | console/display.c | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/console/ChangeLog b/console/ChangeLog index 146451b2..462e998e 100644 --- a/console/ChangeLog +++ b/console/ChangeLog @@ -1,5 +1,10 @@ 2002-08-22 Marcus Brinkmann <marcus@gnu.org> + * console.h: Move file to ../hurd/. + * Makefile (LCLHDRS): Remove console.h. + * display.c: Include <hurd/console.h> instead "console.h". + * console.c: Likewise. + * display.h: Add prototype for display_get_size. * display.c (display_get_size): New function. (nowait_file_changed): Update for new interfaces. diff --git a/console/Makefile b/console/Makefile index 434d80e6..a7d47b85 100644 --- a/console/Makefile +++ b/console/Makefile @@ -24,7 +24,7 @@ makemode := server target = console SRCS = console.c display.c input.c -LCLHDRS = console.h display.h input.h priv.h mutations.h +LCLHDRS = display.h input.h priv.h mutations.h MIGSTUBS = notifyServer.o tioctlServer.o fs_notifyUser.o diff --git a/console/console.c b/console/console.c index b493f64e..204937f6 100644 --- a/console/console.c +++ b/console/console.c @@ -37,11 +37,11 @@ #include <hurd/netfs.h> #include <hurd/ioctl_types.h> +/* We include console.h for the color numbers. */ +#include <hurd/console.h> #include "display.h" #include "input.h" -/* We include console.h for the color numbers. */ -#include "console.h" #include "fs_notify_U.h" diff --git a/console/display.c b/console/display.c index fb0a6b0f..9af13f77 100644 --- a/console/display.c +++ b/console/display.c @@ -37,12 +37,12 @@ #include <hurd.h> #include <hurd/pager.h> +#include <hurd/console.h> #ifndef __STDC_ISO_10646__ #error It is required that wchar_t is UCS-4. #endif -#include "console.h" #include "display.h" |