Fix xnu paths for osx

main.mk

@@ -139,11 +139,11 @@ XNU_HAVE:=	$(XNU_VERSION)
 endif
 ifeq ($(wildcard xnu/xnu-$(XNU_VERSION)),)
 XNU_METHOD=	sw_vers
-XNU_VERSION=	$(shell awk '/^XNU_RELS.*\# $(OSX_VERSION)$$/ {print $$2}' xnu/GNUmakefile)
+XNU_VERSION=	$(shell awk '/^XNU_RELS.*\# $(OSX_VERSION)$$/ {print $$2}' $(PROJECT_ROOT)xnu/GNUmakefile)
 endif
 ifeq ($(wildcard xnu/xnu-$(XNU_VERSION)),)
 XNU_METHOD=	fallback
-XNU_VERSION=	$(shell awk '/^XNU_RELS/ {print $$2}' xnu/GNUmakefile|tail -1)
+XNU_VERSION=	$(shell awk '/^XNU_RELS/ {print $$2}' $(PROJECT_ROOT)xnu/GNUmakefile|tail -1)
 endif
 ifneq ($(wildcard xnu/xnu-$(XNU_VERSION)),)
 FEATURES+=	-DHAVE_PF

tests/testproxy/lp/GNUmakefile

@@ -79,7 +79,7 @@ DEBUG_CFLAGS?=	-g
 # Note that you can override the XNU headers used by defining XNU_VERSION.
 
 ifeq ($(shell uname),Darwin)
-include Mk/xcode.mk
+include ../../../Mk/xcode.mk
 ifneq ($(wildcard /usr/include/libproc.h),)
 FEATURES+=	-DHAVE_DARWIN_LIBPROC
 endif
@@ -94,11 +94,11 @@ XNU_HAVE:=	$(XNU_VERSION)
 endif
 ifeq ($(wildcard xnu/xnu-$(XNU_VERSION)),)
 XNU_METHOD=	sw_vers
-XNU_VERSION=	$(shell awk '/^XNU_RELS.*\# $(OSX_VERSION)$$/ {print $$2}' xnu/GNUmakefile)
+XNU_VERSION=	$(shell awk '/^XNU_RELS.*\# $(OSX_VERSION)$$/ {print $$2}' ../../../xnu/GNUmakefile)
 endif
 ifeq ($(wildcard xnu/xnu-$(XNU_VERSION)),)
 XNU_METHOD=	fallback
-XNU_VERSION=	$(shell awk '/^XNU_RELS/ {print $$2}' xnu/GNUmakefile|tail -1)
+XNU_VERSION=	$(shell awk '/^XNU_RELS/ {print $$2}' ../../../xnu/GNUmakefile|tail -1)
 endif
 ifneq ($(wildcard xnu/xnu-$(XNU_VERSION)),)
 FEATURES+=	-DHAVE_PF

tests/testproxy/lp/Mk/xcode.mk

@@ -1,42 +0,0 @@
-# macOS Xcode and SDK selection makefile
-# Authored 2018, Daniel Roethlisberger
-# Provided under the Unlicense
-# https://github.com/droe/example.kext
-
-# DEVELOPER_DIR   override Xcode Command Line Developer Tools directory
-# MACOSX_VERSION_MIN  minimal version of macOS to target, e.g. 10.11
-# SDK             SDK name to build against (e.g. macosx, macosx10.11, ...);
-#                 for kernel extensions, use macosx$(MACOSX_VERSION_MIN)
-
-# target specific macOS min version
-ifdef MACOSX_VERSION_MIN
-CFLAGS+=	-mmacosx-version-min=$(MACOSX_VERSION_MIN)
-LDFLAGS+=	-mmacosx-version-min=$(MACOSX_VERSION_MIN)
-endif
-
-# select specific Xcode
-ifdef DEVELOPER_DIR
-ifndef SDK
-SDK:=		macosx
-endif
-else
-DEVELOPER_DIR:=	$(shell xcode-select -p)
-endif
-
-# activate the selected Xcode and SDK
-ifdef SDK
-SDKPATH:=	$(shell DEVELOPER_DIR="$(DEVELOPER_DIR)" xcrun -find -sdk $(SDK) --show-sdk-path||echo none)
-ifeq "$(SDKPATH)" "none"
-$(error SDK not found)
-endif
-CPPFLAGS+=	-isysroot $(SDKPATH)
-LDFLAGS+=	-isysroot $(SDKPATH)
-CC:=		$(shell DEVELOPER_DIR="$(DEVELOPER_DIR)" xcrun -find -sdk $(SDK) cc||echo false)
-CXX:=		$(shell DEVELOPER_DIR="$(DEVELOPER_DIR)" xcrun -find -sdk $(SDK) c++||echo false)
-CODESIGN:=	$(shell DEVELOPER_DIR="$(DEVELOPER_DIR)" xcrun -find -sdk $(SDK) codesign||echo false)
-else
-CC?=		cc
-CXX?=		c++
-CODESIGN?=	codesign
-endif
-