From 3df3da2ccca8b1edcf7620357e8870e50222dea3 Mon Sep 17 00:00:00 2001
From: shatty <shatty@nowhere.fake>
Date: Thu, 11 Nov 2004 10:13:34 +0000
Subject: [PATCH] use BONE_COMPATIBLE variable instead of TARGET_PLATFORM to
 control linking

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9914 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../inbound_protocols/imap/Jamfile            | 27 ++++++++++---------
 .../inbound_protocols/pop3/Jamfile            | 27 ++++++++++---------
 .../outbound_protocols/smtp/Jamfile           | 16 +++++------
 3 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
index e5200ff1a5..72a93503d4 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
@@ -4,31 +4,32 @@ UsePrivateHeaders mail ;
 
 SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ;
 
-if $(TARGET_PLATFORM) = r5 {
-	SubDirC++Flags -DBUILDING_R5_LIBNET ;
-} else {
-	SubDirC++Flags -DBONE ;
-}
-
 if $(USESSL) {
 	SubDirC++Flags -DUSESSL ;
 	SubDirHdrs [ FDirName / boot home config include ] ;
 }
 
+if $(BONE_COMPATIBLE) {
+	SubDirC++Flags -DBONE ;
+} else {
+	SubDirC++Flags -DBUILDING_R5_LIBNET ;
+}
+
 Addon IMAP : mail_daemon inbound_protocols :
 	imap_client.cpp
 	imap_config.cpp
 	NestedString.cpp ;
 
+LinkSharedOSLibs IMAP : be libmail.so ;
+
 if $(USESSL) {
-	LinkSharedOSLibs IMAP :
-		be libmail.so socket bind ssl crypto ;
-} else if $(TARGET_PLATFORM) = r5 {
-	LinkSharedOSLibs IMAP :
-		 be libmail.so net ;
+	LinkSharedOSLibs IMAP : ssl crypto ;
+}
+
+if $(BONE_COMPATIBLE) {
+	LinkSharedOSLibs IMAP : socket bind ;
 } else {
-	LinkSharedOSLibs IMAP :
-		 be libmail.so socket bind ;
+	LinkSharedOSLibs IMAP : net ;
 }
 
 Package haiku-maildaemon-cvs :
diff --git a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile
index 1af760b6fa..8379953bfd 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile
+++ b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile
@@ -3,32 +3,33 @@ SubDir OBOS_TOP src add-ons mail_daemon inbound_protocols pop3 ;
 UsePrivateHeaders mail ;
 SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ;
 
-if $(TARGET_PLATFORM) = r5 {
-	SubDirC++Flags -DBUILDING_R5_LIBNET ;
-} else {
-	SubDirC++Flags -DBONE ;
-}
-
 if $(USESSL) {
 	SubDirC++Flags -DUSESSL ;
 	SubDirHdrs [ FDirName / boot home config include ] ;
 }
 
+if $(BONE_COMPATIBLE) {
+	SubDirC++Flags -DBONE ;
+} else {
+	SubDirC++Flags -DBUILDING_R5_LIBNET ;
+}
+
 Addon POP3 : mail_daemon inbound_protocols :
 	MessageIO.cpp
 	pop3.cpp
 	SimpleMailProtocol.cpp
 	md5c.c ;
 
+LinkSharedOSLibs POP3 : be libmail.so ;
+
 if $(USESSL) {
-	LinkSharedOSLibs POP3 :
-		be libmail.so socket bind ssl crypto ;
-} else if $(TARGET_PLATFORM) = r5 {
-	LinkSharedOSLibs POP3 :
-		 be libmail.so net ;
+	LinkSharedOSLibs POP3 : ssl crypto ;
+}
+
+if $(BONE_COMPATIBLE) {
+	LinkSharedOSLibs POP3 : socket bind ;
 } else {
-	LinkSharedOSLibs POP3 :
-		 be libmail.so socket bind ;
+	LinkSharedOSLibs POP3 : net ;
 }
 
 Package haiku-maildaemon-cvs :
diff --git a/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile b/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
index 6fb30efdd0..90be7c02d6 100644
--- a/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
+++ b/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
@@ -3,22 +3,22 @@ SubDir OBOS_TOP src add-ons mail_daemon outbound_protocols smtp ;
 UsePrivateHeaders mail ;
 SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ;
 
-if $(TARGET_PLATFORM) = r5 {
-	SubDirC++Flags -DBUILDING_R5_LIBNET ;
-} else {
+if $(BONE_COMPATIBLE) {
 	SubDirC++Flags -DBONE ;
+} else {
+	SubDirC++Flags -DBUILDING_R5_LIBNET ;
 }
 
 Addon SMTP : mail_daemon outbound_protocols :
 	smtp.cpp
 	md5c.c ;
 
-if $(TARGET_PLATFORM) = r5 {
-	LinkSharedOSLibs SMTP :
-		 be libmail.so net ;
+LinkSharedOSLibs SMTP : be libmail.so ;
+
+if $(BONE_COMPATIBLE) {
+	LinkSharedOSLibs SMTP : socket bind ;
 } else {
-	LinkSharedOSLibs SMTP :
-		 be libmail.so socket bind ;
+	LinkSharedOSLibs SMTP : net ;
 }
 
 Package haiku-maildaemon-cvs :