syskonnect: Clean up Jamfiles.

2018-12-27 14:14:45 -05:00
parent 34b46b4548
commit 9b7ef99599
5 changed files with 26 additions and 44 deletions
@@ -1,3 +1,28 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network syskonnect ;

-SubInclude HAIKU_TOP src add-ons kernel drivers network syskonnect 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 sk ] ;
+
+KernelAddon syskonnect :
+	glue.c
+	e1000phy.c
+	xmphy.c
+	ukphy.c
+	ukphy_subr.c
+	if_sk.c
+	: libfreebsd_network.a
+	;
+
+ObjectHdrs [ FGristFiles e1000phy$(SUFOBJ) xmphy$(SUFOBJ) ukphy$(SUFOBJ) ]
+	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
+		compat freebsd_network ] ;
+Includes [ FGristFiles e1000phy.c xmphy.c ukphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
@@ -1,4 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network syskonnect dev ;
-
-SubInclude HAIKU_TOP src add-ons kernel drivers network syskonnect dev mii ;
-SubInclude HAIKU_TOP src add-ons kernel drivers network syskonnect dev sk ;
@@ -1,24 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network syskonnect 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 syskonnect_mii.a
-	:
-	xmphy.c
-	e1000phy.c
-	ukphy.c
-	ukphy_subr.c
-	;
-
-ObjectHdrs [ FGristFiles e1000phy$(SUFOBJ) ukphy$(SUFOBJ) xmphy$(SUFOBJ) ]
-	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd_network ] ;
-Includes [ FGristFiles e1000phy.c ukphy.c xmphy.c ]
-	: <src!libs!compat!freebsd_network>miidevs.h ;
-
@@ -1,15 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network syskonnect dev sk ;
-
-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 ] ;
-
-KernelAddon syskonnect :
-	if_sk.c
-	glue.c
-	: syskonnect_mii.a libfreebsd_network.a
-	;