diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
| commit | 953c525d7589178629f3e91e4bf4ea805a92a5b4 (patch) | |
| tree | 9411cddbd2f213fe4edf2150e2e8b02a9d27b4bf /console-client | |
| parent | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (diff) | |
| parent | 5430151902aa7cb17458c0d71722a05fd379babf (diff) | |
Merge branch 'master' into xkb
Conflicts:
console-client/Makefile
Diffstat (limited to 'console-client')
| -rw-r--r-- | console-client/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/console-client/Makefile b/console-client/Makefile index 3139f9ea..a5c14ffe 100644 --- a/console-client/Makefile +++ b/console-client/Makefile @@ -33,11 +33,6 @@ 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) \ $(XKB_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-support.h \ - trans.h \ - xkb/xkb.h VPATH += $(srcdir)/xkb OBJS = $(addsuffix .o,$(basename $(notdir $(SRCS)))) kdioctlServer.o @@ -62,6 +57,7 @@ include ../Makeconf driver-CPPFLAGS = -D'CONSOLE_DEFPATH="$(module-dir)\0"' \ -D'CONSOLE_SONAME_SUFFIX=".so.$(hurd-version)"' +driver-DEPS = $(..)config.make console: $(CONSOLE_SRCS:.c=.o) \ ../libnetfs/libnetfs.a ../libfshelp/libfshelp.a \ |