From bf1bf4e9d462dcccd4fccbd464cc399dec357e58 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 25 Apr 2017 14:29:48 -0400 Subject: [PATCH] ppp: Cleanup Jamfiles. --- src/add-ons/kernel/network/ppp/ipcp/Jamfile | 9 -------- src/add-ons/kernel/network/ppp/modem/Jamfile | 5 +---- src/add-ons/kernel/network/ppp/pap/Jamfile | 6 ------ src/add-ons/kernel/network/ppp/ppp/Jamfile | 8 ------- .../kernel/network/ppp/ppp_frame/Jamfile | 7 ------- .../kernel/network/ppp/ppp_manager/Jamfile | 8 ------- src/add-ons/kernel/network/ppp/pppoe/Jamfile | 6 ------ .../network/ppp/shared/libkernelppp/Jamfile | 18 +++------------- .../kernel/network/ppp/shared/libppp/Jamfile | 21 +++++++------------ 9 files changed, 12 insertions(+), 76 deletions(-) diff --git a/src/add-ons/kernel/network/ppp/ipcp/Jamfile b/src/add-ons/kernel/network/ppp/ipcp/Jamfile index 7d9013b745..75701bcd7c 100644 --- a/src/add-ons/kernel/network/ppp/ipcp/Jamfile +++ b/src/add-ons/kernel/network/ppp/ipcp/Jamfile @@ -3,15 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel network ppp ipcp ; SetSubDirSupportedPlatformsBeOSCompatible ; SubDirC++Flags -fno-rtti ; -if $(TARGET_PLATFORM) != haiku { - UseHeaders [ FStandardOSHeaders ] : true ; - # Needed for the atomic_add64() prototype. -} - -UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; - # We need the public network headers also when not compiling for Haiku. - # Unfortunately we get more than we want, namely all POSIX headers. - UsePrivateKernelHeaders ; UsePrivateHeaders net ; diff --git a/src/add-ons/kernel/network/ppp/modem/Jamfile b/src/add-ons/kernel/network/ppp/modem/Jamfile index a583d4d9ea..0ffe709176 100644 --- a/src/add-ons/kernel/network/ppp/modem/Jamfile +++ b/src/add-ons/kernel/network/ppp/modem/Jamfile @@ -3,13 +3,10 @@ SubDir HAIKU_TOP src add-ons kernel network ppp modem ; SetSubDirSupportedPlatformsBeOSCompatible ; SubDirC++Flags -fno-rtti ; -UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; - -# for kernel_cpp.h and BLocker UsePrivateKernelHeaders ; UsePrivateHeaders net ; -UsePrivateHeaders [ FDirName kernel ] ; UsePrivateHeaders [ FDirName kernel util ] ; + UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] : true ; diff --git a/src/add-ons/kernel/network/ppp/pap/Jamfile b/src/add-ons/kernel/network/ppp/pap/Jamfile index 5c3a715094..a17238e18c 100644 --- a/src/add-ons/kernel/network/ppp/pap/Jamfile +++ b/src/add-ons/kernel/network/ppp/pap/Jamfile @@ -3,12 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel network ppp pap ; SetSubDirSupportedPlatformsBeOSCompatible ; SubDirC++Flags -fno-rtti ; -if $(TARGET_PLATFORM) != haiku { - UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; - # We need the public network headers also when not compiling for Haiku. - # Unfortunately we get more than we want, namely all POSIX headers. -} - UsePrivateKernelHeaders ; UsePrivateHeaders net ; UsePrivateHeaders [ FDirName kernel ] ; diff --git a/src/add-ons/kernel/network/ppp/ppp/Jamfile b/src/add-ons/kernel/network/ppp/ppp/Jamfile index 6c5b85fe61..38f4c48aa7 100644 --- a/src/add-ons/kernel/network/ppp/ppp/Jamfile +++ b/src/add-ons/kernel/network/ppp/ppp/Jamfile @@ -3,14 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel network ppp ppp ; SetSubDirSupportedPlatformsBeOSCompatible ; SubDirC++Flags -fno-rtti ; -if $(TARGET_PLATFORM) != haiku { - UseHeaders [ FStandardOSHeaders ] : true ; - # Needed for and maybe other stuff. - UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; - # We need the public network headers also when not compiling for Haiku. - # Unfortunately we get more than we want, namely all POSIX headers. -} - UsePrivateKernelHeaders ; UsePrivateHeaders net ; UsePrivateHeaders [ FDirName kernel util ] ; diff --git a/src/add-ons/kernel/network/ppp/ppp_frame/Jamfile b/src/add-ons/kernel/network/ppp/ppp_frame/Jamfile index 340bc36c11..310970c451 100644 --- a/src/add-ons/kernel/network/ppp/ppp_frame/Jamfile +++ b/src/add-ons/kernel/network/ppp/ppp_frame/Jamfile @@ -3,13 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel network ppp ppp_frame ; SetSubDirSupportedPlatformsBeOSCompatible ; SubDirC++Flags -fno-rtti ; -if $(TARGET_PLATFORM) != haiku { - UseHeaders [ FStandardOSHeaders ] : true ; - UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; - # We need the public network headers also when not compiling for Haiku. - # Unfortunately we get more than we want, namely all POSIX headers. -} - UsePrivateKernelHeaders ; UsePrivateHeaders kernel net ; UsePrivateHeaders [ FDirName kernel util ] ; diff --git a/src/add-ons/kernel/network/ppp/ppp_manager/Jamfile b/src/add-ons/kernel/network/ppp/ppp_manager/Jamfile index c351f73238..061bd49e8c 100644 --- a/src/add-ons/kernel/network/ppp/ppp_manager/Jamfile +++ b/src/add-ons/kernel/network/ppp/ppp_manager/Jamfile @@ -3,15 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel network ppp ppp_manager ; SetSubDirSupportedPlatformsBeOSCompatible ; SubDirC++Flags -fno-rtti ; -if $(TARGET_PLATFORM) != haiku { - UseHeaders [ FStandardOSHeaders ] : true ; - UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; - # We need the public network headers also when not compiling for Haiku. - # Unfortunately we get more than we want, namely all POSIX headers. -} - UsePrivateKernelHeaders ; - # UsePrivateHeaders net ; UsePrivateHeaders kernel net ; UsePrivateHeaders [ FDirName kernel ] ; diff --git a/src/add-ons/kernel/network/ppp/pppoe/Jamfile b/src/add-ons/kernel/network/ppp/pppoe/Jamfile index 8d942ef03d..d3a697f420 100644 --- a/src/add-ons/kernel/network/ppp/pppoe/Jamfile +++ b/src/add-ons/kernel/network/ppp/pppoe/Jamfile @@ -3,12 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel network ppp pppoe ; SetSubDirSupportedPlatformsBeOSCompatible ; SubDirC++Flags -fno-rtti ; -if $(TARGET_PLATFORM) != haiku { - UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; - # We need the public network headers also when not compiling for Haiku. - # Unfortunately we get more than we want, namely all POSIX headers. -} - UsePrivateKernelHeaders ; UsePrivateHeaders net ; UsePrivateHeaders [ FDirName kernel ] ; diff --git a/src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile b/src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile index eaee2cd16a..59715b38a3 100644 --- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile +++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile @@ -1,14 +1,7 @@ SubDir HAIKU_TOP src add-ons kernel network ppp shared libkernelppp ; SetSubDirSupportedPlatformsBeOSCompatible ; - -if $(TARGET_PLATFORM) != haiku { - UseHeaders [ FStandardOSHeaders ] : true ; - # Needed for the atomic_add64() prototype. :-/ - UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; - # We need the public network headers also when not compiling for Haiku. - # Unfortunately we get more than we want, namely all POSIX headers. -} +SubDirC++Flags -fno-rtti ; UsePrivateKernelHeaders ; UsePrivateHeaders net ; @@ -19,14 +12,9 @@ UsePrivateHeaders [ FDirName kernel util ] ; UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] : true ; -{ - SubDirC++Flags -fno-rtti ; -} - - KernelStaticLibrary libkernelppp.a : kernel_cpp.cpp - + KPPPConfigurePacket.cpp KPPPDevice.cpp KPPPInterface.cpp @@ -39,7 +27,7 @@ KernelStaticLibrary libkernelppp.a : KPPPStateMachine.cpp KPPPUtils.cpp settings_tools.cpp - + # integrated modules _KPPPMRUHandler.cpp _KPPPAuthenticationHandler.cpp diff --git a/src/add-ons/kernel/network/ppp/shared/libppp/Jamfile b/src/add-ons/kernel/network/ppp/shared/libppp/Jamfile index 1f720cdc88..c85cbab3f6 100644 --- a/src/add-ons/kernel/network/ppp/shared/libppp/Jamfile +++ b/src/add-ons/kernel/network/ppp/shared/libppp/Jamfile @@ -2,14 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel network ppp shared libppp ; SetSubDirSupportedPlatformsBeOSCompatible ; -if $(TARGET_PLATFORM) != haiku { - UseHeaders [ FStandardOSHeaders ] : true ; - # Needed for and maybe other stuff. - UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; - # We need the public network headers also when not compiling for Haiku. - # Unfortunately we get more than we want, namely all POSIX headers. -} - UsePrivateKernelHeaders ; UsePrivateHeaders net ; UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libppp @@ -17,7 +9,6 @@ UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libppp UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] : true ; - StaticLibrary libppp.a : strlcat.c driver_settings.cpp @@ -31,7 +22,11 @@ StaticLibrary libppp.a : : libnetwork.so libbnetapi.so ; -SEARCH on [ FGristFiles strlcat.c ] = [ FDirName $(HAIKU_TOP) src system libroot posix string ] ; -SEARCH on [ FGristFiles driver_settings.cpp ] = [ FDirName $(HAIKU_TOP) src system libroot os ] ; -SEARCH on [ FGristFiles settings_tools.cpp ] = [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp ] ; -SEARCH on [ FGristFiles KPPPUtils.cpp ] = [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp ] ; +SEARCH on [ FGristFiles strlcat.c ] = [ FDirName $(HAIKU_TOP) src system + libroot posix string ] ; +SEARCH on [ FGristFiles driver_settings.cpp ] = [ FDirName $(HAIKU_TOP) src + system libroot os ] ; +SEARCH on [ FGristFiles settings_tools.cpp ] = [ FDirName $(HAIKU_TOP) src + add-ons kernel network ppp shared libkernelppp ] ; +SEARCH on [ FGristFiles KPPPUtils.cpp ] = [ FDirName $(HAIKU_TOP) src add-ons + kernel network ppp shared libkernelppp ] ;