From 3592a2eba4f8041b310f152393932947eb1b0ae1 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 27 Dec 2018 14:11:53 -0500 Subject: [PATCH] vt612x: Clean up Jamfiles. --- .../kernel/drivers/network/vt612x/Jamfile | 26 ++++++++++++++++++- .../kernel/drivers/network/vt612x/dev/Jamfile | 4 --- .../drivers/network/vt612x/dev/mii/Jamfile | 22 ---------------- .../drivers/network/vt612x/dev/vge/Jamfile | 19 -------------- .../network/vt612x/{dev/vge => }/glue.c | 0 5 files changed, 25 insertions(+), 46 deletions(-) delete mode 100644 src/add-ons/kernel/drivers/network/vt612x/dev/Jamfile delete mode 100644 src/add-ons/kernel/drivers/network/vt612x/dev/mii/Jamfile delete mode 100644 src/add-ons/kernel/drivers/network/vt612x/dev/vge/Jamfile rename src/add-ons/kernel/drivers/network/vt612x/{dev/vge => }/glue.c (100%) diff --git a/src/add-ons/kernel/drivers/network/vt612x/Jamfile b/src/add-ons/kernel/drivers/network/vt612x/Jamfile index 9490443d85..f12e9f2e4d 100644 --- a/src/add-ons/kernel/drivers/network/vt612x/Jamfile +++ b/src/add-ons/kernel/drivers/network/vt612x/Jamfile @@ -1,3 +1,27 @@ SubDir HAIKU_TOP src add-ons kernel drivers network vt612x ; -SubInclude HAIKU_TOP src add-ons kernel drivers network vt612x 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 vge ] ; + +KernelAddon vt612x : + glue.c + ukphy.c + ukphy_subr.c + ciphy.c + if_vge.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/vt612x/dev/Jamfile b/src/add-ons/kernel/drivers/network/vt612x/dev/Jamfile deleted file mode 100644 index 3d84a77d4a..0000000000 --- a/src/add-ons/kernel/drivers/network/vt612x/dev/Jamfile +++ /dev/null @@ -1,4 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network vt612x dev ; - -SubInclude HAIKU_TOP src add-ons kernel drivers network vt612x dev mii ; -SubInclude HAIKU_TOP src add-ons kernel drivers network vt612x dev vge ; diff --git a/src/add-ons/kernel/drivers/network/vt612x/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/vt612x/dev/mii/Jamfile deleted file mode 100644 index 394fa38ff7..0000000000 --- a/src/add-ons/kernel/drivers/network/vt612x/dev/mii/Jamfile +++ /dev/null @@ -1,22 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network vt612x 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 vt612x_mii.a - : - ciphy.c - ukphy.c - ukphy_subr.c - ; - -ObjectHdrs [ FGristFiles ciphy$(SUFOBJ) ukphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; -Includes [ FGristFiles ciphy.c ukphy.c ] : miidevs.h ; - diff --git a/src/add-ons/kernel/drivers/network/vt612x/dev/vge/Jamfile b/src/add-ons/kernel/drivers/network/vt612x/dev/vge/Jamfile deleted file mode 100644 index 57b1541376..0000000000 --- a/src/add-ons/kernel/drivers/network/vt612x/dev/vge/Jamfile +++ /dev/null @@ -1,19 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network vt612x dev vge ; - -SubDirCcFlags -Wall ; - -UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; -UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network ] : true ; -UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; - -UsePrivateHeaders net system ; -UsePrivateKernelHeaders ; - -SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; - -KernelAddon vt612x : - if_vge.c - glue.c - : vt612x_mii.a libfreebsd_network.a - ; - diff --git a/src/add-ons/kernel/drivers/network/vt612x/dev/vge/glue.c b/src/add-ons/kernel/drivers/network/vt612x/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/vt612x/dev/vge/glue.c rename to src/add-ons/kernel/drivers/network/vt612x/glue.c