From 6fdccb80f57f9386b43253be9278c40fd7d5cc26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 28 Aug 2006 21:46:23 +0000 Subject: [PATCH] Moved libnetapi.so sources into the src/kit/net/ directory - they don't yet build, though. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18678 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/network/Jamfile | 1 + .../{old/compat => }/libnetapi/Jamfile | 23 +++++++------------ .../{old/compat => }/libnetapi/NetAddress.cpp | 0 .../{old/compat => }/libnetapi/NetBuffer.cpp | 0 .../{old/compat => }/libnetapi/NetDebug.cpp | 0 .../compat => }/libnetapi/NetEndpoint.cpp | 0 6 files changed, 9 insertions(+), 15 deletions(-) rename src/kits/network/{old/compat => }/libnetapi/Jamfile (70%) rename src/kits/network/{old/compat => }/libnetapi/NetAddress.cpp (100%) rename src/kits/network/{old/compat => }/libnetapi/NetBuffer.cpp (100%) rename src/kits/network/{old/compat => }/libnetapi/NetDebug.cpp (100%) rename src/kits/network/{old/compat => }/libnetapi/NetEndpoint.cpp (100%) diff --git a/src/kits/network/Jamfile b/src/kits/network/Jamfile index 9e9948fc20..96bd3bcc5e 100644 --- a/src/kits/network/Jamfile +++ b/src/kits/network/Jamfile @@ -18,3 +18,4 @@ SharedLibrary libnetwork.so : ; SubInclude HAIKU_TOP src kits network dns ; +SubInclude HAIKU_TOP src kits network libnetapi ; diff --git a/src/kits/network/old/compat/libnetapi/Jamfile b/src/kits/network/libnetapi/Jamfile similarity index 70% rename from src/kits/network/old/compat/libnetapi/Jamfile rename to src/kits/network/libnetapi/Jamfile index 3d2e587cd1..7c9ca7ceb8 100644 --- a/src/kits/network/old/compat/libnetapi/Jamfile +++ b/src/kits/network/libnetapi/Jamfile @@ -1,9 +1,9 @@ -SubDir HAIKU_TOP src kits network compat libnetapi ; +SubDir HAIKU_TOP src kits network libnetapi ; SetSubDirSupportedPlatformsBeOSCompatible ; -UsePrivateHeaders net ; -UseHeaders [ FDirName $(HAIKU_TOP) headers legacy network ] : true ; +#UsePrivateHeaders net ; +#UseHeaders [ FDirName $(HAIKU_TOP) headers legacy network ] : true ; if $(TARGET_PLATFORM) != haiku { UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; @@ -11,17 +11,10 @@ if $(TARGET_PLATFORM) != haiku { # Unfortunately we get more than we want, namely all POSIX headers. UseHeaders [ FStandardOSHeaders ] : true ; # Needed for and maybe other stuff. -} - -{ - if $(TARGET_PLATFORM) = r5 { - defines = [ FDefines BUILDING_R5_LIBNET ] ; - SubDirCcFlags $(defines) ; - SubDirC++Flags $(defines) ; - PLATFORM_LIBS = ; - } else { - PLATFORM_LIBS = libsocket.so libbind.so ; - } +} else if $(TARGET_PLATFORM) = r5 { + defines = [ FDefines BUILDING_R5_LIBNET ] ; + SubDirCcFlags $(defines) ; + SubDirC++Flags $(defines) ; } SharedLibrary libnetapi.so : @@ -29,7 +22,7 @@ SharedLibrary libnetapi.so : NetAddress.cpp NetBuffer.cpp NetDebug.cpp - : be libnet.so $(PLATFORM_LIBS) + : be $(NETWORK_LIBS) ; # Installation -- in the test directory for the time being diff --git a/src/kits/network/old/compat/libnetapi/NetAddress.cpp b/src/kits/network/libnetapi/NetAddress.cpp similarity index 100% rename from src/kits/network/old/compat/libnetapi/NetAddress.cpp rename to src/kits/network/libnetapi/NetAddress.cpp diff --git a/src/kits/network/old/compat/libnetapi/NetBuffer.cpp b/src/kits/network/libnetapi/NetBuffer.cpp similarity index 100% rename from src/kits/network/old/compat/libnetapi/NetBuffer.cpp rename to src/kits/network/libnetapi/NetBuffer.cpp diff --git a/src/kits/network/old/compat/libnetapi/NetDebug.cpp b/src/kits/network/libnetapi/NetDebug.cpp similarity index 100% rename from src/kits/network/old/compat/libnetapi/NetDebug.cpp rename to src/kits/network/libnetapi/NetDebug.cpp diff --git a/src/kits/network/old/compat/libnetapi/NetEndpoint.cpp b/src/kits/network/libnetapi/NetEndpoint.cpp similarity index 100% rename from src/kits/network/old/compat/libnetapi/NetEndpoint.cpp rename to src/kits/network/libnetapi/NetEndpoint.cpp