Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freebsd_network: Put MII and USB headers in the common generated directory.

Browse Source 
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...
This commit is contained in:
Augustin Cavalier 2021-09-30 17:42:36 -04:00
parent 2aaa4f6aad
commit ec29597345
23 changed files with 24 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/add-ons/kernel/drivers/network/3com/Jamfile
View File

@ -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 ]
: <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/ar81xx/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/atheros813x/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/attansic_l1/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/attansic_l2/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/broadcom440x/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/broadcom570x/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/dec21xxx/Jamfile
View File

@ -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 ]
: <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/ipro100/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/jmicron2x0/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/marvell_yukon/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/nforce/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/pcnet/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/pegasus/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>usbdevs.h ;

3
src/add-ons/kernel/drivers/network/rdc/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/rtl8139/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/rtl81xx/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/sis19x/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/sis900/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/syskonnect/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/via_rhine/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

3
src/add-ons/kernel/drivers/network/vt612x/Jamfile
View File

@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;

4
src/libs/compat/freebsd_network/Jamfile
View File

@ -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 : $(<) ;
}