@@ -1,6 +1,6 @@
-include ../extra.mk
+include ../../extra.mk
 
 PROG_NOINST = gen_tables${PROG_SUFFIX}
 SRCS = TableGenerator.m
 
 .PHONY: run
@@ -10,46 +10,46 @@
 	rm -f objfw.dll libobjfw.${OBJFW_LIB_MAJOR}.dylib
 	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR}
 	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}
 	rm -f objfwrt.dll libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib
 	rm -f ${OBJFWRT_AMIGA_LIB}
-	if test -f ../src/libobjfw.so; then \
-		${LN_S} ../src/libobjfw.so libobjfw.so.${OBJFW_LIB_MAJOR}; \
-		${LN_S} ../src/libobjfw.so \
+	if test -f ../../src/libobjfw.so; then \
+		${LN_S} ../../src/libobjfw.so libobjfw.so.${OBJFW_LIB_MAJOR}; \
+		${LN_S} ../../src/libobjfw.so \
 		    libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
-	elif test -f ../src/libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; then \
-		${LN_S} ../src/libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} \
+	elif test -f ../../src/libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; then \
+		${LN_S} ../../src/libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} \
 		    libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
 	fi
-	if test -f ../src/objfw.dll; then \
+	if test -f ../../src/objfw.dll; then \
 		${LN_S} ../src/objfw.dll objfw.dll; \
 	fi
-	if test -f ../src/libobjfw.dylib; then \
+	if test -f ../../src/libobjfw.dylib; then \
 		${LN_S} ../src/libobjfw.dylib \
 		    libobjfw.${OBJFW_LIB_MAJOR}.dylib; \
 	fi
-	if test -f ../src/runtime/libobjfwrt.so; then \
-		${LN_S} ../src/runtime/libobjfwrt.so \
+	if test -f ../../src/runtime/libobjfwrt.so; then \
+		${LN_S} ../../src/runtime/libobjfwrt.so \
 		    libobjfwrt.so.${OBJFWRT_LIB_MAJOR}; \
-		${LN_S} ../src/runtime/libobjfwrt.so \
+		${LN_S} ../../src/runtime/libobjfwrt.so \
 		    libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; \
-	elif test -f ../src/runtime/libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; then \
-		${LN_S} ../src/runtime/libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR} libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; \
-	fi
-	if test -f ../src/runtime/objfwrt.dll; then \
-		${LN_S} ../src/runtime/objfwrt.dll objfwrt.dll; \
-	fi
-	if test -f ../src/runtime/libobjfwrt.dylib; then \
-		${LN_S} ../src/runtime/libobjfwrt.dylib \
+	elif test -f ../../src/runtime/libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; then \
+		${LN_S} ../../src/runtime/libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR} libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}; \
+	fi
+	if test -f ../../src/runtime/objfwrt.dll; then \
+		${LN_S} ../../src/runtime/objfwrt.dll objfwrt.dll; \
+	fi
+	if test -f ../../src/runtime/libobjfwrt.dylib; then \
+		${LN_S} ../../src/runtime/libobjfwrt.dylib \
 		    libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib; \
 	fi
-	if test -f ../src/runtime/${OBJFWRT_AMIGA_LIB}; then \
-		${LN_S} ../src/runtime/${OBJFWRT_AMIGA_LIB} \
+	if test -f ../../src/runtime/${OBJFWRT_AMIGA_LIB}; then \
+		${LN_S} ../../src/runtime/${OBJFWRT_AMIGA_LIB} \
 		    ${OBJFWRT_AMIGA_LIB}; \
 	fi
 	LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH+:}$$LD_LIBRARY_PATH \
-	DYLD_FRAMEWORK_PATH=../src:../src/runtime$${DYLD_FRAMEWORK_PATH+:}$$DYLD_FRAMEWORK_PATH \
+	DYLD_FRAMEWORK_PATH=../../src:../../src/runtime$${DYLD_FRAMEWORK_PATH+:}$$DYLD_FRAMEWORK_PATH \
 	DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \
 	LIBRARY_PATH=.$${LIBRARY_PATH+:}$$LIBRARY_PATH \
 	ASAN_OPTIONS=allocator_may_return_null=1 \
 	${WRAPPER} ./${PROG_NOINST}; EXIT=$$?; \
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR}; \
@@ -58,10 +58,10 @@
 	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR}; \
 	rm -f objfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR} objfwrt.dll; \
 	rm -f libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib; \
 	exit $$EXIT
 
-include ../buildsys.mk
+include ../../buildsys.mk
 
-CPPFLAGS += -I../src -I../src/exceptions -I../src/runtime -I..
-LIBS := -L../src -lobjfw -L../src/runtime ${RUNTIME_LIBS} ${LIBS}
+CPPFLAGS += -I../../src -I../../src/exceptions -I../../src/runtime -I../..
+LIBS := -L../../src -lobjfw -L../../src/runtime ${RUNTIME_LIBS} ${LIBS}
 LD = ${OBJC}