diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index 365f26ba29..20b0a3a6e0 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -282,6 +282,11 @@ if $(HAIKU_SHARED_LIBSUPC++) { HAIKU_LIBSUPC++ = ; } +# network libraries +HAIKU_NETWORK_LIBS = network ; +HAIKU_NETAPI_LIB = network ; +HAIKU_SELECT_UNAME_ETC_LIB = ; # libroot, against which we link anyway + # library and executable glue code local commonGlueCode = init_term_dyn.o @@ -534,6 +539,26 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) { } } +# network libraries +if $(HOST_PLATFORM_HAIKU_COMPATIBLE) { + HOST_NETWORK_LIBS = network ; + HOST_NETAPI_LIB = network ; + HOST_SELECT_UNAME_ETC_LIB = ; # libroot +} else if $(HOST_PLATFORM_BONE_COMPATIBLE) { + HOST_NETWORK_LIBS = socket bind ; + HOST_NETAPI_LIB = bnetapi ; + HOST_SELECT_UNAME_ETC_LIB = ; # libroot +} else if $(HOST_PLATFORM_BEOS_COMPATIBLE) { + HOST_NETWORK_LIBS = net ; + HOST_NETAPI_LIB = netapi ; + HOST_SELECT_UNAME_ETC_LIB = net ; +} else { + # Linux,... + HOST_NETWORK_LIBS = ; + HOST_NETAPI_LIB = ; + HOST_SELECT_UNAME_ETC_LIB = ; +} + # define the executable MIME type HOST_EXECUTABLE_MIME_TYPE = "application/x-vnd.Be-elfexecutable" ; @@ -583,27 +608,6 @@ if $(TARGET_PLATFORM) != haiku { } } -# TODO: Fix the naming! -if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { - NETWORK_LIBS = network ; - SELECT_UNAME_ETC_LIB = root ; - NETAPI_LIB = network ; -} else if $(TARGET_PLATFORM_BONE_COMPATIBLE) { - NETWORK_LIBS = socket bind ; - NETAPI_LIB = bnetapi ; - SELECT_UNAME_ETC_LIB = root ; -} else { - NETWORK_LIBS = net ; - NETAPI_LIB = netapi ; - SELECT_UNAME_ETC_LIB = net ; -} - -# TODO: For compatibility only. Remove when no longer used. -R5_COMPATIBLE = $(TARGET_PLATFORM_BEOS_COMPATIBLE) ; -BONE_COMPATIBLE = $(TARGET_PLATFORM_BONE_COMPATIBLE) ; -DANO_COMPATIBLE = $(TARGET_PLATFORM_DANO_COMPATIBLE) ; -HAIKU_COMPATIBLE = $(TARGET_PLATFORM_HAIKU_COMPATIBLE) ; - # Set TARGET_* variables either from HAIKU_* or HOST_* depending on the # specified TARGET_PLATFORM. @@ -634,6 +638,8 @@ local buildVars = LIBSTDC++ LIBSUPC++ + NETWORK_LIBS NETAPI_LIB SELECT_UNAME_ETC_LIB + ARCH_MACRO_DEFINE EXECUTABLE_MIME_TYPE OBJECT_BASE_DIR COMMON_ARCH_OBJECT_DIR COMMON_DEBUG_OBJECT_DIR diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile index 91b1daca86..6e4b45eeda 100644 --- a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile +++ b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile @@ -21,7 +21,7 @@ Addon IMAP : imap_config.cpp NestedString.cpp ; -LinkAgainst IMAP : be libmail.so $(NETWORK_LIBS) ; +LinkAgainst IMAP : be libmail.so $(TARGET_NETWORK_LIBS) ; if $(USESSL) { LinkAgainst IMAP : ssl crypto ; diff --git a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile index 11de363741..2896f4c81a 100644 --- a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile +++ b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile @@ -22,7 +22,7 @@ Addon POP3 : SimpleMailProtocol.cpp md5c.c ; -LinkAgainst POP3 : be libmail.so $(NETWORK_LIBS) ; +LinkAgainst POP3 : be libmail.so $(TARGET_NETWORK_LIBS) ; if $(USESSL) { LinkAgainst POP3 : ssl crypto ; diff --git a/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile b/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile index c8d227b284..627281a1eb 100644 --- a/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile +++ b/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile @@ -20,7 +20,7 @@ Addon SMTP : smtp.cpp md5c.c ; -LinkAgainst SMTP : be libmail.so $(NETWORK_LIBS) ; +LinkAgainst SMTP : be libmail.so $(TARGET_NETWORK_LIBS) ; if $(USESSL) { LinkAgainst SMTP : ssl crypto ; diff --git a/src/add-ons/print/transports/hp_jetdirect/Jamfile b/src/add-ons/print/transports/hp_jetdirect/Jamfile index 0e22e46927..efbf8ff995 100644 --- a/src/add-ons/print/transports/hp_jetdirect/Jamfile +++ b/src/add-ons/print/transports/hp_jetdirect/Jamfile @@ -8,7 +8,7 @@ Addon HP\ JetDirect : print_transport.cpp HPJetDirectTransport.cpp SetupWindow.cpp - : be $(NETAPI_LIB) + : be $(TARGET_NETAPI_LIB) ; Package haiku-printingkit-cvs : diff --git a/src/add-ons/print/transports/ipp/Jamfile b/src/add-ons/print/transports/ipp/Jamfile index c9c18bb196..fc6b20fca6 100644 --- a/src/add-ons/print/transports/ipp/Jamfile +++ b/src/add-ons/print/transports/ipp/Jamfile @@ -15,7 +15,7 @@ Addon IPP : Socket.o SocketStream.o DbgMsg.o - : be $(NETWORK_LIBS) $(TARGET_LIBSTDC++) + : be $(TARGET_NETWORK_LIBS) $(TARGET_LIBSTDC++) ; ObjectReferences diff --git a/src/add-ons/print/transports/lpr/Jamfile b/src/add-ons/print/transports/lpr/Jamfile index 1be0496eb3..7aae0e471d 100644 --- a/src/add-ons/print/transports/lpr/Jamfile +++ b/src/add-ons/print/transports/lpr/Jamfile @@ -13,7 +13,7 @@ Addon LPR : Socket.o SocketStream.o DbgMsg.o - : be $(NETWORK_LIBS) $(TARGET_LIBSTDC++) + : be $(TARGET_NETWORK_LIBS) $(TARGET_LIBSTDC++) ; ObjectReferences diff --git a/src/add-ons/print/transports/shared/Jamfile b/src/add-ons/print/transports/shared/Jamfile index 59da459c8c..6b75e8e0ab 100644 --- a/src/add-ons/print/transports/shared/Jamfile +++ b/src/add-ons/print/transports/shared/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons print transports shared ; SetSubDirSupportedPlatformsBeOSCompatible ; -if $(BONE_COMPATIBLE) { +if $(TARGET_PLATFORM_BONE_COMPATIBLE) { ObjectC++Flags Socket.cpp : -DHAVE_ARPA_INET -Dclosesocket=close ; } else { ObjectC++Flags Socket.cpp : -DHAVE_ARPA_INET -DBUILDING_R5_LIBNET ; diff --git a/src/apps/cdplayer/Jamfile b/src/apps/cdplayer/Jamfile index a0c8fa14ce..e87db80e92 100644 --- a/src/apps/cdplayer/Jamfile +++ b/src/apps/cdplayer/Jamfile @@ -13,6 +13,6 @@ Application CDPlayer : TwoStateDrawButton.cpp VolumeSlider.cpp - : be $(SELECT_UNAME_ETC_LIB) $(NETAPI_LIB) translation textencoding + : be $(TARGET_SELECT_UNAME_ETC_LIB) $(TARGET_NETAPI_LIB) translation textencoding : CDPlayer.rdef ; diff --git a/src/apps/codycam/Jamfile b/src/apps/codycam/Jamfile index 35ab734571..96df5e85b0 100644 --- a/src/apps/codycam/Jamfile +++ b/src/apps/codycam/Jamfile @@ -8,7 +8,7 @@ Application CodyCam : Settings.cpp SettingsHandler.cpp VideoConsumer.cpp - : be media translation $(NETAPI_LIB) $(TARGET_LIBSTDC++) + : be media translation $(TARGET_NETAPI_LIB) $(TARGET_LIBSTDC++) : CodyCam.rdef ; diff --git a/src/apps/networkstatus/Jamfile b/src/apps/networkstatus/Jamfile index fd396fdd3e..e2c1854db5 100644 --- a/src/apps/networkstatus/Jamfile +++ b/src/apps/networkstatus/Jamfile @@ -14,6 +14,6 @@ Application NetworkStatus : NetworkStatusWindow.cpp NetworkStatusView.cpp NetworkStatus.cpp - : be $(icon_libs) $(NETWORK_LIBS) + : be $(icon_libs) $(TARGET_NETWORK_LIBS) : NetworkStatus.rdef NetworkStatusIcons.rdef ; diff --git a/src/bin/bash/Jamfile b/src/bin/bash/Jamfile index 1c431749f4..bf9f73c8ef 100644 --- a/src/bin/bash/Jamfile +++ b/src/bin/bash/Jamfile @@ -64,7 +64,7 @@ BinCommand sh : list.c stringlib.c locale.c findcmd.c redir.c pcomplete.c pcomplib.c syntax.c xmalloc.c test.c sig.c : libreadline.a libglob.a libbuiltins.a libtilde.a libsh.a - libtermcap.a $(SELECT_UNAME_ETC_LIB) + libtermcap.a $(TARGET_SELECT_UNAME_ETC_LIB) : bash.rdef ; # trap.c includes signames.h diff --git a/src/bin/coreutils/src/Jamfile b/src/bin/coreutils/src/Jamfile index c08dcc7593..18aeca69f0 100644 --- a/src/bin/coreutils/src/Jamfile +++ b/src/bin/coreutils/src/Jamfile @@ -82,7 +82,7 @@ StdBinCommands hostname.c tail.c uname.c - : libfetish.a $(SELECT_UNAME_ETC_LIB) : $(coreutils_rsrc) ; + : libfetish.a $(TARGET_SELECT_UNAME_ETC_LIB) : $(coreutils_rsrc) ; #commands requiring something in libroot.so (getrlimit, fchdir...) diff --git a/src/bin/network/arp/Jamfile b/src/bin/network/arp/Jamfile index d9619706c1..6f8165b9c8 100644 --- a/src/bin/network/arp/Jamfile +++ b/src/bin/network/arp/Jamfile @@ -13,7 +13,7 @@ UseHeaders $(TARGET_PRIVATE_KERNEL_HEADERS) : true ; BinCommand arp : arp.cpp - : $(NETWORK_LIBS) $(SELECT_UNAME_ETC_LIB) ; + : $(TARGET_NETWORK_LIBS) $(TARGET_SELECT_UNAME_ETC_LIB) ; # Installation -- in the test directory for the time being HaikuInstall install-networking diff --git a/src/bin/network/ftp/Jamfile b/src/bin/network/ftp/Jamfile index 17e94a5084..d7900faf5d 100644 --- a/src/bin/network/ftp/Jamfile +++ b/src/bin/network/ftp/Jamfile @@ -21,7 +21,7 @@ BinCommand ftp : progressbar.c ruserpass.c util.c - : libedit.a libncurses.a libutil.a libbsd.so $(NETWORK_LIBS) + : libedit.a libncurses.a libutil.a libbsd.so $(TARGET_NETWORK_LIBS) ; # Installation -- in the test directory for the time being diff --git a/src/bin/network/nc/Jamfile b/src/bin/network/nc/Jamfile index 13099be6ea..71a78855c3 100644 --- a/src/bin/network/nc/Jamfile +++ b/src/bin/network/nc/Jamfile @@ -10,7 +10,7 @@ if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { BinCommand nc : netcat.c - : $(NETWORK_LIBS) + : $(TARGET_NETWORK_LIBS) ; HaikuInstall install-networking diff --git a/src/bin/network/ping/Jamfile b/src/bin/network/ping/Jamfile index 1d95c5bc92..6a160150f7 100644 --- a/src/bin/network/ping/Jamfile +++ b/src/bin/network/ping/Jamfile @@ -10,7 +10,7 @@ if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { BinCommand ping : ping.c - : $(NETWORK_LIBS) $(SELECT_UNAME_ETC_LIB) ; + : $(TARGET_NETWORK_LIBS) $(TARGET_SELECT_UNAME_ETC_LIB) ; # Installation -- in the test directory for the time being HaikuInstall install-networking diff --git a/src/bin/network/tcpdump/Jamfile b/src/bin/network/tcpdump/Jamfile index 06d39cd075..b0c67c0197 100644 --- a/src/bin/network/tcpdump/Jamfile +++ b/src/bin/network/tcpdump/Jamfile @@ -124,7 +124,7 @@ BinCommand tcpdump : tcpdump.c util.c version.c - : libpcap.a $(NETWORK_LIBS) + : libpcap.a $(TARGET_NETWORK_LIBS) ; SubInclude HAIKU_TOP src bin network tcpdump libpcap ; diff --git a/src/bin/network/telnet/Jamfile b/src/bin/network/telnet/Jamfile index 1808179e14..67604b72ca 100644 --- a/src/bin/network/telnet/Jamfile +++ b/src/bin/network/telnet/Jamfile @@ -20,5 +20,5 @@ BinCommand telnet : telnet.c terminal.c utilities.c - : libtermcap.a libncurses.a libtelnet.a libutil.a libbsd.so $(NETWORK_LIBS) + : libtermcap.a libncurses.a libtelnet.a libutil.a libbsd.so $(TARGET_NETWORK_LIBS) ; diff --git a/src/bin/network/telnetd/Jamfile b/src/bin/network/telnetd/Jamfile index 01fc4dccc0..c975e66fb1 100644 --- a/src/bin/network/telnetd/Jamfile +++ b/src/bin/network/telnetd/Jamfile @@ -18,5 +18,5 @@ BinCommand telnetd : telnetd.c termstat.c utility.c - : libtermcap.a libtelnet.a libutil.a libbsd.so $(NETWORK_LIBS) + : libtermcap.a libtelnet.a libutil.a libbsd.so $(TARGET_NETWORK_LIBS) ; diff --git a/src/bin/network/traceroute/Jamfile b/src/bin/network/traceroute/Jamfile index 12c2f9812d..a3ff95ebfa 100644 --- a/src/bin/network/traceroute/Jamfile +++ b/src/bin/network/traceroute/Jamfile @@ -21,7 +21,7 @@ BinCommand traceroute : ifaddrlist.c traceroute.c version.c - : $(NETWORK_LIBS) $(SELECT_UNAME_ETC_LIB) ; + : $(TARGET_NETWORK_LIBS) $(TARGET_SELECT_UNAME_ETC_LIB) ; # Installation -- in the test directory for the time being HaikuInstall install-networking diff --git a/src/bin/network/wget/Jamfile b/src/bin/network/wget/Jamfile index 394a51a94e..d25b3b6c47 100644 --- a/src/bin/network/wget/Jamfile +++ b/src/bin/network/wget/Jamfile @@ -39,5 +39,5 @@ BinCommand wget : utils.c version.c xmalloc.c - : $(NETWORK_LIBS) + : $(TARGET_NETWORK_LIBS) ; diff --git a/src/bin/sharutils/src/Jamfile b/src/bin/sharutils/src/Jamfile index 149d28af6d..b46dd49ad5 100644 --- a/src/bin/sharutils/src/Jamfile +++ b/src/bin/sharutils/src/Jamfile @@ -9,7 +9,7 @@ ResComp $(sharutils_rsrc) : [ FGristFiles sharutils.rdef ] ; BinCommand shar : shar.c encode.c - : libsharutils.a $(SELECT_UNAME_ETC_LIB) + : libsharutils.a $(TARGET_SELECT_UNAME_ETC_LIB) : sharutils.rsrc ; BinCommand unshar : diff --git a/src/bin/tar/src/Jamfile b/src/bin/tar/src/Jamfile index ab1d7d322f..ec25eb472a 100644 --- a/src/bin/tar/src/Jamfile +++ b/src/bin/tar/src/Jamfile @@ -34,5 +34,5 @@ BinCommand tar : BinCommand rmt : rmt.c - : libtar.a $(NETWORK_LIBS) + : libtar.a $(TARGET_NETWORK_LIBS) : tar.rsrc ; diff --git a/src/bin/vim/src/Jamfile b/src/bin/vim/src/Jamfile index 3267e6c88e..b89fa22523 100644 --- a/src/bin/vim/src/Jamfile +++ b/src/bin/vim/src/Jamfile @@ -60,7 +60,7 @@ BinCommand vim : os_beos.c version.c pathdef.c - : be libtermcap.a $(SELECT_UNAME_ETC_LIB) + : be libtermcap.a $(TARGET_SELECT_UNAME_ETC_LIB) : vim.rdef ; SEARCH on [ FGristFiles pathdef.c ] = [ FDirName $(SUBDIR) auto ] ; diff --git a/src/kits/Jamfile b/src/kits/Jamfile index c8d59df7b1..8e4c762c50 100644 --- a/src/kits/Jamfile +++ b/src/kits/Jamfile @@ -74,7 +74,7 @@ SharedLibrary libbe_haiku.so : libagg.a libbeadapter.so - $(NETWORK_LIBS) + $(TARGET_NETWORK_LIBS) $(TARGET_LIBSTDC++) ; diff --git a/src/kits/interface/Jamfile b/src/kits/interface/Jamfile index abdfbd6c2f..ce22f6cfd2 100644 --- a/src/kits/interface/Jamfile +++ b/src/kits/interface/Jamfile @@ -17,7 +17,7 @@ if $(RUN_WITHOUT_APP_SERVER) != 0 { SubDirC++Flags $(defines) ; } -if ! $(HAIKU_COMPATIBLE) { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { local defines = [ FDefines COMPILE_FOR_R5 ] ; SubDirCcFlags $(defines) ; SubDirC++Flags $(defines) ; diff --git a/src/kits/mail/Jamfile b/src/kits/mail/Jamfile index 44e0b22dfd..ef41c300e0 100644 --- a/src/kits/mail/Jamfile +++ b/src/kits/mail/Jamfile @@ -47,8 +47,8 @@ SharedLibrary libmail.so : libtextencoding.so tracker $(TARGET_LIBSTDC++) - $(NETWORK_LIBS) - $(SELECT_UNAME_ETC_LIB) + $(TARGET_NETWORK_LIBS) + $(TARGET_SELECT_UNAME_ETC_LIB) ; Package haiku-maildaemon-cvs : diff --git a/src/kits/network/libnetapi/Jamfile b/src/kits/network/libnetapi/Jamfile index ef97554d96..9aca312f36 100644 --- a/src/kits/network/libnetapi/Jamfile +++ b/src/kits/network/libnetapi/Jamfile @@ -24,7 +24,7 @@ if $(TARGET_PLATFORM) != haiku { SharedLibrary libnetapi.so : $(netapi_sources) - : be $(NETWORK_LIBS) + : be $(TARGET_NETWORK_LIBS) ; # Installation -- in the test directory for the time being diff --git a/src/preferences/network/Jamfile b/src/preferences/network/Jamfile index 3c67562c1f..0c5b618aa8 100644 --- a/src/preferences/network/Jamfile +++ b/src/preferences/network/Jamfile @@ -8,7 +8,7 @@ Preference Network : EthernetSettingsWindow.cpp EthernetSettingsView.cpp EthernetSettings.cpp - : be root $(NETWORK_LIBS) + : be root $(TARGET_NETWORK_LIBS) ; Package haiku-networksettings : diff --git a/src/servers/mail/Jamfile b/src/servers/mail/Jamfile index ab497e24c2..b169942eb2 100644 --- a/src/servers/mail/Jamfile +++ b/src/servers/mail/Jamfile @@ -19,7 +19,7 @@ Server mail_daemon : main.cpp ; -LinkAgainst mail_daemon : be libmail.so tracker $(TARGET_LIBSTDC++) $(NETWORK_LIBS) ; +LinkAgainst mail_daemon : be libmail.so tracker $(TARGET_LIBSTDC++) $(TARGET_NETWORK_LIBS) ; Package haiku-maildaemon-cvs : mail_daemon : diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/client/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/client/Jamfile index fc7a971863..288692564c 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/client/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/client/Jamfile @@ -87,5 +87,5 @@ Addon netfs VolumeManager.cpp : UserlandFSServer - $(NETWORK_LIBS) + $(TARGET_NETWORK_LIBS) ; diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/netfs_config/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/netfs_config/Jamfile index 2ed0978521..245ed402ed 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/netfs_config/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/netfs_config/Jamfile @@ -28,5 +28,5 @@ Application netfs_config # Blocker.cpp netfs_config.cpp - : be # $(NETWORK_LIBS) + : be # $(TARGET_NETWORK_LIBS) ; diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/Jamfile index 6849147741..5c1af0830d 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/Jamfile @@ -84,5 +84,5 @@ Application NetFSServer UserSecurityContext.cpp Volume.cpp VolumeManager.cpp - : be $(NETWORK_LIBS) + : be $(TARGET_NETWORK_LIBS) ; diff --git a/src/tests/kits/net/Jamfile b/src/tests/kits/net/Jamfile index 15579b4533..21b40f5804 100644 --- a/src/tests/kits/net/Jamfile +++ b/src/tests/kits/net/Jamfile @@ -18,12 +18,12 @@ UsePrivateHeaders net ; #UsePrivateHeaders kernel ; #UseArchHeaders $(TARGET_ARCH) ; -SimpleTest udp_client : udp_client.c : $(NETWORK_LIBS) ; -SimpleTest udp_echo : udp_echo.c : $(NETWORK_LIBS) ; -SimpleTest udp_server : udp_server.c : $(NETWORK_LIBS) ; +SimpleTest udp_client : udp_client.c : $(TARGET_NETWORK_LIBS) ; +SimpleTest udp_echo : udp_echo.c : $(TARGET_NETWORK_LIBS) ; +SimpleTest udp_server : udp_server.c : $(TARGET_NETWORK_LIBS) ; -SimpleTest tcp_server : tcp_server.c : $(NETWORK_LIBS) ; -SimpleTest tcp_client : tcp_client.c : $(NETWORK_LIBS) ; +SimpleTest tcp_server : tcp_server.c : $(TARGET_NETWORK_LIBS) ; +SimpleTest tcp_client : tcp_client.c : $(TARGET_NETWORK_LIBS) ; SimpleTest tcp_tester : tcp_tester.cpp diff --git a/src/tests/kits/net/netperf/Jamfile b/src/tests/kits/net/netperf/Jamfile index f95d4e1b26..66f3774737 100644 --- a/src/tests/kits/net/netperf/Jamfile +++ b/src/tests/kits/net/netperf/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src tests kits net netperf ; Depends netperf : install_netperf_scripts ; -if ! $(BONE_COMPATIBLE) { +if ! $(TARGET_PLATFORM_BONE_COMPATIBLE) { SubDirCcFlags -DBUILDING_R5_LIBNET -Dclose=closesocket ; } @@ -24,13 +24,13 @@ Objects $(net_files) ; SimpleTest netperf : netperf.c [ FGristFiles $(net_files:S=$(SUFOBJ)) ] - : $(NETWORK_LIBS) + : $(TARGET_NETWORK_LIBS) ; SimpleTest netserver : netserver.c [ FGristFiles $(net_files:S=$(SUFOBJ)) ] - : $(NETWORK_LIBS) + : $(TARGET_NETWORK_LIBS) ; HaikuInstall install_netperf_scripts : [ FDirName $(HAIKU_TEST_DIR) kits net netperf ] : diff --git a/src/tools/remote_disk_server/Jamfile b/src/tools/remote_disk_server/Jamfile index 91ad3a76a3..ed8d3e6144 100644 --- a/src/tools/remote_disk_server/Jamfile +++ b/src/tools/remote_disk_server/Jamfile @@ -4,5 +4,5 @@ UsePrivateHeaders kernel ; BuildPlatformMain remote_disk_server : remote_disk_server.cpp - : $(HOST_LIBSUPC++) $(NETWORK_LIBS) + : $(HOST_LIBSUPC++) $(HOST_NETWORK_LIBS) ;