diff --git a/src/add-ons/kernel/drivers/network/ipro100/Jamfile b/src/add-ons/kernel/drivers/network/ipro100/Jamfile index 481383be90..6b4d700336 100644 --- a/src/add-ons/kernel/drivers/network/ipro100/Jamfile +++ b/src/add-ons/kernel/drivers/network/ipro100/Jamfile @@ -1,3 +1,24 @@ SubDir HAIKU_TOP src add-ons kernel drivers network ipro100 ; -SubInclude HAIKU_TOP src add-ons kernel drivers network ipro100 dev ; +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 fxp ] ; + +KernelAddon ipro100 : + if_fxp.c + glue.c + inphy.c + : libfreebsd_network.a + ; + +ObjectHdrs [ FGristFiles inphy$(SUFOBJ) ] + : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs + compat freebsd_network ] ; +Includes [ FGristFiles inphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/ipro100/dev/Jamfile b/src/add-ons/kernel/drivers/network/ipro100/dev/Jamfile deleted file mode 100644 index b3654bccc5..0000000000 --- a/src/add-ons/kernel/drivers/network/ipro100/dev/Jamfile +++ /dev/null @@ -1,4 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network ipro100 dev ; - -SubInclude HAIKU_TOP src add-ons kernel drivers network ipro100 dev fxp ; - diff --git a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/Jamfile b/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/Jamfile deleted file mode 100644 index 7900525bf0..0000000000 --- a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/Jamfile +++ /dev/null @@ -1,21 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network ipro100 dev fxp ; - -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 ipro100 : - if_fxp.c - glue.c - inphy.c - : libfreebsd_network.a - ; - -ObjectHdrs [ FGristFiles inphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs - compat freebsd_network ] ; -Includes [ FGristFiles inphy.c ] : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/glue.c b/src/add-ons/kernel/drivers/network/ipro100/glue.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ipro100/dev/fxp/glue.c rename to src/add-ons/kernel/drivers/network/ipro100/glue.c