From c025e6a9881527d5b0e5b2398278410fb4e42138 Mon Sep 17 00:00:00 2001 From: Marek Benc Date: Thu, 17 Jul 2014 22:10:16 +0200 Subject: Make the ncursesw driver of the console client compile properly * console-client/Makefile (NCURSESW_SO_SRCS): Move definition to after inclusion of Makeconf. --- console-client/Makefile | 8 +++----- 1 file 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) -- cgit v1.2.3