From cb5334b37b42b02b59deed2c2dc89ffda23f101a Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 27 Dec 2018 13:24:00 -0500 Subject: [PATCH] pcnet: Clean up Jamfiles. --- .../kernel/drivers/network/pcnet/Jamfile | 34 ++++++++++++++++++- .../kernel/drivers/network/pcnet/dev/Jamfile | 5 --- .../drivers/network/pcnet/dev/le/Jamfile | 19 ----------- .../drivers/network/pcnet/dev/mii/Jamfile | 23 ------------- .../drivers/network/pcnet/dev/pcn/Jamfile | 15 -------- .../drivers/network/pcnet/{dev/le => }/glue.c | 0 .../pcnet/{dev/pcn/glue.c => glue_pcn.c} | 0 7 files changed, 33 insertions(+), 63 deletions(-) delete mode 100644 src/add-ons/kernel/drivers/network/pcnet/dev/Jamfile delete mode 100644 src/add-ons/kernel/drivers/network/pcnet/dev/le/Jamfile delete mode 100644 src/add-ons/kernel/drivers/network/pcnet/dev/mii/Jamfile delete mode 100644 src/add-ons/kernel/drivers/network/pcnet/dev/pcn/Jamfile rename src/add-ons/kernel/drivers/network/pcnet/{dev/le => }/glue.c (100%) rename src/add-ons/kernel/drivers/network/pcnet/{dev/pcn/glue.c => glue_pcn.c} (100%) diff --git a/src/add-ons/kernel/drivers/network/pcnet/Jamfile b/src/add-ons/kernel/drivers/network/pcnet/Jamfile index 0b0ce8c5a2..92f0fcdd9f 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/Jamfile +++ b/src/add-ons/kernel/drivers/network/pcnet/Jamfile @@ -1,3 +1,35 @@ SubDir HAIKU_TOP src add-ons kernel drivers network pcnet ; -SubInclude HAIKU_TOP src add-ons kernel drivers network pcnet dev ; +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 _XOPEN_SOURCE ] ; + +UseHeaders [ FDirName $(SUBDIR) ] : true ; + +SEARCH_SOURCE += [ FDirName $(SUBDIR) dev mii ] ; +SEARCH_SOURCE += [ FDirName $(SUBDIR) dev pcn ] ; +SEARCH_SOURCE += [ FDirName $(SUBDIR) dev le ] ; + +KernelAddon pcnet : + glue.c + glue_pcn.c + ukphy.c + ukphy_subr.c + nsphy.c + nsphyter.c + if_pcn.c + if_le_pci.c + am7990.c + am79900.c + lance.c + : libfreebsd_network.a + ; + +ObjectHdrs [ FGristFiles ukphy$(SUFOBJ) nsphy$(SUFOBJ) nsphyter$(SUFOBJ) ] + : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs + compat freebsd_network ] ; +Includes [ FGristFiles ukphy.c nsphy.c nsphyter.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/Jamfile b/src/add-ons/kernel/drivers/network/pcnet/dev/Jamfile deleted file mode 100644 index 7dc10711ba..0000000000 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/Jamfile +++ /dev/null @@ -1,5 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network pcnet dev ; - -SubInclude HAIKU_TOP src add-ons kernel drivers network pcnet dev le ; -SubInclude HAIKU_TOP src add-ons kernel drivers network pcnet dev mii ; -SubInclude HAIKU_TOP src add-ons kernel drivers network pcnet dev pcn ; diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/Jamfile b/src/add-ons/kernel/drivers/network/pcnet/dev/le/Jamfile deleted file mode 100644 index 102571ef23..0000000000 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/le/Jamfile +++ /dev/null @@ -1,19 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network pcnet dev le ; - -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 pcnet : - am7990.c - am79900.c - if_le_pci.c - lance.c - glue.c - : pcnet_pcn.a pcnet_mii.a libfreebsd_network.a - ; diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/pcnet/dev/mii/Jamfile deleted file mode 100644 index 00cd28b6bb..0000000000 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/Jamfile +++ /dev/null @@ -1,23 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network pcnet 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 pcnet_mii.a - : - nsphy.c - nsphyter.c - ukphy.c - ukphy_subr.c - ; - -ObjectHdrs [ FGristFiles nsphy$(SUFOBJ) nsphyter$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; -Includes [ FGristFiles nsphy.c nsphyter.c ] - : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/pcn/Jamfile b/src/add-ons/kernel/drivers/network/pcnet/dev/pcn/Jamfile deleted file mode 100644 index c99ef08899..0000000000 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/pcn/Jamfile +++ /dev/null @@ -1,15 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network pcnet dev pcn ; - -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 _XOPEN_SOURCE ] ; - -KernelStaticLibrary pcnet_pcn.a - : - if_pcn.c - glue.c - ; diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/glue.c b/src/add-ons/kernel/drivers/network/pcnet/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/le/glue.c rename to src/add-ons/kernel/drivers/network/pcnet/glue.c diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/pcn/glue.c b/src/add-ons/kernel/drivers/network/pcnet/glue_pcn.c similarity index 100% rename from src/add-ons/kernel/drivers/network/pcnet/dev/pcn/glue.c rename to src/add-ons/kernel/drivers/network/pcnet/glue_pcn.c