diff --git a/src/add-ons/network_settings/ftpd/Jamfile b/src/add-ons/network_settings/ftpd/Jamfile index b2b64b7aa6..ecf681a56c 100644 --- a/src/add-ons/network_settings/ftpd/Jamfile +++ b/src/add-ons/network_settings/ftpd/Jamfile @@ -2,12 +2,10 @@ SubDir HAIKU_TOP src add-ons network_settings ftpd ; UsePublicHeaders [ FDirName add-ons network_settings ] ; UsePrivateHeaders app libroot kernel net shared ; - -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons network_settings sshd ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src preferences network ] : false ; Addon FTPService : FTPServiceAddOn.cpp - ServiceView.cpp : be bnetapi libshared.a Network [ TargetLibsupc++ ] [ TargetLibstdc++ ] localestub @@ -15,5 +13,4 @@ Addon FTPService : DoCatalogs FTPService : x-vnd.Haiku-FTPService : FTPServiceAddOn.cpp - ServiceView.cpp ; diff --git a/src/add-ons/network_settings/ipv4/Jamfile b/src/add-ons/network_settings/ipv4/Jamfile index 884c0d4294..71fe78d4e4 100644 --- a/src/add-ons/network_settings/ipv4/Jamfile +++ b/src/add-ons/network_settings/ipv4/Jamfile @@ -6,7 +6,6 @@ UseHeaders [ FDirName $(HAIKU_TOP) src preferences network ] : false ; Addon IPv4Interface : IPv4InterfaceAddOn.cpp - InterfaceAddressView.cpp : be bnetapi libshared.a Network [ TargetLibsupc++ ] [ TargetLibstdc++ ] localestub @@ -14,5 +13,4 @@ Addon IPv4Interface : DoCatalogs IPv4Interface : x-vnd.Haiku-IPv4Interface : IPv4InterfaceAddOn.cpp - InterfaceAddressView.cpp ; diff --git a/src/add-ons/network_settings/ipv6/Jamfile b/src/add-ons/network_settings/ipv6/Jamfile index 787cba697f..4aa7e36b8e 100644 --- a/src/add-ons/network_settings/ipv6/Jamfile +++ b/src/add-ons/network_settings/ipv6/Jamfile @@ -8,7 +8,6 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons network_settings ipv4 ] ; Addon IPv6Interface : IPv6InterfaceAddOn.cpp - InterfaceAddressView.cpp : be bnetapi libshared.a Network [ TargetLibsupc++ ] [ TargetLibstdc++ ] localestub @@ -16,5 +15,4 @@ Addon IPv6Interface : DoCatalogs IPv6Interface : x-vnd.Haiku-IPv6Interface : IPv6InterfaceAddOn.cpp - InterfaceAddressView.cpp ; diff --git a/src/add-ons/network_settings/sshd/Jamfile b/src/add-ons/network_settings/sshd/Jamfile index 55e0dc1604..1868954f83 100644 --- a/src/add-ons/network_settings/sshd/Jamfile +++ b/src/add-ons/network_settings/sshd/Jamfile @@ -2,11 +2,10 @@ SubDir HAIKU_TOP src add-ons network_settings sshd ; UsePublicHeaders [ FDirName add-ons network_settings ] ; UsePrivateHeaders app libroot kernel net shared ; +UseHeaders [ FDirName $(HAIKU_TOP) src preferences network ] : false ; Addon SSHService : SSHServiceAddOn.cpp - ServiceListItem.cpp - ServiceView.cpp : be bnetapi libshared.a Network [ TargetLibsupc++ ] [ TargetLibstdc++ ] localestub @@ -14,6 +13,4 @@ Addon SSHService : DoCatalogs SSHService : x-vnd.Haiku-SSHService : SSHServiceAddOn.cpp - ServiceListItem.cpp - ServiceView.cpp ; diff --git a/src/add-ons/network_settings/telnetd/Jamfile b/src/add-ons/network_settings/telnetd/Jamfile index 7c8ea9b887..22fa137c99 100644 --- a/src/add-ons/network_settings/telnetd/Jamfile +++ b/src/add-ons/network_settings/telnetd/Jamfile @@ -2,12 +2,10 @@ SubDir HAIKU_TOP src add-ons network_settings telnetd ; UsePublicHeaders [ FDirName add-ons network_settings ] ; UsePrivateHeaders app libroot kernel net shared ; - -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons network_settings sshd ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src preferences network ] : false ; Addon TelnetService : TelnetServiceAddOn.cpp - ServiceView.cpp : be bnetapi libshared.a Network [ TargetLibsupc++ ] [ TargetLibstdc++ ] localestub @@ -15,5 +13,4 @@ Addon TelnetService : DoCatalogs TelnetService : x-vnd.Haiku-TelnetService : TelnetServiceAddOn.cpp - ServiceView.cpp ; diff --git a/src/add-ons/network_settings/ipv4/InterfaceAddressView.cpp b/src/preferences/network/InterfaceAddressView.cpp similarity index 100% rename from src/add-ons/network_settings/ipv4/InterfaceAddressView.cpp rename to src/preferences/network/InterfaceAddressView.cpp diff --git a/src/add-ons/network_settings/ipv4/InterfaceAddressView.h b/src/preferences/network/InterfaceAddressView.h similarity index 100% rename from src/add-ons/network_settings/ipv4/InterfaceAddressView.h rename to src/preferences/network/InterfaceAddressView.h diff --git a/src/preferences/network/Jamfile b/src/preferences/network/Jamfile index f844aabd36..f4a1db37ab 100644 --- a/src/preferences/network/Jamfile +++ b/src/preferences/network/Jamfile @@ -13,7 +13,12 @@ Preference Network : NetworkSettingsAddOn.cpp InterfaceListItem.cpp InterfaceView.cpp + + # Common functionality for add-ons IPAddressControl.cpp + InterfaceAddressView.cpp + ServiceListItem.cpp + ServiceView.cpp # from NetworkStatus RadioView.cpp @@ -35,4 +40,8 @@ DoCatalogs Network : NetworkSettingsAddOn.cpp RadioView.cpp WirelessNetworkMenuItem.cpp + + InterfaceAddressView.cpp + ServiceListItem.cpp + ServiceView.cpp ; diff --git a/src/add-ons/network_settings/sshd/ServiceListItem.cpp b/src/preferences/network/ServiceListItem.cpp similarity index 100% rename from src/add-ons/network_settings/sshd/ServiceListItem.cpp rename to src/preferences/network/ServiceListItem.cpp diff --git a/src/add-ons/network_settings/sshd/ServiceListItem.h b/src/preferences/network/ServiceListItem.h similarity index 100% rename from src/add-ons/network_settings/sshd/ServiceListItem.h rename to src/preferences/network/ServiceListItem.h diff --git a/src/add-ons/network_settings/sshd/ServiceView.cpp b/src/preferences/network/ServiceView.cpp similarity index 100% rename from src/add-ons/network_settings/sshd/ServiceView.cpp rename to src/preferences/network/ServiceView.cpp diff --git a/src/add-ons/network_settings/sshd/ServiceView.h b/src/preferences/network/ServiceView.h similarity index 100% rename from src/add-ons/network_settings/sshd/ServiceView.h rename to src/preferences/network/ServiceView.h