diff --git a/src/add-ons/kernel/drivers/network/rdc/Jamfile b/src/add-ons/kernel/drivers/network/rdc/Jamfile index 1e4efab397..c400097c22 100644 --- a/src/add-ons/kernel/drivers/network/rdc/Jamfile +++ b/src/add-ons/kernel/drivers/network/rdc/Jamfile @@ -1,3 +1,25 @@ SubDir HAIKU_TOP src add-ons kernel drivers network rdc ; -SubInclude HAIKU_TOP src add-ons kernel drivers network rdc 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 vte ] ; + +KernelAddon rdc : + glue.c + rdcphy.c + if_vte.c + : libfreebsd_network.a + ; + +ObjectHdrs [ FGristFiles rdcphy$(SUFOBJ) ] + : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs + compat freebsd_network ] ; +Includes [ FGristFiles rdcphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/rdc/dev/Jamfile b/src/add-ons/kernel/drivers/network/rdc/dev/Jamfile deleted file mode 100644 index 66483d3554..0000000000 --- a/src/add-ons/kernel/drivers/network/rdc/dev/Jamfile +++ /dev/null @@ -1,5 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network rdc dev ; - -SubInclude HAIKU_TOP src add-ons kernel drivers network rdc dev mii ; -SubInclude HAIKU_TOP src add-ons kernel drivers network rdc dev vte ; - diff --git a/src/add-ons/kernel/drivers/network/rdc/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/rdc/dev/mii/Jamfile deleted file mode 100644 index ebbbf7434d..0000000000 --- a/src/add-ons/kernel/drivers/network/rdc/dev/mii/Jamfile +++ /dev/null @@ -1,19 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network rdc dev mii ; - -UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; -UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; - -UsePrivateHeaders net ; -UsePrivateKernelHeaders ; - -SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; - -KernelStaticLibrary rdc_mii.a - : - rdcphy.c - ; - -ObjectHdrs [ FGristFiles rdcphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; -Includes [ FGristFiles rdcphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/rdc/dev/vte/Jamfile b/src/add-ons/kernel/drivers/network/rdc/dev/vte/Jamfile deleted file mode 100644 index a1b59e920c..0000000000 --- a/src/add-ons/kernel/drivers/network/rdc/dev/vte/Jamfile +++ /dev/null @@ -1,15 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network rdc dev vte ; - -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 rdc : - if_vte.c - glue.c - : rdc_mii.a libfreebsd_network.a - ; diff --git a/src/add-ons/kernel/drivers/network/rdc/dev/vte/glue.c b/src/add-ons/kernel/drivers/network/rdc/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/rdc/dev/vte/glue.c rename to src/add-ons/kernel/drivers/network/rdc/glue.c