From a9087159cabb92b7328be67d35d43ae95ccc25b9 Mon Sep 17 00:00:00 2001 From: Waldemar Kornewald Date: Fri, 6 Feb 2004 18:05:51 +0000 Subject: [PATCH] Removed libkernelppp source directory from headers because settings_tools.h is now in the headers folder. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6509 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile | 1 - src/tests/add-ons/kernel/network/ppp/modem/Jamfile | 2 +- src/tests/add-ons/kernel/network/ppp/pap/Jamfile | 1 - src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile | 1 - .../add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile | 5 +++-- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile b/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile index 5fb5d1f932..a272e6f3bf 100644 --- a/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile @@ -2,7 +2,6 @@ SubDir OBOS_TOP src tests add-ons kernel network ppp ipcp ; UsePrivateHeaders net ; UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ; -UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp ] ; SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network ppp ipcp ] ; diff --git a/src/tests/add-ons/kernel/network/ppp/modem/Jamfile b/src/tests/add-ons/kernel/network/ppp/modem/Jamfile index 6d0873f1fc..654403f0a5 100644 --- a/src/tests/add-ons/kernel/network/ppp/modem/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/modem/Jamfile @@ -2,10 +2,10 @@ SubDir OBOS_TOP src tests add-ons kernel network ppp modem ; UsePrivateHeaders net ; UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ; -UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp ] ; SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network ppp modem ] ; + Addon modem : userland obos_network ppp : modem.cpp ModemDevice.cpp diff --git a/src/tests/add-ons/kernel/network/ppp/pap/Jamfile b/src/tests/add-ons/kernel/network/ppp/pap/Jamfile index 05db8118d2..aa8ecbaf6f 100644 --- a/src/tests/add-ons/kernel/network/ppp/pap/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/pap/Jamfile @@ -2,7 +2,6 @@ SubDir OBOS_TOP src tests add-ons kernel network ppp pap ; UsePrivateHeaders net ; UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ; -UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp ] ; SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network ppp pap ] ; diff --git a/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile b/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile index 0d7cdec0c9..d6a1df60ab 100644 --- a/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile @@ -2,7 +2,6 @@ SubDir OBOS_TOP src tests add-ons kernel network ppp pppoe ; UsePrivateHeaders net ; UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ; -UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp ] ; SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network ppp pppoe ] ; diff --git a/src/tests/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile b/src/tests/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile index 358432ab05..8373ac79cd 100644 --- a/src/tests/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile @@ -2,6 +2,7 @@ SubDir OBOS_TOP src tests add-ons kernel network ppp shared libkernelppp ; UsePrivateHeaders net ; UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ; +UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp ] ; SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp ] ; @@ -27,9 +28,9 @@ StaticLibrary kernelppp : _KPPPPFCHandler.cpp # for driver_settings + strlcat.c driver_settings.c - _libppputils.cpp ; -SEARCH on [ FGristFiles _libppputils.cpp ] = [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libppp ] ; +SEARCH on [ FGristFiles strlcat.c ] = [ FDirName $(OBOS_TOP) src kernel libroot posix string ] ; SEARCH on [ FGristFiles driver_settings.c ] = [ FDirName $(OBOS_TOP) src kernel libroot os ] ;