@@ -1,13 +1,19 @@
 ${TMP}:
 	mkdir -p ${TMP}
 
-${TMP}/calls.x86.lin.32.s: ${lin-headers}/unistd_32.h ${TMP}
-	grep "#define __NR_" $< | sed 's;^#define __NR_;%define sys.;' > $@
-${TMP}/calls.x86.lin.64.s: ${lin-headers}/unistd_64.h ${TMP}
-	grep "#define __NR_" $< | sed 's;^#define __NR_;%define sys.;' > $@
-${TMP}/calls.x86.fbsd.%.s: ${fbsd-headers}/syscall.h ${TMP}
-	grep "#define	SYS_" $< | sed 's;^#define	SYS_;%define sys.;' > $@
+${TMP}/calls.x86.lin.32.tbl: ${lin-headers}/unistd_32.h ${TMP}
+	grep "#define __NR_" $< | sed 's;^#define __NR_;;' > $@
+${TMP}/calls.x86.lin.64.tbl: ${lin-headers}/unistd_64.h ${TMP}
+	grep "#define __NR_" $< | sed 's;^#define __NR_;;' > $@
+${TMP}/calls.x86.fbsd.%.tbl: ${fbsd-headers}/syscall.h ${TMP}
+	grep "#define	SYS_" $< | sed 's;^#define	SYS_;;' | sed 's;[\t ]\+; ;' > $@
+
+${TMP}/calls.s: ${TMP}/calls.${TARGET}.tbl
+	awk -f syscall.awk -v out=asm <$< >$@
+${TMP}/calls.h: ${TMP}/calls.${TARGET}.tbl
+	awk -f syscall.awk -v out=header <$< >$@
+
 ${TMP}/typesize: typesize.c
 	$(CC) -std=c11 $< -o $@
 ${TMP}/typesize.def: ${TMP}/typesize
 	$< > $@