From 7f601aefb45836336164f19eca92da64e5218cc0 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 24 Dec 2018 21:06:28 -0500 Subject: [PATCH] broadcom440x: Clean up Jamfiles. --- .../drivers/network/broadcom440x/Jamfile | 24 ++++++++++++++++++- .../drivers/network/broadcom440x/dev/Jamfile | 4 ---- .../network/broadcom440x/dev/bfe/Jamfile | 19 --------------- .../network/broadcom440x/dev/mii/Jamfile | 19 --------------- .../network/broadcom440x/{dev/bfe => }/glue.c | 0 5 files changed, 23 insertions(+), 43 deletions(-) delete mode 100644 src/add-ons/kernel/drivers/network/broadcom440x/dev/Jamfile delete mode 100644 src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/Jamfile delete mode 100644 src/add-ons/kernel/drivers/network/broadcom440x/dev/mii/Jamfile rename src/add-ons/kernel/drivers/network/broadcom440x/{dev/bfe => }/glue.c (100%) diff --git a/src/add-ons/kernel/drivers/network/broadcom440x/Jamfile b/src/add-ons/kernel/drivers/network/broadcom440x/Jamfile index e4776f7dd1..6983380d5f 100644 --- a/src/add-ons/kernel/drivers/network/broadcom440x/Jamfile +++ b/src/add-ons/kernel/drivers/network/broadcom440x/Jamfile @@ -1,3 +1,25 @@ SubDir HAIKU_TOP src add-ons kernel drivers network broadcom440x ; -SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom440x 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 bfe ] ; + +KernelAddon broadcom440x : + glue.c + bmtphy.c + if_bfe.c + : libfreebsd_network.a + ; + +ObjectHdrs [ FGristFiles bmtphy$(SUFOBJ) ] + : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs + compat freebsd_network ] ; +Includes [ FGristFiles bmtphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/broadcom440x/dev/Jamfile b/src/add-ons/kernel/drivers/network/broadcom440x/dev/Jamfile deleted file mode 100644 index 695ed1706d..0000000000 --- a/src/add-ons/kernel/drivers/network/broadcom440x/dev/Jamfile +++ /dev/null @@ -1,4 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network broadcom440x dev ; - -SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom440x dev bfe ; -SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom440x dev mii ; diff --git a/src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/Jamfile b/src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/Jamfile deleted file mode 100644 index 27b83e627e..0000000000 --- a/src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/Jamfile +++ /dev/null @@ -1,19 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network broadcom440x dev bfe ; - -UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; -UseHeaders [ FDirName $(SUBDIR) .. mii ] : true ; -UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; - -UsePrivateHeaders net system ; -UsePrivateKernelHeaders ; - -SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] - -Wno-format - ; - -KernelAddon broadcom440x : - if_bfe.c - glue.c - : broadcom440x_mii.a libfreebsd_network.a - ; - diff --git a/src/add-ons/kernel/drivers/network/broadcom440x/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/broadcom440x/dev/mii/Jamfile deleted file mode 100644 index ef06ef2265..0000000000 --- a/src/add-ons/kernel/drivers/network/broadcom440x/dev/mii/Jamfile +++ /dev/null @@ -1,19 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network broadcom440x 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 broadcom440x_mii.a - : - bmtphy.c - ; - -ObjectHdrs [ FGristFiles bmtphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; -Includes [ FGristFiles bmtphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/glue.c b/src/add-ons/kernel/drivers/network/broadcom440x/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/glue.c rename to src/add-ons/kernel/drivers/network/broadcom440x/glue.c