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

Added socket.c to the build again. It is of course neccessary to have it in libnet.so. The real version of socket is in libsocket.so.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12290 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2005-04-11 18:12:40 +00:00
parent d058b5f880
commit 8b8ddda544
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/kits/network/libnet/Jamfile
View File

@ -7,11 +7,18 @@ UsePrivateHeaders net ;
# Default libs include BeOS R5 libnet.so, something we don't want here!
LINKFLAGS on libnet.so = [ on libnet.so return $(LINKFLAGS) ] -nodefaultlibs ;
# actually we are always BUILDING_R5_LIBNET, as this means we get unprefixed
# versions of inet_* functions in libnet.so, which is how it should be in any case
# BONE versions of the inet_* functions are prefixed with __ in <arpa/inet.h> and
# implemented in libbind.so as are ours.
local defines ;
if ( $(TARGET_PLATFORM) = r5 ) {
defines += BUILDING_R5_LIBNET ;
} else if ( $(TARGET_PLATFORM) = bone ) {
defines += BONE_VERSION ;
defines += BUILDING_R5_LIBNET ;
} else if ( $(TARGET_PLATFORM) = haiku ) {
defines += BUILDING_R5_LIBNET ;
}
defines = [ FDefines $(defines) ] ;
SubDirCcFlags $(defines) ;
@ -22,7 +29,6 @@ Depends libnet.so : install_network_etc_files ;
if ( $(TARGET_PLATFORM) = r5 ) {
PLATFORM_SOURCES =
socket.c
select.c
poll.c
;
@ -36,6 +42,7 @@ if ( $(TARGET_PLATFORM) = r5 ) {
SharedLibrary net :
$(PLATFORM_SOURCES)
socket.c
compat.c
arc4random.c
base64.c

2
src/kits/network/libnetapi/Jamfile
View File

@ -9,7 +9,7 @@ UsePrivateHeaders net ;
SubDirC++Flags $(defines) ;
PLATFORM_LIBS = ;
} else {
PLATFORM_LIBS = libsocket.so ;
PLATFORM_LIBS = libsocket.so libbind.so ;
}
}