2008-12-08 Thomas Schwinge <tschwinge@gnu.org>

	* Makefile: Rework, so that dependency tracking is done for all files.

	* Makefile (HURDLIBS): Add ihash and shouldbeinlibc.

2 files changed, 35 insertions, 15 deletions

diff --git a/console-client/ChangeLog b/console-client/ChangeLog
index cf2d16c9..b65ab761 100644
--- a/console-client/ChangeLog
+++ b/console-client/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-08  Thomas Schwinge  <tschwinge@gnu.org>
+
+	* Makefile: Rework, so that dependency tracking is done for all files.
+
+	* Makefile (HURDLIBS): Add ihash and shouldbeinlibc.
+
 2007-11-13  Thomas Schwinge  <tschwinge@gnu.org>
 
 	* trans.c (netfs_attempt_utimes): Adapt to ``struct stat'' changes.
diff --git a/console-client/Makefile b/console-client/Makefile
index ff1a8f29..bf1335b0 100644
--- a/console-client/Makefile
+++ b/console-client/Makefile
@@ -1,5 +1,6 @@
 #
-#   Copyright (C) 1994,95,96,97,98,99,2000,01,02,04,2005 Free Software Foundation, Inc.
+#   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004,
+#   2005, 2008 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or
 #   modify it under the terms of the GNU General Public License as
@@ -16,16 +17,28 @@
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 dir := console-client
-makemode := utility
-
-target = console
-SRCS = console.c timer.c driver.c trans.c
+makemode := utilities
+
+targets = console
+CONSOLE_SRCS = console.c timer.c driver.c trans.c
+VGA_SO_SRCS = bdf.c vga-dynafont.c vga-dynacolor.c vga-support.c vga.c
+#PC_KBD_SO_SRCS = pc-kbd.c kdioctlServer.o kbd-repeat.c
+PC_KBD_SO_SRCS = pc-kbd.c kdioctlServer.c kbd-repeat.c
+PC_MOUSE_SO_SRCS = pc-mouse.c
+GENERIC_SPEAKER_SO_SRCS = generic-speaker.c
+CURRENT_VCS_SO_SRCS = current-vcs.c
+ifneq ($(LIBNCURSESW),)
+NCURSESW_SO_SRCS = ncursesw.c
+endif
+SRCS = $(CONSOLE_SRCS) \
+  $(VGA_SO_SRCS) $(PC_KBD_SO_SRCS) $(PC_MOUSE_SO_SRCS) \
+  $(GENERIC_SPEAKER_SO_SRCS) $(CURRENT_VCS_SO_SRCS) $(NCURSESW_SO_SRCS)
 LCLHDRS = timer.h driver.h display.h input.h bell.h \
 	  unicode.h bdf.h mach-inputdev.h \
 	  vga-dynafont.h vga-dynacolor.h vga-hw.h vga.h
 
-OBJS = $(filter-out %.sh,$(SRCS:.c=.o))
-HURDLIBS = cons threads ports netfs fshelp iohelp
+OBJS = $(SRCS:.c=.o)
+HURDLIBS = cons threads ports netfs fshelp iohelp ihash shouldbeinlibc
 LDLIBS = -ldl
 module-dir = $(libdir)/hurd/console
 console-LDFLAGS = -Wl,-E
@@ -38,22 +51,23 @@ include ../Makeconf
 driver-CPPFLAGS = -D'CONSOLE_DEFPATH="$(module-dir)\0"' \
 	-D'CONSOLE_SONAME_SUFFIX=".so.$(hurd-version)"'
 
-console: ../libcons/libcons.a ../libports/libports.a \
+console: $(CONSOLE_SRCS:.c=.o) \
+	../libnetfs/libnetfs.a ../libfshelp/libfshelp.a \
+	../libcons/libcons.a ../libports/libports.a \
 	../libthreads/libthreads.a ../libshouldbeinlibc/libshouldbeinlibc.a
 
 modules = vga pc_kbd generic_speaker pc_mouse current_vcs
 
 vga-CPPFLAGS = -DDEFAULT_VGA_FONT_DIR=\"${datadir}/hurd/\"
-vga.so.$(hurd-version): $(patsubst %.c,%_pic.o,bdf.c vga-dynafont.c \
-	vga-dynacolor.c vga-support.c vga.c)
-pc_kbd.so.$(hurd-version): $(patsubst %.c,%_pic.o,pc-kbd.c kdioctlServer.o kbd-repeat.c)
-pc_mouse.so.$(hurd-version): $(patsubst %.c,%_pic.o,pc-mouse.c)
-generic_speaker.so.$(hurd-version): $(patsubst %.c,%_pic.o,generic-speaker.c)
-current_vcs.so.$(hurd-version): $(patsubst %.c,%_pic.o,current-vcs.c)
+vga.so.$(hurd-version): $(patsubst %.c,%_pic.o,$(VGA_SO_SRCS))
+pc_kbd.so.$(hurd-version): $(patsubst %.c,%_pic.o,$(PC_KBD_SO_SRCS))
+pc_mouse.so.$(hurd-version): $(patsubst %.c,%_pic.o,$(PC_MOUSE_SO_SRCS))
+generic_speaker.so.$(hurd-version): $(patsubst %.c,%_pic.o,$(GENERIC_SPEAKER_SO_SRCS))
+current_vcs.so.$(hurd-version): $(patsubst %.c,%_pic.o,$(CURRENT_VCS_SO_SRCS))
 
 ifneq ($(LIBNCURSESW),)
 modules += ncursesw
-ncursesw.so.$(hurd-version): $(patsubst %.c,%_pic.o,ncursesw.c)
+ncursesw.so.$(hurd-version): $(patsubst %.c,%_pic.o,$(NCURSESW_SO_SRCS))
 ncursesw-CPPFLAGS = $(NCURSESW_INCLUDE)
 ncursesw-LDLIBS = $(LIBNCURSESW)
 endif