From 8b8ddda544807b4158f427e396e0230b5e70f856 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Mon, 11 Apr 2005 18:12:40 +0000 Subject: [PATCH] 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. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12290 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/network/libnet/Jamfile | 9 ++++++++- src/kits/network/libnetapi/Jamfile | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/kits/network/libnet/Jamfile b/src/kits/network/libnet/Jamfile index 20fd0eb55a..4f9aa061e9 100644 --- a/src/kits/network/libnet/Jamfile +++ b/src/kits/network/libnet/Jamfile @@ -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 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 diff --git a/src/kits/network/libnetapi/Jamfile b/src/kits/network/libnetapi/Jamfile index 6fa0ab5417..5092dd05b2 100644 --- a/src/kits/network/libnetapi/Jamfile +++ b/src/kits/network/libnetapi/Jamfile @@ -9,7 +9,7 @@ UsePrivateHeaders net ; SubDirC++Flags $(defines) ; PLATFORM_LIBS = ; } else { - PLATFORM_LIBS = libsocket.so ; + PLATFORM_LIBS = libsocket.so libbind.so ; } }