broadcom440x: Clean up Jamfiles.

2018-12-24 21:06:28 -05:00
parent c6759927e3
commit 7f601aefb4
5 changed files with 23 additions and 43 deletions
@@ -1,3 +1,25 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network broadcom440x ;

-SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom440x 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 bfe ] ;
+
+KernelAddon broadcom440x :
+	glue.c
+	bmtphy.c
+	if_bfe.c
+	: libfreebsd_network.a
+	;
+
+ObjectHdrs [ FGristFiles bmtphy$(SUFOBJ) ]
+	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
+		compat freebsd_network ] ;
+Includes [ FGristFiles bmtphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
@@ -1,4 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network broadcom440x dev ;
-
-SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom440x dev bfe ;
-SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom440x dev mii ;
@@ -1,19 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network broadcom440x dev bfe ;
-
-UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(SUBDIR) .. mii ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
-
-UsePrivateHeaders net system ;
-UsePrivateKernelHeaders ;
-
-SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] 
-	-Wno-format 
-	;
-
-KernelAddon broadcom440x :
-	if_bfe.c
-	glue.c
-	: broadcom440x_mii.a libfreebsd_network.a
-	;
-
@@ -1,19 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network broadcom440x 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 broadcom440x_mii.a
-	:
-	bmtphy.c
-	;
-
-ObjectHdrs [ FGristFiles bmtphy$(SUFOBJ) ]
-	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd_network ] ;
-Includes [ FGristFiles bmtphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;