diff options
| author | Marek Benc <merkur32@gmail.com> | 2014-07-17 22:10:16 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-07-17 22:10:16 +0200 |
| commit | c025e6a9881527d5b0e5b2398278410fb4e42138 (patch) | |
| tree | 01be266b52b1b1e93e7f26c260d202506b6d4d24 | |
| parent | 2588cd19e83ff454a7fc99e68f1d612945504b72 (diff) | |
Make the ncursesw driver of the console client compile properly
* console-client/Makefile (NCURSESW_SO_SRCS): Move definition to after
inclusion of Makeconf.
| -rw-r--r-- | console-client/Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/console-client/Makefile b/console-client/Makefile index f576cbeb..03dad1f0 100644 --- a/console-client/Makefile +++ b/console-client/Makefile @@ -26,13 +26,9 @@ 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 -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) \ - $(XKB_SRCS) + $(GENERIC_SPEAKER_SO_SRCS) $(CURRENT_VCS_SO_SRCS) $(XKB_SRCS) VPATH += $(srcdir)/xkb OBJS = $(addsuffix .o,$(basename $(notdir $(SRCS)))) kdioctlServer.o @@ -71,6 +67,8 @@ generic_speaker.so.$(hurd-version): $(patsubst %.c,%_pic.o,$(GENERIC_SPEAKER_SO_ current_vcs.so.$(hurd-version): $(patsubst %.c,%_pic.o,$(CURRENT_VCS_SO_SRCS)) ifneq ($(LIBNCURSESW),) +NCURSESW_SO_SRCS = ncursesw.c +SRCS += $(NCURSESW_SO_SRCS) modules += ncursesw ncursesw.so.$(hurd-version): $(patsubst %.c,%_pic.o,$(NCURSESW_SO_SRCS)) ncursesw-CPPFLAGS = $(NCURSESW_INCLUDE) |