diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku index ee48d23a98..c1d354d33f 100644 --- a/build/jam/packages/Haiku +++ b/build/jam/packages/Haiku @@ -214,6 +214,8 @@ AddFilesToPackage add-ons mail_daemon outbound_filters : Fortune ; AddFilesToPackage add-ons media : $(SYSTEM_ADD_ONS_MEDIA) ; AddFilesToPackage add-ons media plugins : $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ; +AddFilesToPackage add-ons Network\ Setup : Interfaces Services ; + AddFilesToPackage add-ons Tracker : FileType Mark\ as… Mark\ as\ Read Open\ Target\ Folder Open\ Terminal ZipOMatic ; diff --git a/src/preferences/network/DialUpAddOn/Jamfile b/src/preferences/network/DialUpAddOn/Jamfile index f09486826a..e4360a13fa 100644 --- a/src/preferences/network/DialUpAddOn/Jamfile +++ b/src/preferences/network/DialUpAddOn/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src tests kits net preflet DialUpAddOn ; +SubDir HAIKU_TOP src preferences network DialUpAddOn ; # set some additional defines { @@ -15,7 +15,7 @@ SubDir HAIKU_TOP src tests kits net preflet DialUpAddOn ; UsePrivateHeaders net ; # For NetworkSetupAddOn.h, to be moved to private once... -UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src preferences network ] ; UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libppp headers ] ; UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ; diff --git a/src/preferences/network/DummyAddOn/Jamfile b/src/preferences/network/DummyAddOn/Jamfile index e33c93167a..957201466f 100644 --- a/src/preferences/network/DummyAddOn/Jamfile +++ b/src/preferences/network/DummyAddOn/Jamfile @@ -1,9 +1,9 @@ -SubDir HAIKU_TOP src tests kits net preflet DummyAddOn ; +SubDir HAIKU_TOP src preferences network DummyAddOn ; -UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src preferences network ] ; Addon Dummy : DummyAddOn.cpp - : be NetworkSetup [ TargetLibstdc++ ] # $(HAIKU_NETWORK_LIBS) + : be Network [ TargetLibstdc++ ] # $(HAIKU_NETWORK_LIBS) ; diff --git a/src/preferences/network/InterfacesAddOn/Jamfile b/src/preferences/network/InterfacesAddOn/Jamfile index c34720c062..c89a3c480c 100644 --- a/src/preferences/network/InterfacesAddOn/Jamfile +++ b/src/preferences/network/InterfacesAddOn/Jamfile @@ -1,8 +1,8 @@ -SubDir HAIKU_TOP src tests kits net preflet InterfacesAddOn ; +SubDir HAIKU_TOP src preferences network InterfacesAddOn ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src apps networkstatus ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src preferences network ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers net ] : true ; UsePrivateHeaders net shared ; @@ -26,7 +26,7 @@ Addon Interfaces : WirelessNetworkMenuItem.cpp : be - NetworkSetup + Network $(TARGET_NETWORK_LIBS) libbnetapi.so [ TargetLibsupc++ ] diff --git a/src/preferences/network/Jamfile b/src/preferences/network/Jamfile index 9a30b10374..03e87f4da7 100644 --- a/src/preferences/network/Jamfile +++ b/src/preferences/network/Jamfile @@ -1,7 +1,7 @@ -SubDir HAIKU_TOP src tests kits net preflet ; +SubDir HAIKU_TOP src preferences network ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src apps networkstatus ] ; -Preference NetworkSetup : +Preference Network : NetworkSetup.cpp NetworkSetupWindow.cpp NetworkSetupProfile.cpp @@ -15,8 +15,8 @@ Preference NetworkSetup : : NetworkSetup.rdef ; -SubInclude HAIKU_TOP src tests kits net preflet InterfacesAddOn ; -SubInclude HAIKU_TOP src tests kits net preflet ServicesAddOn ; -#SubInclude HAIKU_TOP src tests kits net preflet DummyAddOn ; -#SubInclude HAIKU_TOP src tests kits net preflet MultipleAddOns ; -#SubInclude HAIKU_TOP src tests kits net preflet DialUpAddOn ; +SubInclude HAIKU_TOP src preferences network InterfacesAddOn ; +SubInclude HAIKU_TOP src preferences network ServicesAddOn ; +#SubInclude HAIKU_TOP src preferences network DummyAddOn ; +#SubInclude HAIKU_TOP src preferences network MultipleAddOns ; +#SubInclude HAIKU_TOP src preferences network DialUpAddOn ; diff --git a/src/preferences/network/MultipleAddOns/Jamfile b/src/preferences/network/MultipleAddOns/Jamfile index 315589e370..a2809cc59e 100644 --- a/src/preferences/network/MultipleAddOns/Jamfile +++ b/src/preferences/network/MultipleAddOns/Jamfile @@ -1,9 +1,9 @@ -SubDir HAIKU_TOP src tests kits net preflet MultipleAddOns ; +SubDir HAIKU_TOP src preferences network MultipleAddOns ; -UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src preferences network ] ; Addon Multiple : MultipleAddOn.cpp - : be NetworkSetup [ TargetLibstdc++ ] # $(HAIKU_NETWORK_LIBS) + : be Network [ TargetLibstdc++ ] # $(HAIKU_NETWORK_LIBS) ; diff --git a/src/preferences/network/ServicesAddOn/Jamfile b/src/preferences/network/ServicesAddOn/Jamfile index a0dd33a601..c3fcb6cbfd 100644 --- a/src/preferences/network/ServicesAddOn/Jamfile +++ b/src/preferences/network/ServicesAddOn/Jamfile @@ -1,11 +1,11 @@ -SubDir HAIKU_TOP src tests kits net preflet ServicesAddOn ; +SubDir HAIKU_TOP src preferences network ServicesAddOn ; -UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src preferences network ] ; Addon Services : ServicesAddOn.cpp DNSSettingsView.cpp - : be NetworkSetup network [ TargetLibstdc++ ] + : be Network network [ TargetLibstdc++ ] ; diff --git a/src/tests/kits/net/Jamfile b/src/tests/kits/net/Jamfile index 25d5f3548b..c285db161a 100644 --- a/src/tests/kits/net/Jamfile +++ b/src/tests/kits/net/Jamfile @@ -39,7 +39,6 @@ SubInclude HAIKU_TOP src tests kits net ipv6 ; HaikuSubInclude libnetapi ; SubInclude HAIKU_TOP src tests kits net multicast ; SubInclude HAIKU_TOP src tests kits net netperf ; -SubInclude HAIKU_TOP src tests kits net preflet ; SubInclude HAIKU_TOP src tests kits net service ; SubInclude HAIKU_TOP src tests kits net sock ; SubInclude HAIKU_TOP src tests kits net tcp_shell ;