From 34b46b45482f2ffe7d1dc22f7b62543e4d35e367 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 27 Dec 2018 14:02:22 -0500 Subject: [PATCH] rtl8139: Clean up Jamfiles. --- .../kernel/drivers/network/rtl8139/Jamfile | 24 ++++++++++++++++++- .../drivers/network/rtl8139/dev/Jamfile | 4 ---- .../drivers/network/rtl8139/dev/mii/Jamfile | 19 --------------- .../drivers/network/rtl8139/dev/rl/Jamfile | 16 ------------- .../network/rtl8139/{dev/rl => }/glue.c | 0 5 files changed, 23 insertions(+), 40 deletions(-) delete mode 100644 src/add-ons/kernel/drivers/network/rtl8139/dev/Jamfile delete mode 100644 src/add-ons/kernel/drivers/network/rtl8139/dev/mii/Jamfile delete mode 100644 src/add-ons/kernel/drivers/network/rtl8139/dev/rl/Jamfile rename src/add-ons/kernel/drivers/network/rtl8139/{dev/rl => }/glue.c (100%) diff --git a/src/add-ons/kernel/drivers/network/rtl8139/Jamfile b/src/add-ons/kernel/drivers/network/rtl8139/Jamfile index 4e91dc9359..c392f09a51 100644 --- a/src/add-ons/kernel/drivers/network/rtl8139/Jamfile +++ b/src/add-ons/kernel/drivers/network/rtl8139/Jamfile @@ -1,3 +1,25 @@ SubDir HAIKU_TOP src add-ons kernel drivers network rtl8139 ; -HaikuSubInclude 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 rl ] ; + +KernelAddon rtl8139 : + glue.c + rlphy.c + if_rl.c + : libfreebsd_network.a + ; + +ObjectHdrs [ FGristFiles rlphy$(SUFOBJ) ] + : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs + compat freebsd_network ] ; +Includes [ FGristFiles rlphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/rtl8139/dev/Jamfile b/src/add-ons/kernel/drivers/network/rtl8139/dev/Jamfile deleted file mode 100644 index 3656dc3671..0000000000 --- a/src/add-ons/kernel/drivers/network/rtl8139/dev/Jamfile +++ /dev/null @@ -1,4 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network rtl8139 dev ; - -HaikuSubInclude mii ; -HaikuSubInclude rl ; diff --git a/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/Jamfile deleted file mode 100644 index d5cca5ff8d..0000000000 --- a/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/Jamfile +++ /dev/null @@ -1,19 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network rtl8139 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 rtl8139_mii.a : - rlphy.c -; - -ObjectHdrs [ FGristFiles rlphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; -Includes [ FGristFiles rlphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/rtl8139/dev/rl/Jamfile b/src/add-ons/kernel/drivers/network/rtl8139/dev/rl/Jamfile deleted file mode 100644 index 9b3aa1ec7a..0000000000 --- a/src/add-ons/kernel/drivers/network/rtl8139/dev/rl/Jamfile +++ /dev/null @@ -1,16 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network rtl8139 dev rl ; - -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 rtl8139 : - if_rl.c - glue.c - : rtl8139_mii.a libfreebsd_network.a - ; - diff --git a/src/add-ons/kernel/drivers/network/rtl8139/dev/rl/glue.c b/src/add-ons/kernel/drivers/network/rtl8139/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/rtl8139/dev/rl/glue.c rename to src/add-ons/kernel/drivers/network/rtl8139/glue.c