From ec295973453242cd320842ee09f34bfa8e38f434 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 30 Sep 2021 17:42:36 -0400 Subject: [PATCH] freebsd_network: Put MII and USB headers in the common generated directory. They are not in any way architecture-specific. Simplifies the various driver Jamfiles. This also paves the way for some upcoming changes that make the kernel always be built with the non-legacy GCC... --- src/add-ons/kernel/drivers/network/3com/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/ar81xx/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/atheros813x/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/attansic_l1/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/attansic_l2/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/broadcom440x/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/broadcom570x/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/dec21xxx/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/ipro100/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/jmicron2x0/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/marvell_yukon/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/nforce/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/pcnet/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/pegasus/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/rdc/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/rtl8139/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/rtl81xx/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/sis19x/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/sis900/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/syskonnect/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/via_rhine/Jamfile | 3 +-- src/add-ons/kernel/drivers/network/vt612x/Jamfile | 3 +-- src/libs/compat/freebsd_network/Jamfile | 4 ++-- 23 files changed, 24 insertions(+), 46 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/3com/Jamfile b/src/add-ons/kernel/drivers/network/3com/Jamfile index 681607256d..9bf2f7bfca 100644 --- a/src/add-ons/kernel/drivers/network/3com/Jamfile +++ b/src/add-ons/kernel/drivers/network/3com/Jamfile @@ -23,7 +23,6 @@ KernelAddon 3com : ; ObjectHdrs [ FGristFiles bmtphy$(SUFOBJ) ukphy$(SUFOBJ) xlphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles bmtphy.c ukphy.c xlphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/ar81xx/Jamfile b/src/add-ons/kernel/drivers/network/ar81xx/Jamfile index 8846f9198a..e5d6ca5e74 100644 --- a/src/add-ons/kernel/drivers/network/ar81xx/Jamfile +++ b/src/add-ons/kernel/drivers/network/ar81xx/Jamfile @@ -21,6 +21,5 @@ KernelAddon ar81xx : ; ObjectHdrs [ FGristFiles ukphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles ukphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/atheros813x/Jamfile b/src/add-ons/kernel/drivers/network/atheros813x/Jamfile index e22a0e9d50..7858b17e42 100644 --- a/src/add-ons/kernel/drivers/network/atheros813x/Jamfile +++ b/src/add-ons/kernel/drivers/network/atheros813x/Jamfile @@ -21,6 +21,5 @@ KernelAddon atheros813x : ; ObjectHdrs [ FGristFiles ukphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles ukphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/attansic_l1/Jamfile b/src/add-ons/kernel/drivers/network/attansic_l1/Jamfile index 39587d85d2..416ed56592 100644 --- a/src/add-ons/kernel/drivers/network/attansic_l1/Jamfile +++ b/src/add-ons/kernel/drivers/network/attansic_l1/Jamfile @@ -20,6 +20,5 @@ KernelAddon attansic_l1 : ; ObjectHdrs [ FGristFiles atphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles atphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/attansic_l2/Jamfile b/src/add-ons/kernel/drivers/network/attansic_l2/Jamfile index 336e5f8577..3f8136bf55 100644 --- a/src/add-ons/kernel/drivers/network/attansic_l2/Jamfile +++ b/src/add-ons/kernel/drivers/network/attansic_l2/Jamfile @@ -21,6 +21,5 @@ KernelAddon attansic_l2 : ; ObjectHdrs [ FGristFiles ukphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles ukphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/broadcom440x/Jamfile b/src/add-ons/kernel/drivers/network/broadcom440x/Jamfile index 6983380d5f..ef673be2ae 100644 --- a/src/add-ons/kernel/drivers/network/broadcom440x/Jamfile +++ b/src/add-ons/kernel/drivers/network/broadcom440x/Jamfile @@ -20,6 +20,5 @@ KernelAddon broadcom440x : ; ObjectHdrs [ FGristFiles bmtphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles bmtphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/Jamfile b/src/add-ons/kernel/drivers/network/broadcom570x/Jamfile index 76db5bf4a0..57a3b83d0b 100644 --- a/src/add-ons/kernel/drivers/network/broadcom570x/Jamfile +++ b/src/add-ons/kernel/drivers/network/broadcom570x/Jamfile @@ -23,6 +23,5 @@ KernelAddon broadcom570x : ; ObjectHdrs [ FGristFiles brgphy$(SUFOBJ) ukphy$(SUFOBJ) if_bge$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles brgphy.c ukphy.c if_bge.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/dec21xxx/Jamfile b/src/add-ons/kernel/drivers/network/dec21xxx/Jamfile index 5f9a4d64f1..3701ba3b41 100644 --- a/src/add-ons/kernel/drivers/network/dec21xxx/Jamfile +++ b/src/add-ons/kernel/drivers/network/dec21xxx/Jamfile @@ -30,7 +30,6 @@ KernelAddon dec21xxx : ObjectHdrs [ FGristFiles dcphy$(SUFOBJ) pnphy$(SUFOBJ) if_de$(SUFOBJ) acphy$(SUFOBJ) amphy$(SUFOBJ) ukphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles dcphy.c pnphy.c acphy.c amphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/ipro100/Jamfile b/src/add-ons/kernel/drivers/network/ipro100/Jamfile index 6b4d700336..c29aa66e3c 100644 --- a/src/add-ons/kernel/drivers/network/ipro100/Jamfile +++ b/src/add-ons/kernel/drivers/network/ipro100/Jamfile @@ -19,6 +19,5 @@ KernelAddon ipro100 : ; ObjectHdrs [ FGristFiles inphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles inphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/jmicron2x0/Jamfile b/src/add-ons/kernel/drivers/network/jmicron2x0/Jamfile index 66ba2f5b37..40f3cd4062 100644 --- a/src/add-ons/kernel/drivers/network/jmicron2x0/Jamfile +++ b/src/add-ons/kernel/drivers/network/jmicron2x0/Jamfile @@ -20,6 +20,5 @@ KernelAddon jmicron2x0 : ; ObjectHdrs [ FGristFiles jmphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles jmphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/Jamfile b/src/add-ons/kernel/drivers/network/marvell_yukon/Jamfile index 1b5dfa2090..a49c8a04c3 100644 --- a/src/add-ons/kernel/drivers/network/marvell_yukon/Jamfile +++ b/src/add-ons/kernel/drivers/network/marvell_yukon/Jamfile @@ -22,6 +22,5 @@ KernelAddon marvell_yukon : ; ObjectHdrs [ FGristFiles ukphy$(SUFOBJ) e1000phy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles ukphy.c e1000phy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/nforce/Jamfile b/src/add-ons/kernel/drivers/network/nforce/Jamfile index 5c797a4a84..57df79681c 100644 --- a/src/add-ons/kernel/drivers/network/nforce/Jamfile +++ b/src/add-ons/kernel/drivers/network/nforce/Jamfile @@ -22,6 +22,5 @@ KernelAddon nforce : ; ObjectHdrs [ FGristFiles ukphy$(SUFOBJ) ciphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles ukphy.c ciphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/pcnet/Jamfile b/src/add-ons/kernel/drivers/network/pcnet/Jamfile index 92f0fcdd9f..902d8c5fa3 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/Jamfile +++ b/src/add-ons/kernel/drivers/network/pcnet/Jamfile @@ -30,6 +30,5 @@ KernelAddon pcnet : ; ObjectHdrs [ FGristFiles ukphy$(SUFOBJ) nsphy$(SUFOBJ) nsphyter$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles ukphy.c nsphy.c nsphyter.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/pegasus/Jamfile b/src/add-ons/kernel/drivers/network/pegasus/Jamfile index edb2516a54..d517db7339 100644 --- a/src/add-ons/kernel/drivers/network/pegasus/Jamfile +++ b/src/add-ons/kernel/drivers/network/pegasus/Jamfile @@ -12,6 +12,5 @@ KernelAddon pegasus : ; ObjectHdrs [ FGristFiles driver$(SUFOBJ) if_aue$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles driver.c if_aue.c ] : usbdevs.h ; diff --git a/src/add-ons/kernel/drivers/network/rdc/Jamfile b/src/add-ons/kernel/drivers/network/rdc/Jamfile index c400097c22..1501a6199c 100644 --- a/src/add-ons/kernel/drivers/network/rdc/Jamfile +++ b/src/add-ons/kernel/drivers/network/rdc/Jamfile @@ -20,6 +20,5 @@ KernelAddon rdc : ; ObjectHdrs [ FGristFiles rdcphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles rdcphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/rtl8139/Jamfile b/src/add-ons/kernel/drivers/network/rtl8139/Jamfile index c392f09a51..b183cb2108 100644 --- a/src/add-ons/kernel/drivers/network/rtl8139/Jamfile +++ b/src/add-ons/kernel/drivers/network/rtl8139/Jamfile @@ -20,6 +20,5 @@ KernelAddon rtl8139 : ; ObjectHdrs [ FGristFiles rlphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles rlphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/rtl81xx/Jamfile b/src/add-ons/kernel/drivers/network/rtl81xx/Jamfile index a76ce49072..9e88e08d11 100644 --- a/src/add-ons/kernel/drivers/network/rtl81xx/Jamfile +++ b/src/add-ons/kernel/drivers/network/rtl81xx/Jamfile @@ -21,6 +21,5 @@ KernelAddon rtl81xx : ; ObjectHdrs [ FGristFiles rgephy$(SUFOBJ) rlphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles rgephy.c rlphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/sis19x/Jamfile b/src/add-ons/kernel/drivers/network/sis19x/Jamfile index 9eb4957f45..b9817429ef 100644 --- a/src/add-ons/kernel/drivers/network/sis19x/Jamfile +++ b/src/add-ons/kernel/drivers/network/sis19x/Jamfile @@ -21,6 +21,5 @@ KernelAddon sis19x : ; ObjectHdrs [ FGristFiles icsphy$(SUFOBJ) nsphyter$(SUFOBJ) ukphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles icsphy.c nsphyter.c ukphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/sis900/Jamfile b/src/add-ons/kernel/drivers/network/sis900/Jamfile index 6609dabfcb..6499aebdaa 100644 --- a/src/add-ons/kernel/drivers/network/sis900/Jamfile +++ b/src/add-ons/kernel/drivers/network/sis900/Jamfile @@ -23,6 +23,5 @@ KernelAddon sis900 : ; ObjectHdrs [ FGristFiles icsphy$(SUFOBJ) nsphyter$(SUFOBJ) ukphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles icsphy.c nsphyter.c ukphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/syskonnect/Jamfile b/src/add-ons/kernel/drivers/network/syskonnect/Jamfile index b5e1db2f24..c52db1ac6e 100644 --- a/src/add-ons/kernel/drivers/network/syskonnect/Jamfile +++ b/src/add-ons/kernel/drivers/network/syskonnect/Jamfile @@ -23,6 +23,5 @@ KernelAddon syskonnect : ; ObjectHdrs [ FGristFiles e1000phy$(SUFOBJ) xmphy$(SUFOBJ) ukphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles e1000phy.c xmphy.c ukphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/via_rhine/Jamfile b/src/add-ons/kernel/drivers/network/via_rhine/Jamfile index 97df65feee..707ec2f986 100644 --- a/src/add-ons/kernel/drivers/network/via_rhine/Jamfile +++ b/src/add-ons/kernel/drivers/network/via_rhine/Jamfile @@ -22,6 +22,5 @@ KernelAddon via_rhine : ; ObjectHdrs [ FGristFiles ciphy$(SUFOBJ) ukphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles ciphy.c ukphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/vt612x/Jamfile b/src/add-ons/kernel/drivers/network/vt612x/Jamfile index f12e9f2e4d..eae6354b66 100644 --- a/src/add-ons/kernel/drivers/network/vt612x/Jamfile +++ b/src/add-ons/kernel/drivers/network/vt612x/Jamfile @@ -22,6 +22,5 @@ KernelAddon vt612x : ; ObjectHdrs [ FGristFiles ukphy$(SUFOBJ) ciphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; + : [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) libs compat freebsd_network ] ; Includes [ FGristFiles ukphy.c ciphy.c ] : miidevs.h ; diff --git a/src/libs/compat/freebsd_network/Jamfile b/src/libs/compat/freebsd_network/Jamfile index eb0acf8c66..cb08869d70 100644 --- a/src/libs/compat/freebsd_network/Jamfile +++ b/src/libs/compat/freebsd_network/Jamfile @@ -58,7 +58,7 @@ rule MIIHeaderGen SEARCH on $(3) = [ FDirName $(SUBDIR) tools ] ; Depends $(1) : $(2) $(3) ; - MakeLocateArch $(<) ; + MakeLocateCommonPlatform $(<) ; MIIHeaderGen1 $(1) : $(2) $(3) ; LocalClean clean : $(<) ; } @@ -76,7 +76,7 @@ rule USBDevsHeaderGen SEARCH on $(3) = [ FDirName $(SUBDIR) tools ] ; Depends $(1) : $(2) $(3) ; - MakeLocateArch $(<) ; + MakeLocateCommonPlatform $(<) ; USBDevsHeaderGen1 $(1) : $(2) $(3) ; LocalClean clean : $(<) ; }