From a0952d1cb35c043530d850e3e90e573993db1582 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 18 Dec 2014 13:49:14 +0100 Subject: [PATCH] Add the ncurses headers dependency where needed. Should fix the build for real. --- src/bin/gdb/gdb/Jamfile | 3 +++ src/bin/network/telnet/Jamfile | 10 +++++++++- src/bin/network/telnetd/Jamfile | 10 +++++++++- src/libs/edit/Jamfile | 10 +++++++++- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/bin/gdb/gdb/Jamfile b/src/bin/gdb/gdb/Jamfile index 3c7f824e09..492924fc14 100644 --- a/src/bin/gdb/gdb/Jamfile +++ b/src/bin/gdb/gdb/Jamfile @@ -272,6 +272,9 @@ local gdbAllSources = gdb.c ; +Includes [ FGristFiles $(gdbAllSources) ] + : [ BuildFeatureAttribute ncurses : headers ] ; + # build the static library StaticLibrary libgdb.a : $(gdbAllLibSources) diff --git a/src/bin/network/telnet/Jamfile b/src/bin/network/telnet/Jamfile index 1b83204a61..c1a31fd514 100644 --- a/src/bin/network/telnet/Jamfile +++ b/src/bin/network/telnet/Jamfile @@ -11,7 +11,7 @@ local defines = [ FDefines USE_TERMIO=1 OLD_ENVIRON=1 ENV_HACK=1 ] ; SubDirCcFlags $(defines) ; SubDirC++Flags $(defines) ; -BinCommand telnet : +local sources = authenc.c commands.c main.c @@ -21,6 +21,14 @@ BinCommand telnet : telnet.c terminal.c utilities.c +; + +Includes [ FGristFiles $(sources) ] + : [ BuildFeatureAttribute ncurses : headers ] ; + + +BinCommand telnet : + $(sources) : [ BuildFeatureAttribute ncurses : library ] libtelnet.a libutil.a libbsd.so $(TARGET_NETWORK_LIBS) ; diff --git a/src/bin/network/telnetd/Jamfile b/src/bin/network/telnetd/Jamfile index 2f46cb94c6..2faf3facac 100644 --- a/src/bin/network/telnetd/Jamfile +++ b/src/bin/network/telnetd/Jamfile @@ -10,7 +10,7 @@ local defines = [ FDefines USE_TERMIO=1 ] ; SubDirCcFlags $(defines) ; SubDirC++Flags $(defines) ; -BinCommand telnetd : +local sources = authenc.c global.c slc.c @@ -19,6 +19,14 @@ BinCommand telnetd : telnetd.c termstat.c utility.c +; + +Includes [ FGristFiles $(sources) ] + : [ BuildFeatureAttribute ncurses : headers ] ; + + +BinCommand telnetd : + $(sources) : [ BuildFeatureAttribute ncurses : library ] libtelnet.a libutil.a libbsd.so $(TARGET_NETWORK_LIBS) ; diff --git a/src/libs/edit/Jamfile b/src/libs/edit/Jamfile index 0650210877..3b52eec49c 100644 --- a/src/libs/edit/Jamfile +++ b/src/libs/edit/Jamfile @@ -9,7 +9,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers libs ncurses ] : true ; local defines = [ FDefines SCCSID=0 ] ; SubDirCcFlags $(defines) ; -StaticLibrary libedit.a : +local sources = chared.c common.c el.c @@ -32,3 +32,11 @@ StaticLibrary libedit.a : vi.c ; +Includes [ FGristFiles $(sources) ] + : [ BuildFeatureAttribute ncurses : headers ] ; + + +StaticLibrary libedit.a : + $(sources) +; +