From 148d1b2c697c57af9e8fa17ce00771e767400068 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 27 Dec 2018 13:23:49 -0500 Subject: [PATCH] nforce: Clean up Jamfiles. --- .../kernel/drivers/network/nforce/Jamfile | 26 ++++++++++++++++++- .../kernel/drivers/network/nforce/dev/Jamfile | 4 --- .../drivers/network/nforce/dev/mii/Jamfile | 21 --------------- .../drivers/network/nforce/dev/nfe/Jamfile | 16 ------------ .../network/nforce/{dev/nfe => }/glue.c | 0 5 files changed, 25 insertions(+), 42 deletions(-) delete mode 100644 src/add-ons/kernel/drivers/network/nforce/dev/Jamfile delete mode 100644 src/add-ons/kernel/drivers/network/nforce/dev/mii/Jamfile delete mode 100644 src/add-ons/kernel/drivers/network/nforce/dev/nfe/Jamfile rename src/add-ons/kernel/drivers/network/nforce/{dev/nfe => }/glue.c (100%) diff --git a/src/add-ons/kernel/drivers/network/nforce/Jamfile b/src/add-ons/kernel/drivers/network/nforce/Jamfile index 4510eae910..5c797a4a84 100644 --- a/src/add-ons/kernel/drivers/network/nforce/Jamfile +++ b/src/add-ons/kernel/drivers/network/nforce/Jamfile @@ -1,3 +1,27 @@ SubDir HAIKU_TOP src add-ons kernel drivers network nforce ; -SubInclude HAIKU_TOP src add-ons kernel drivers network nforce 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 nfe ] ; + +KernelAddon nforce : + glue.c + ukphy.c + ukphy_subr.c + ciphy.c + if_nfe.c + : libfreebsd_network.a + ; + +ObjectHdrs [ FGristFiles ukphy$(SUFOBJ) ciphy$(SUFOBJ) ] + : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs + compat freebsd_network ] ; +Includes [ FGristFiles ukphy.c ciphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/Jamfile b/src/add-ons/kernel/drivers/network/nforce/dev/Jamfile deleted file mode 100644 index 2e896d5050..0000000000 --- a/src/add-ons/kernel/drivers/network/nforce/dev/Jamfile +++ /dev/null @@ -1,4 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network nforce dev ; - -SubInclude HAIKU_TOP src add-ons kernel drivers network nforce dev mii ; -SubInclude HAIKU_TOP src add-ons kernel drivers network nforce dev nfe ; diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/nforce/dev/mii/Jamfile deleted file mode 100644 index ab18fbad60..0000000000 --- a/src/add-ons/kernel/drivers/network/nforce/dev/mii/Jamfile +++ /dev/null @@ -1,21 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network nforce 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 nforce_mii.a - : - ciphy.c - ukphy.c - ukphy_subr.c - ; - -ObjectHdrs [ FGristFiles ciphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; -Includes [ FGristFiles ciphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/nfe/Jamfile b/src/add-ons/kernel/drivers/network/nforce/dev/nfe/Jamfile deleted file mode 100644 index bef39f521e..0000000000 --- a/src/add-ons/kernel/drivers/network/nforce/dev/nfe/Jamfile +++ /dev/null @@ -1,16 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network nforce dev nfe ; - -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 ] ; - -KernelAddon nforce : - if_nfe.c - - glue.c - : nforce_mii.a libfreebsd_network.a - ; diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/nfe/glue.c b/src/add-ons/kernel/drivers/network/nforce/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/nforce/dev/nfe/glue.c rename to src/add-ons/kernel/drivers/network/nforce/glue.c