Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ppp: Cleanup Jamfiles.

Browse Source
This commit is contained in:
Augustin Cavalier 2017-04-25 14:29:48 -04:00
parent 5d614ec377
commit bf1bf4e9d4
9 changed files with 12 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/add-ons/kernel/network/ppp/ipcp/Jamfile
View File

@ -3,15 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel network ppp ipcp ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
SubDirC++Flags -fno-rtti ; 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 ; UsePrivateKernelHeaders ;
UsePrivateHeaders net ; UsePrivateHeaders net ;

5
src/add-ons/kernel/network/ppp/modem/Jamfile
View File

@ -3,13 +3,10 @@ SubDir HAIKU_TOP src add-ons kernel network ppp modem ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
SubDirC++Flags -fno-rtti ; SubDirC++Flags -fno-rtti ;
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
# for kernel_cpp.h and BLocker
UsePrivateKernelHeaders ; UsePrivateKernelHeaders ;
UsePrivateHeaders net ; UsePrivateHeaders net ;
UsePrivateHeaders [ FDirName kernel ] ;
UsePrivateHeaders [ FDirName kernel util ] ; UsePrivateHeaders [ FDirName kernel util ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared
libkernelppp headers ] : true ; libkernelppp headers ] : true ;

6
src/add-ons/kernel/network/ppp/pap/Jamfile
View File

@ -3,12 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel network ppp pap ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
SubDirC++Flags -fno-rtti ; 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 ; UsePrivateKernelHeaders ;
UsePrivateHeaders net ; UsePrivateHeaders net ;
UsePrivateHeaders [ FDirName kernel ] ; UsePrivateHeaders [ FDirName kernel ] ;

8
src/add-ons/kernel/network/ppp/ppp/Jamfile
View File

@ -3,14 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel network ppp ppp ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
SubDirC++Flags -fno-rtti ; SubDirC++Flags -fno-rtti ;
if $(TARGET_PLATFORM) != haiku {
UseHeaders [ FStandardOSHeaders ] : true ;
# Needed for <support/Errors.h> 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 ; UsePrivateKernelHeaders ;
UsePrivateHeaders net ; UsePrivateHeaders net ;
UsePrivateHeaders [ FDirName kernel util ] ; UsePrivateHeaders [ FDirName kernel util ] ;

7
src/add-ons/kernel/network/ppp/ppp_frame/Jamfile
View File

@ -3,13 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel network ppp ppp_frame ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
SubDirC++Flags -fno-rtti ; 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 ; UsePrivateKernelHeaders ;
UsePrivateHeaders kernel net ; UsePrivateHeaders kernel net ;
UsePrivateHeaders [ FDirName kernel util ] ; UsePrivateHeaders [ FDirName kernel util ] ;

8
src/add-ons/kernel/network/ppp/ppp_manager/Jamfile
View File

@ -3,15 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel network ppp ppp_manager ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
SubDirC++Flags -fno-rtti ; 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 ; UsePrivateKernelHeaders ;
# UsePrivateHeaders net ;
UsePrivateHeaders kernel net ; UsePrivateHeaders kernel net ;
UsePrivateHeaders [ FDirName kernel ] ; UsePrivateHeaders [ FDirName kernel ] ;

6
src/add-ons/kernel/network/ppp/pppoe/Jamfile
View File

@ -3,12 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel network ppp pppoe ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
SubDirC++Flags -fno-rtti ; 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 ; UsePrivateKernelHeaders ;
UsePrivateHeaders net ; UsePrivateHeaders net ;
UsePrivateHeaders [ FDirName kernel ] ; UsePrivateHeaders [ FDirName kernel ] ;

18
src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile
View File

@ -1,14 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel network ppp shared libkernelppp ; SubDir HAIKU_TOP src add-ons kernel network ppp shared libkernelppp ;
SetSubDirSupportedPlatformsBeOSCompatible ; 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 ; UsePrivateKernelHeaders ;
UsePrivateHeaders net ; UsePrivateHeaders net ;
@ -19,14 +12,9 @@ UsePrivateHeaders [ FDirName kernel util ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared
libkernelppp headers ] : true ; libkernelppp headers ] : true ;
{
SubDirC++Flags -fno-rtti ;
}
KernelStaticLibrary libkernelppp.a : KernelStaticLibrary libkernelppp.a :
kernel_cpp.cpp kernel_cpp.cpp
KPPPConfigurePacket.cpp KPPPConfigurePacket.cpp
KPPPDevice.cpp KPPPDevice.cpp
KPPPInterface.cpp KPPPInterface.cpp
@ -39,7 +27,7 @@ KernelStaticLibrary libkernelppp.a :
KPPPStateMachine.cpp KPPPStateMachine.cpp
KPPPUtils.cpp KPPPUtils.cpp
settings_tools.cpp settings_tools.cpp
# integrated modules # integrated modules
_KPPPMRUHandler.cpp _KPPPMRUHandler.cpp
_KPPPAuthenticationHandler.cpp _KPPPAuthenticationHandler.cpp

21
src/add-ons/kernel/network/ppp/shared/libppp/Jamfile
View File

@ -2,14 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel network ppp shared libppp ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
if $(TARGET_PLATFORM) != haiku {
UseHeaders [ FStandardOSHeaders ] : true ;
# Needed for <support/Errors.h> 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 ; UsePrivateKernelHeaders ;
UsePrivateHeaders net ; UsePrivateHeaders net ;
UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libppp 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 UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared
libkernelppp headers ] : true ; libkernelppp headers ] : true ;
StaticLibrary libppp.a : StaticLibrary libppp.a :
strlcat.c strlcat.c
driver_settings.cpp driver_settings.cpp
@ -31,7 +22,11 @@ StaticLibrary libppp.a :
: libnetwork.so libbnetapi.so : libnetwork.so libbnetapi.so
; ;
SEARCH on [ FGristFiles strlcat.c ] = [ FDirName $(HAIKU_TOP) src system libroot posix string ] ; SEARCH on [ FGristFiles strlcat.c ] = [ FDirName $(HAIKU_TOP) src system
SEARCH on [ FGristFiles driver_settings.cpp ] = [ FDirName $(HAIKU_TOP) src system libroot os ] ; libroot posix string ] ;
SEARCH on [ FGristFiles settings_tools.cpp ] = [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp ] ; SEARCH on [ FGristFiles driver_settings.cpp ] = [ FDirName $(HAIKU_TOP) src
SEARCH on [ FGristFiles KPPPUtils.cpp ] = [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp ] ; 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 ] ;