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

use NETWORK_LIBS for linking, define BUILDING_R5_LIBNET if necessary

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10059 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty 2004-11-20 21:10:54 +00:00
parent 4d5737d0b8
commit 6040be9931
15 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Jamrules
View File

@ -107,6 +107,11 @@ switch $(TARGET_PLATFORM)
HAIKU_COMPATIBLE = true ;
}
}
if $(BONE_COMPATIBLE) {
NETWORK_LIBS = libsocket.so libbind.so ;
} else {
NETWORK_LIBS = libnet.so ;
}
# Determine if we're building on PPC or x86
# Determine mimetype of executable

8
src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
View File

@ -20,18 +20,12 @@ Addon IMAP : mail_daemon inbound_protocols :
imap_config.cpp
NestedString.cpp ;
LinkSharedOSLibs IMAP : be libmail.so ;
LinkSharedOSLibs IMAP : be libmail.so $(NETWORK_LIBS) ;
if $(USESSL) {
LinkSharedOSLibs IMAP : ssl crypto ;
}
if $(BONE_COMPATIBLE) {
LinkSharedOSLibs IMAP : socket bind ;
} else {
LinkSharedOSLibs IMAP : net ;
}
Package haiku-maildaemon-cvs :
IMAP :
boot home config add-ons mail_daemon inbound_protocols ;

8
src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile
View File

@ -20,18 +20,12 @@ Addon POP3 : mail_daemon inbound_protocols :
SimpleMailProtocol.cpp
md5c.c ;
LinkSharedOSLibs POP3 : be libmail.so ;
LinkSharedOSLibs POP3 : be libmail.so $(NETWORK_LIBS) ;
if $(USESSL) {
LinkSharedOSLibs POP3 : ssl crypto ;
}
if $(BONE_COMPATIBLE) {
LinkSharedOSLibs POP3 : socket bind ;
} else {
LinkSharedOSLibs POP3 : net ;
}
Package haiku-maildaemon-cvs :
POP3 :
boot home config add-ons mail_daemon inbound_protocols ;

8
src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
View File

@ -13,13 +13,7 @@ Addon SMTP : mail_daemon outbound_protocols :
smtp.cpp
md5c.c ;
LinkSharedOSLibs SMTP : be libmail.so ;
if $(BONE_COMPATIBLE) {
LinkSharedOSLibs SMTP : socket bind ;
} else {
LinkSharedOSLibs SMTP : net ;
}
LinkSharedOSLibs SMTP : be libmail.so $(NETWORK_LIBS) ;
Package haiku-maildaemon-cvs :
SMTP :

2
src/add-ons/print/transports/ipp/Jamfile
View File

@ -21,7 +21,7 @@ ObjectReferences
<src!add-ons!print!transports!shared>DbgMsg.o
;
LinkSharedOSLibs IPP : be libsocket.so libbind.so libnet.so stdc++.r4 ;
LinkSharedOSLibs IPP : be $(NETWORK_LIBS) stdc++.r4 ;
Package haiku-printingkit-cvs :
IPP :

4
src/add-ons/print/transports/lpr/Jamfile
View File

@ -18,8 +18,8 @@ ObjectReferences
<src!add-ons!print!transports!shared>DbgMsg.o
;
LinkSharedOSLibs LPR : be libsocket.so libbind.so libnet.so stdc++.r4 ;
LinkSharedOSLibs LPR : be $(NETWORK_LIBS) stdc++.r4 ;
Package haiku-printingkit-cvs :
LPR :
boot home config add-ons Print transport ;
boot home config add-ons Print transport ;

6
src/add-ons/print/transports/shared/Jamfile
View File

@ -2,7 +2,11 @@ SubDir OBOS_TOP src add-ons print transports shared ;
SetupObjectsDir ;
ObjectC++Flags Socket.cpp : -DHAVE_ARPA_INET -Dclosesocket=close ;
if $(BONE_COMPATIBLE) {
ObjectC++Flags Socket.cpp : -DHAVE_ARPA_INET -Dclosesocket=close ;
} else {
ObjectC++Flags Socket.cpp : -DHAVE_ARPA_INET -DBUILDING_R5_LIBNET ;
}
Objects
DbgMsg.cpp

6
src/apps/bin/arp/Jamfile
View File

@ -2,9 +2,13 @@ SubDir OBOS_TOP src apps bin arp ;
UsePrivateHeaders net ;
if ! $(BONE_COMPATIBLE) {
SubDirCcFlags -DBUILDING_R5_LIBNET ;
}
BinCommand arp :
arp.c
: libsocket.so libbind.so ;
: $(NETWORK_LIBS) ;
# Installation -- in the test directory for the time being
OBOSInstall install-networking

6
src/apps/bin/ifconfig/Jamfile
View File

@ -2,9 +2,13 @@ SubDir OBOS_TOP src apps bin ifconfig ;
UsePrivateHeaders net ;
if ! $(BONE_COMPATIBLE) {
SubDirCcFlags -DBUILDING_R5_LIBNET -Dclose=closesocket ;
}
BinCommand ifconfig :
ifconfig.c
: libsocket.so libbind.so ;
: $(NETWORK_LIBS) ;
# Installation -- in the test directory for the time being
OBOSInstall install-networking

6
src/apps/bin/ping/Jamfile
View File

@ -2,9 +2,13 @@ SubDir OBOS_TOP src apps bin ping ;
UsePrivateHeaders net ;
if ! $(BONE_COMPATIBLE) {
SubDirCcFlags -DBUILDING_R5_LIBNET ;
}
BinCommand ping :
ping.c
: libsocket.so libbind.so ;
: $(NETWORK_LIBS) ;
# Installation -- in the test directory for the time being
OBOSInstall install-networking

6
src/apps/bin/route/Jamfile
View File

@ -2,11 +2,15 @@ SubDir OBOS_TOP src apps bin route ;
UsePrivateHeaders net ;
if ! $(BONE_COMPATIBLE) {
SubDirCcFlags -DBUILDING_R5_LIBNET ;
}
BinCommand <bin>route :
keywords.c
route.c
show.c
: libsocket.so libbind.so ;
: $(NETWORK_LIBS) ;
# Installation -- in the test directory for the time being
OBOSInstall install-networking

6
src/apps/bin/traceroute/Jamfile
View File

@ -2,9 +2,13 @@ SubDir OBOS_TOP src apps bin traceroute ;
UsePrivateHeaders net ;
if ! $(BONE_COMPATIBLE) {
SubDirCcFlags -DBUILDING_R5_LIBNET ;
}
BinCommand traceroute :
traceroute.c
: libsocket.so libbind.so ;
: $(NETWORK_LIBS) ;
# Installation -- in the test directory for the time being
OBOSInstall install-networking

7
src/kits/mail/Jamfile
View File

@ -51,14 +51,9 @@ LinkSharedOSLibs libmail.so :
libtextencoding.so
tracker
stdc++.r4
$(NETWORK_LIBS)
;
if $(BONE_COMPATIBLE) {
LinkSharedOSLibs libmail.so : socket ;
} else {
LinkSharedOSLibs libmail.so : net ;
}
MakeLocate <develop>libmail.so : $(OBOS_STLIB_DIR) ;
RelSymLink <develop>libmail.so : libmail.so ;

8
src/servers/mail/Jamfile
View File

@ -18,13 +18,7 @@ Server mail_daemon :
main.cpp
;
LinkSharedOSLibs mail_daemon : be libmail.so tracker stdc++.r4 ;
if $(BONE_COMPATIBLE) {
LinkSharedOSLibs mail_daemon : socket ;
} else {
LinkSharedOSLibs mail_daemon : net ;
}
LinkSharedOSLibs mail_daemon : be libmail.so tracker stdc++.r4 $(NETWORK_LIBS) ;
Package haiku-maildaemon-cvs :
mail_daemon :

8
src/tests/kits/net/netperf/Jamfile
View File

@ -2,6 +2,10 @@ SubDir OBOS_TOP src tests kits net netperf ;
Depends netperf : install_netperf_scripts ;
if ! $(BONE_COMPATIBLE) {
SubDirCcFlags -DBUILDING_R5_LIBNET -Dclose=closesocket ;
}
SimpleTest netperf :
netperf.c
netsh.c
@ -12,7 +16,7 @@ SimpleTest netperf :
nettest_xti.c
nettest_ipv6.c
nettest_dns.c
: libsocket.so libbind.so
: $(NETWORK_LIBS)
;
SimpleTest netserver :
@ -25,7 +29,7 @@ SimpleTest netserver :
nettest_xti.c
nettest_ipv6.c
nettest_dns.c
: libsocket.so libbind.so
: $(NETWORK_LIBS)
;
OBOSInstall install_netperf_scripts : [ FDirName $(OBOS_TEST_DIR) kits net netperf ] :