From 9b7ef995994632d6fea18e1bc819c53ea1ad64f1 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 27 Dec 2018 14:09:35 -0500 Subject: [PATCH] syskonnect: Clean up Jamfiles. --- .../kernel/drivers/network/syskonnect/Jamfile | 27 ++++++++++++++++++- .../drivers/network/syskonnect/dev/Jamfile | 4 --- .../network/syskonnect/dev/mii/Jamfile | 24 ----------------- .../drivers/network/syskonnect/dev/sk/Jamfile | 15 ----------- .../network/syskonnect/{dev/sk => }/glue.c | 0 5 files changed, 26 insertions(+), 44 deletions(-) delete mode 100644 src/add-ons/kernel/drivers/network/syskonnect/dev/Jamfile delete mode 100644 src/add-ons/kernel/drivers/network/syskonnect/dev/mii/Jamfile delete mode 100644 src/add-ons/kernel/drivers/network/syskonnect/dev/sk/Jamfile rename src/add-ons/kernel/drivers/network/syskonnect/{dev/sk => }/glue.c (100%) diff --git a/src/add-ons/kernel/drivers/network/syskonnect/Jamfile b/src/add-ons/kernel/drivers/network/syskonnect/Jamfile index a21973d2e4..b5e1db2f24 100644 --- a/src/add-ons/kernel/drivers/network/syskonnect/Jamfile +++ b/src/add-ons/kernel/drivers/network/syskonnect/Jamfile @@ -1,3 +1,28 @@ SubDir HAIKU_TOP src add-ons kernel drivers network syskonnect ; -SubInclude HAIKU_TOP src add-ons kernel drivers network syskonnect 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 sk ] ; + +KernelAddon syskonnect : + glue.c + e1000phy.c + xmphy.c + ukphy.c + ukphy_subr.c + if_sk.c + : libfreebsd_network.a + ; + +ObjectHdrs [ FGristFiles e1000phy$(SUFOBJ) xmphy$(SUFOBJ) ukphy$(SUFOBJ) ] + : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs + compat freebsd_network ] ; +Includes [ FGristFiles e1000phy.c xmphy.c ukphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/Jamfile b/src/add-ons/kernel/drivers/network/syskonnect/dev/Jamfile deleted file mode 100644 index ea9845d7a5..0000000000 --- a/src/add-ons/kernel/drivers/network/syskonnect/dev/Jamfile +++ /dev/null @@ -1,4 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network syskonnect dev ; - -SubInclude HAIKU_TOP src add-ons kernel drivers network syskonnect dev mii ; -SubInclude HAIKU_TOP src add-ons kernel drivers network syskonnect dev sk ; diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/Jamfile deleted file mode 100644 index 68fd0ce984..0000000000 --- a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/Jamfile +++ /dev/null @@ -1,24 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network syskonnect 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 syskonnect_mii.a - : - xmphy.c - e1000phy.c - ukphy.c - ukphy_subr.c - ; - -ObjectHdrs [ FGristFiles e1000phy$(SUFOBJ) ukphy$(SUFOBJ) xmphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; -Includes [ FGristFiles e1000phy.c ukphy.c xmphy.c ] - : miidevs.h ; - diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/Jamfile b/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/Jamfile deleted file mode 100644 index 29cdcf34a3..0000000000 --- a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/Jamfile +++ /dev/null @@ -1,15 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network syskonnect dev sk ; - -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 syskonnect : - if_sk.c - glue.c - : syskonnect_mii.a libfreebsd_network.a - ; diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/glue.c b/src/add-ons/kernel/drivers/network/syskonnect/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/syskonnect/dev/sk/glue.c rename to src/add-ons/kernel/drivers/network/syskonnect/glue.c