diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-07-17 15:49:43 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2010-08-01 18:56:32 +0200 |
| commit | 10366248b495bfeada3326e91c52e8ea8ca619a1 (patch) | |
| tree | 59ea6a8d65d341de68c17d5ffe58c4a9c457695b /console-client/Makefile | |
| parent | 7bc48f78b22223736f5d0cc313fef82fa5303314 (diff) | |
Fix "make dist" in `console-client'.
This patch updates the list of headers to be included in the
distribution, and makes it so that `kdioctlServer.c' isn't built and
distributed by "make dist".
* console-client/Makefile (PC_KBD_SO_SRCS): Remove `kdioctlServer.c'.
(LCLHDRS): Remove `vga.h', add `vga-support.h' and `trans.h'.
(OBJS): Add `kdioctlServer.o'.
(pc_kbd.so.$(hurd-version)): Add dependency on `kdioctlServer_pic.o'.
Diffstat (limited to 'console-client/Makefile')
| -rw-r--r-- | console-client/Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/console-client/Makefile b/console-client/Makefile index bf1335b0..22a492a9 100644 --- a/console-client/Makefile +++ b/console-client/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, -# 2005, 2008 Free Software Foundation, Inc. +# 2005, 2008, 2010 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 @@ -22,8 +22,7 @@ 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_KBD_SO_SRCS = pc-kbd.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 @@ -35,9 +34,10 @@ SRCS = $(CONSOLE_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 + vga-dynafont.h vga-dynacolor.h vga-hw.h vga-support.h \ + trans.h -OBJS = $(SRCS:.c=.o) +OBJS = $(SRCS:.c=.o) kdioctlServer.o HURDLIBS = cons threads ports netfs fshelp iohelp ihash shouldbeinlibc LDLIBS = -ldl module-dir = $(libdir)/hurd/console @@ -60,7 +60,8 @@ 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,$(VGA_SO_SRCS)) -pc_kbd.so.$(hurd-version): $(patsubst %.c,%_pic.o,$(PC_KBD_SO_SRCS)) +pc_kbd.so.$(hurd-version): $(patsubst %.c,%_pic.o,$(PC_KBD_SO_SRCS)) \ + kdioctlServer_pic.o 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)) |