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 /utils | |
| 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 'utils')
| -rw-r--r-- | utils/ChangeLog | 11 | ||||
| -rw-r--r-- | utils/Makefile | 15 |
2 files changed, 26 insertions, 0 deletions
diff --git a/utils/ChangeLog b/utils/ChangeLog index fb5a8db9..be04d8f2 100644 --- a/utils/ChangeLog +++ b/utils/ChangeLog @@ -1,3 +1,14 @@ +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. + 2002-08-18 Roland McGrath <roland@frob.com> * fakeroot.sh: Dont use "exec" command, since the original script diff --git a/utils/Makefile b/utils/Makefile index 06ef9bf2..3b2c12d7 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -18,6 +18,8 @@ dir := utils makemode := utilities +include ../config.make + targets = shd ps settrans showtrans syncfs fsysopts \ storeinfo login w uptime ids loginpr sush vmstat portinfo \ devprobe vminfo addauth rmauth unsu setauth ftpcp ftpdir storecat \ @@ -31,8 +33,16 @@ SRCS = shd.c ps.c settrans.c syncfs.c showtrans.c addauth.c rmauth.c \ rpctrace.c mount.c gcore.c fakeauth.c fakeroot.sh LCLHDRS = psout.h parse.h pids.h frobauth.h +ifneq ($(LIBNCURSESW),) +targets += console-ncurses +SRCS += console-ncurses.c +endif + OBJS = $(filter-out %.sh,$(SRCS:.c=.o)) HURDLIBS = ps ihash store fshelp threads ports ftpconn shouldbeinlibc +ifneq ($(LIBNCURSESW),) +HURDLIBS += cons +endif login-LDLIBS = -lutil $(LIBCRYPT) addauth-LDLIBS = $(LIBCRYPT) setauth-LDLIBS = $(LIBCRYPT) @@ -75,6 +85,11 @@ fakeauth-CPPFLAGS = -I$(srcdir)/../auth authServer-CPPFLAGS = -I$(srcdir)/../auth auth_requestUser-CPPFLAGS = -I$(srcdir)/../auth +console-ncurses: ../libcons/libcons.a ../libports/libports.a \ + ../libthreads/libthreads.a +console-ncurses-CPPFLAGS = $(NCURSESW_INCLUDE) +console-ncurses-LDLIBS = $(LIBNCURSESW) + mount: ../sutils/fstab.o ../sutils/clookup.o \ $(foreach L,fshelp ports,../lib$L/lib$L.a) ../sutils/fstab.o ../sutils/clookup.o: FORCE |