pcnet: Clean up Jamfiles.

2018-12-27 14:14:44 -05:00
parent 148d1b2c69
commit cb5334b37b
7 changed files with 33 additions and 63 deletions
@@ -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 ] : <src!libs!compat!freebsd_network>miidevs.h ;
@@ -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 ;
@@ -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
-	;
@@ -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 ]
-	: <src!libs!compat!freebsd_network>miidevs.h ;
@@ -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
-	;