diff --git a/src/add-ons/kernel/drivers/network/ar81xx/Jamfile b/src/add-ons/kernel/drivers/network/ar81xx/Jamfile index dcaafa05a3..8846f9198a 100644 --- a/src/add-ons/kernel/drivers/network/ar81xx/Jamfile +++ b/src/add-ons/kernel/drivers/network/ar81xx/Jamfile @@ -1,3 +1,26 @@ SubDir HAIKU_TOP src add-ons kernel drivers network ar81xx ; -SubInclude HAIKU_TOP src add-ons kernel drivers network ar81xx dev ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] + : true ; +UsePrivateHeaders net system ; +UsePrivateKernelHeaders ; + +SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; + +UseHeaders [ FDirName $(SUBDIR) ] : true ; + +SEARCH_SOURCE += [ FDirName $(SUBDIR) dev mii ] ; +SEARCH_SOURCE += [ FDirName $(SUBDIR) dev ale ] ; + +KernelAddon ar81xx : + glue.c + ukphy.c + ukphy_subr.c + if_ale.c + : libfreebsd_network.a + ; + +ObjectHdrs [ FGristFiles ukphy$(SUFOBJ) ] + : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs + compat freebsd_network ] ; +Includes [ FGristFiles ukphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/ar81xx/dev/Jamfile b/src/add-ons/kernel/drivers/network/ar81xx/dev/Jamfile deleted file mode 100644 index 9ed65250dd..0000000000 --- a/src/add-ons/kernel/drivers/network/ar81xx/dev/Jamfile +++ /dev/null @@ -1,5 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network ar81xx dev ; - -SubInclude HAIKU_TOP src add-ons kernel drivers network ar81xx dev mii ; -SubInclude HAIKU_TOP src add-ons kernel drivers network ar81xx dev ale ; - diff --git a/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/Jamfile b/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/Jamfile deleted file mode 100644 index 2d30c1b28b..0000000000 --- a/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/Jamfile +++ /dev/null @@ -1,15 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network ar81xx dev ale ; - -UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; -UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; - -UsePrivateHeaders net system ; -UsePrivateKernelHeaders ; - -SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; - -KernelAddon ar81xx : - if_ale.c - glue.c - : ar81xx_mii.a libfreebsd_network.a - ; diff --git a/src/add-ons/kernel/drivers/network/ar81xx/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/ar81xx/dev/mii/Jamfile deleted file mode 100644 index 896c8b79e7..0000000000 --- a/src/add-ons/kernel/drivers/network/ar81xx/dev/mii/Jamfile +++ /dev/null @@ -1,16 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network ar81xx dev mii ; - -UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; -UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; - -UsePrivateHeaders net system ; -UsePrivateKernelHeaders ; - -SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; - -KernelStaticLibrary ar81xx_mii.a - : - ukphy.c - ukphy_subr.c - ; - diff --git a/src/add-ons/kernel/drivers/network/ar81xx/dev/ale/glue.c b/src/add-ons/kernel/drivers/network/ar81xx/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ar81xx/dev/ale/glue.c rename to src/add-ons/kernel/drivers/network/ar81xx/glue.c