move BUrl to the support kit

It is used by the media kit, which created a dependency from libmedia to
libbnetapi to openssl.
It is not entirely specific to the network kit, there are some use cases
that don't involve network at all.
This commit is contained in:
Adrien Destugues
2016-12-29 16:38:53 +01:00
parent 05d0fc8ec3
commit 2c26ad4b39
8 changed files with 10 additions and 24 deletions
-2
View File
@@ -11,7 +11,6 @@ BuildPlatformSharedLibrary libbe_build.so :
<libbe_build>app_kit.o <libbe_build>app_kit.o
<libbe_build>icon_kit.o <libbe_build>icon_kit.o
<libbe_build>interface_kit.o <libbe_build>interface_kit.o
<libbe_build>network_kit.o
<libbe_build>storage_kit.o <libbe_build>storage_kit.o
<libbe_build>support_kit.o <libbe_build>support_kit.o
@@ -23,6 +22,5 @@ BuildPlatformSharedLibrary libbe_build.so :
SubInclude HAIKU_TOP src build libbe app ; SubInclude HAIKU_TOP src build libbe app ;
SubInclude HAIKU_TOP src build libbe icon ; SubInclude HAIKU_TOP src build libbe icon ;
SubInclude HAIKU_TOP src build libbe interface ; SubInclude HAIKU_TOP src build libbe interface ;
SubInclude HAIKU_TOP src build libbe network ;
SubInclude HAIKU_TOP src build libbe storage ; SubInclude HAIKU_TOP src build libbe storage ;
SubInclude HAIKU_TOP src build libbe support ; SubInclude HAIKU_TOP src build libbe support ;
-14
View File
@@ -1,14 +0,0 @@
SubDir HAIKU_TOP src build libbe network ;
UseHeaders [ FDirName $(HAIKU_TOP) headers os net ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) headers private shared ] : true ;
UsePrivateBuildHeaders app interface shared network ;
USES_BE_API on <libbe_build>network_kit.o = true ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits network libnetapi ] ;
BuildPlatformMergeObjectPIC <libbe_build>network_kit.o :
Url.cpp
;
+2
View File
@@ -1,6 +1,7 @@
SubDir HAIKU_TOP src build libbe support ; SubDir HAIKU_TOP src build libbe support ;
UsePrivateBuildHeaders app interface shared support ; UsePrivateBuildHeaders app interface shared support ;
UsePrivateObjectHeaders Url.cpp : locale ;
USES_BE_API on <libbe_build>support_kit.o = true ; USES_BE_API on <libbe_build>support_kit.o = true ;
@@ -22,5 +23,6 @@ BuildPlatformMergeObjectPIC <libbe_build>support_kit.o :
Referenceable.cpp Referenceable.cpp
String.cpp String.cpp
StringList.cpp StringList.cpp
Url.cpp
ZlibCompressionAlgorithm.cpp ZlibCompressionAlgorithm.cpp
; ;
+1 -1
View File
@@ -99,7 +99,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
StreamerPlugin.cpp StreamerPlugin.cpp
WriterPlugin.cpp WriterPlugin.cpp
: :
be localestub shared bnetapi be localestub shared
[ TargetLibsupc++ ] [ TargetLibstdc++ ] [ TargetLibsupc++ ] [ TargetLibstdc++ ]
; ;
} }
-6
View File
@@ -36,11 +36,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
SetupFeatureObjectsDir no-ssl ; SetupFeatureObjectsDir no-ssl ;
} }
# BUrl uses ICU to perform IDNA conversions (unicode domain names)
UseBuildFeatureHeaders icu ;
Includes [ FGristFiles Url.cpp ]
: [ BuildFeatureAttribute icu : headers ] ;
SharedLibrary [ MultiArchDefaultGristFiles libbnetapi.so ] : SharedLibrary [ MultiArchDefaultGristFiles libbnetapi.so ] :
init.cpp init.cpp
DynamicBuffer.cpp DynamicBuffer.cpp
@@ -91,7 +86,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
$(md5Sources) $(md5Sources)
NetworkRequest.cpp NetworkRequest.cpp
Url.cpp
UrlContext.cpp UrlContext.cpp
UrlProtocolAsynchronousListener.cpp UrlProtocolAsynchronousListener.cpp
UrlProtocolDispatchingListener.cpp UrlProtocolDispatchingListener.cpp
+7 -1
View File
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src kits support ;
SetSubDirSupportedPlatforms haiku libbe_test ; SetSubDirSupportedPlatforms haiku libbe_test ;
UsePrivateHeaders app interface media shared support ; UsePrivateHeaders app interface locale media shared support ;
local architectureObject ; local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] { for architectureObject in [ MultiArchSubDirSetup ] {
@@ -14,6 +14,11 @@ for architectureObject in [ MultiArchSubDirSetup ] {
Includes [ FGristFiles ZlibCompressionAlgorithm.cpp ] Includes [ FGristFiles ZlibCompressionAlgorithm.cpp ]
: [ BuildFeatureAttribute zlib : headers ] ; : [ BuildFeatureAttribute zlib : headers ] ;
# BUrl uses ICU to perform IDNA conversions (unicode domain names)
UseBuildFeatureHeaders icu ;
Includes [ FGristFiles Url.cpp ]
: [ BuildFeatureAttribute icu : headers ] ;
MergeObject <libbe!$(architecture)>support_kit.o : MergeObject <libbe!$(architecture)>support_kit.o :
Architecture.cpp Architecture.cpp
Archivable.cpp Archivable.cpp
@@ -38,6 +43,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
StopWatch.cpp StopWatch.cpp
String.cpp String.cpp
StringList.cpp StringList.cpp
Url.cpp
Uuid.cpp Uuid.cpp
ZlibCompressionAlgorithm.cpp ZlibCompressionAlgorithm.cpp
; ;