From Niels Sascha Reedijk <niels.reedijk@xxxxxxxxx>:
Niels Sascha Reedijk has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/3666 ;)
Change subject: libnetservices.a: create new static library for the network
services
......................................................................
libnetservices.a: create new static library for the network services
These will be added to the _devel packages so that other applications can link
to them.
---
M build/jam/packages/HaikuDevel
M build/jam/packages/HaikuDevelSecondary
M src/kits/network/libnetservices/Jamfile
3 files changed, 40 insertions(+), 31 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/66/3666/1
diff --git a/build/jam/packages/HaikuDevel b/build/jam/packages/HaikuDevel
index ebb86a9..f438f55 100644
--- a/build/jam/packages/HaikuDevel
+++ b/build/jam/packages/HaikuDevel
@@ -41,8 +41,8 @@
AddFilesToPackage develop lib :
libc.a libcolumnlistview.a
<$(architecture)>liblocalestub.a
- libm.a libpthread.a
- libprint.a libprintutils.a
+ libm.a libnetservices.a
+ libpthread.a libprint.a libprintutils.a
<$(architecture)>libshared.a ;
# the POSIX error code mapper library
diff --git a/build/jam/packages/HaikuDevelSecondary
b/build/jam/packages/HaikuDevelSecondary
index 947d4e0..6c1f36b 100644
--- a/build/jam/packages/HaikuDevelSecondary
+++ b/build/jam/packages/HaikuDevelSecondary
@@ -38,6 +38,7 @@
<$(architecture)>libcolumnlistview.a
<$(architecture)>liblocalestub.a
<$(architecture)>libm.a
+ <$(architecture)>libnetservices.a
<$(architecture)>libpthread.a
<$(architecture)>libshared.a ;
diff --git a/src/kits/network/libnetservices/Jamfile
b/src/kits/network/libnetservices/Jamfile
index 845e4da..6a6ece1 100644
--- a/src/kits/network/libnetservices/Jamfile
+++ b/src/kits/network/libnetservices/Jamfile
@@ -2,42 +2,50 @@
UsePrivateHeaders net netservices shared support ;
+local sources =
+ # FUTURE: The HTTP stuff should all go into an add-on. It needs
+ # linking against libcrypto.so and only the add-on should link
+ # against it.
+ DataRequest.cpp
+ HttpAuthentication.cpp
+ HttpHeaders.cpp
+ HttpForm.cpp
+ HttpRequest.cpp
+ HttpResult.cpp
+
+ # FUTURE: another add-on for file:// (a much simpler one)
+ FileRequest.cpp
+
+ # FUTURE: another add-on for gopher://
+ GopherRequest.cpp
+
+ HttpTime.cpp
+ NetworkCookie.cpp
+ NetworkCookieJar.cpp
+
+ NetworkRequest.cpp
+ UrlContext.cpp
+ UrlProtocolAsynchronousListener.cpp
+ UrlProtocolDispatchingListener.cpp
+ UrlProtocolListener.cpp
+ UrlProtocolRoster.cpp
+ UrlRequest.cpp
+ UrlResult.cpp
+ UrlSynchronousRequest.cpp
+ ;
+
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
MergeObject <libnetapi!$(architecture)>netservices.o :
- # FUTURE: The HTTP stuff should all go into an add-on.
It needs
- # linking against libcrypto.so and only the add-on
should link
- # against it.
- DataRequest.cpp
- HttpAuthentication.cpp
- HttpHeaders.cpp
- HttpForm.cpp
- HttpRequest.cpp
- HttpResult.cpp
-
- # FUTURE: another add-on for file:// (a much simpler
one)
- FileRequest.cpp
-
- # FUTURE: another add-on for gopher://
- GopherRequest.cpp
-
- HttpTime.cpp
- NetworkCookie.cpp
- NetworkCookieJar.cpp
-
- NetworkRequest.cpp
- UrlContext.cpp
- UrlProtocolAsynchronousListener.cpp
- UrlProtocolDispatchingListener.cpp
- UrlProtocolListener.cpp
- UrlProtocolRoster.cpp
- UrlRequest.cpp
- UrlResult.cpp
- UrlSynchronousRequest.cpp
+ $(sources)
: <$(architecture)>libshared.a
;
+
+ StaticLibrary <$(architecture)>libnetservices.a :
+ $(sources)
+ ;
}
}
--
To view, visit https://review.haiku-os.org/c/haiku/+/3666
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: If3fd231869823b42d6d896c6c9eb7a95c5fe715d
Gerrit-Change-Number: 3666
Gerrit-PatchSet: 1
Gerrit-Owner: Niels Sascha Reedijk <niels.reedijk@xxxxxxxxx>
Gerrit-MessageType: newchange
