From 48ce31d137c29615f71dd3e7ad399140f1c55dc1 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 24 Dec 2018 20:06:24 -0500 Subject: [PATCH] attansic_l1: Clean up Jamfiles. --- .../drivers/network/attansic_l1/Jamfile | 24 ++++++++++++++++++- .../drivers/network/attansic_l1/dev/Jamfile | 4 ---- .../network/attansic_l1/dev/age/Jamfile | 15 ------------ .../network/attansic_l1/dev/mii/Jamfile | 20 ---------------- .../network/attansic_l1/{dev/age => }/glue.c | 0 5 files changed, 23 insertions(+), 40 deletions(-) delete mode 100644 src/add-ons/kernel/drivers/network/attansic_l1/dev/Jamfile delete mode 100644 src/add-ons/kernel/drivers/network/attansic_l1/dev/age/Jamfile delete mode 100644 src/add-ons/kernel/drivers/network/attansic_l1/dev/mii/Jamfile rename src/add-ons/kernel/drivers/network/attansic_l1/{dev/age => }/glue.c (100%) diff --git a/src/add-ons/kernel/drivers/network/attansic_l1/Jamfile b/src/add-ons/kernel/drivers/network/attansic_l1/Jamfile index c818b274fb..39587d85d2 100644 --- a/src/add-ons/kernel/drivers/network/attansic_l1/Jamfile +++ b/src/add-ons/kernel/drivers/network/attansic_l1/Jamfile @@ -1,3 +1,25 @@ SubDir HAIKU_TOP src add-ons kernel drivers network attansic_l1 ; -SubInclude HAIKU_TOP src add-ons kernel drivers network attansic_l1 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 age ] ; + +KernelAddon attansic_l1 : + glue.c + atphy.c + if_age.c + : libfreebsd_network.a + ; + +ObjectHdrs [ FGristFiles atphy$(SUFOBJ) ] + : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs + compat freebsd_network ] ; +Includes [ FGristFiles atphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/attansic_l1/dev/Jamfile b/src/add-ons/kernel/drivers/network/attansic_l1/dev/Jamfile deleted file mode 100644 index d60cd22a3c..0000000000 --- a/src/add-ons/kernel/drivers/network/attansic_l1/dev/Jamfile +++ /dev/null @@ -1,4 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network attansic_l1 dev ; - -SubInclude HAIKU_TOP src add-ons kernel drivers network attansic_l1 dev mii ; -SubInclude HAIKU_TOP src add-ons kernel drivers network attansic_l1 dev age ; diff --git a/src/add-ons/kernel/drivers/network/attansic_l1/dev/age/Jamfile b/src/add-ons/kernel/drivers/network/attansic_l1/dev/age/Jamfile deleted file mode 100644 index e289febfaa..0000000000 --- a/src/add-ons/kernel/drivers/network/attansic_l1/dev/age/Jamfile +++ /dev/null @@ -1,15 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network attansic_l1 dev age ; - -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 attansic_l1 : - if_age.c - glue.c - : atl1_mii.a libfreebsd_network.a - ; diff --git a/src/add-ons/kernel/drivers/network/attansic_l1/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/attansic_l1/dev/mii/Jamfile deleted file mode 100644 index f704fd1d3c..0000000000 --- a/src/add-ons/kernel/drivers/network/attansic_l1/dev/mii/Jamfile +++ /dev/null @@ -1,20 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network attansic_l1 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 atl1_mii.a - : - atphy.c - ; - -ObjectHdrs [ FGristFiles atphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; -Includes [ FGristFiles atphy.c ] - : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/attansic_l1/dev/age/glue.c b/src/add-ons/kernel/drivers/network/attansic_l1/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/attansic_l1/dev/age/glue.c rename to src/add-ons/kernel/drivers/network/attansic_l1/glue.c