Fixed the build of several network apps under R5:

- removed libnetapi.so from $NETWORK_LIBS - it's not used by anyone anyway,
  and it's definitely not necessary to link against it by default.
  Note, this might cause problems in some of the mail add-ons; I haven't
  tested this.
- route/ping/... now also link against $SELECT_UNAME_ETC_LIB

makehdimage should now work again under all BeOS platforms.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12325 a95241bf-73f2-0310-859d-f6bbb57e9c96

Jamrules

@@ -122,12 +122,10 @@ switch $(TARGET_PLATFORM)
 	}
 }
 if $(BONE_COMPATIBLE) {
-	# FIXME: we don't have our own "libbnetapi.so" yet :-(
+	NETWORK_LIBS = libsocket.so libbind.so ;
-	# NETWORK_LIBS = libsocket.so libbind.so libbnetapi.so ;
-	NETWORK_LIBS = libsocket.so libbind.so bnetapi ;
 	SELECT_UNAME_ETC_LIB = libroot.so ;
 } else {
-	NETWORK_LIBS = libnet.so libnetapi.so ;
+	NETWORK_LIBS = libnet.so ;
 	SELECT_UNAME_ETC_LIB = libnet.so ;
 }
 

src/bin/arp/Jamfile

@@ -8,7 +8,7 @@ if ! $(BONE_COMPATIBLE) {
 
 BinCommand arp :
 	arp.c
-: $(NETWORK_LIBS) ;
+	: $(NETWORK_LIBS) $(SELECT_UNAME_ETC_LIB) ;
 
 # Installation -- in the test directory for the time being
 OBOSInstall install-networking

src/bin/ping/Jamfile

@@ -8,7 +8,7 @@ if ! $(BONE_COMPATIBLE) {
 
 BinCommand ping :
 	ping.c
-: $(NETWORK_LIBS) ;
+	: $(NETWORK_LIBS) $(SELECT_UNAME_ETC_LIB) ;
 
 # Installation -- in the test directory for the time being
 OBOSInstall install-networking

src/bin/route/Jamfile

@@ -10,7 +10,7 @@ BinCommand <bin>route :
 	keywords.c
 	route.c
 	show.c
-: $(NETWORK_LIBS) ;
+	: $(NETWORK_LIBS) $(SELECT_UNAME_ETC_LIB) ;
 
 # Installation -- in the test directory for the time being
 OBOSInstall install-networking

src/bin/tar/src/Jamfile

@@ -33,5 +33,5 @@ BinCommand tar :
 
 BinCommand rmt :
 	rmt.c
-	: libtar.a $(NETWORK_LIBS) : tar.rsrc
+	: libtar.a $(NETWORK_LIBS)
-;
+	: tar.rsrc ;

src/bin/traceroute/Jamfile

@@ -8,7 +8,7 @@ if ! $(BONE_COMPATIBLE) {
 
 BinCommand traceroute :
 	traceroute.c
-: $(NETWORK_LIBS) ;
+	: $(NETWORK_LIBS) $(SELECT_UNAME_ETC_LIB) ;
 
 # Installation -- in the test directory for the time being
 OBOSInstall install-networking

src/kits/mail/Jamfile

@@ -52,6 +52,7 @@ LinkSharedOSLibs libmail.so :
 	tracker
 	stdc++.r4
 	$(NETWORK_LIBS)
+	$(SELECT_UNAME_ETC_LIB)
 ;
 
 MakeLocate <develop>libmail.so : $(OBOS_STLIB_DIR) ;