Self-host: including preprocessor, chibicc can compile itself

Makefile

@@ -14,7 +14,7 @@ chibicc: $(OBJS)
 $(OBJS): chibicc.h
 
 test/%.exe: chibicc test/%.c
-	./chibicc -Itest -c -o test/$*.o test/$*.c
+	./chibicc -Iinclude -Itest -c -o test/$*.o test/$*.c
 	$(CC) -o $@ test/$*.o -xc test/common
 
 test: $(TESTS)
@@ -28,10 +28,9 @@ test-all: test test-stage2
 stage2/chibicc: $(OBJS:%=stage2/%)
 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
 
-stage2/%.o: chibicc self.py %.c
+stage2/%.o: chibicc %.c
 	mkdir -p stage2/test
-	./self.py chibicc.h $*.c > stage2/$*.c
-	./chibicc -c -o stage2/$*.o stage2/$*.c
+	./chibicc -c -o $(@D)/$*.o $*.c
 
 stage2/test/%.exe: stage2/chibicc test/%.c
 	mkdir -p stage2/test

self.py

@@ -1,127 +0,0 @@
-#!/usr/bin/python3
-import re
-import sys
-
-print("""
-typedef signed char int8_t;
-typedef short int16_t;
-typedef int int32_t;
-typedef long int64_t;
-typedef unsigned long size_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long uint64_t;
-
-typedef unsigned long size_t;
-
-typedef struct FILE FILE;
-extern FILE *stdin;
-extern FILE *stdout;
-extern FILE *stderr;
-
-typedef struct {
-  int gp_offset;
-  int fp_offset;
-  void *overflow_arg_area;
-  void *reg_save_area;
-} __va_elem;
-
-typedef __va_elem va_list[1];
-
-struct stat {
-  char _[512];
-};
-
-typedef struct {
-  size_t gl_pathc;
-  char **gl_pathv;
-  size_t gl_offs;
-  char _[512];
-} glob_t;
-
-void *malloc(long size);
-void *calloc(long nmemb, long size);
-void *realloc(void *buf, long size);
-int *__errno_location();
-char *strerror(int errnum);
-FILE *fopen(char *pathname, char *mode);
-FILE *open_memstream(char **ptr, size_t *sizeloc);
-long fread(void *ptr, long size, long nmemb, FILE *stream);
-size_t fwrite(void *ptr, size_t size, size_t nmemb, FILE *stream);
-int fflush(FILE *stream);
-int fclose(FILE *fp);
-int fputc(int c, FILE *stream);
-int feof(FILE *stream);
-static void assert() {}
-int glob(char *pattern, int flags, void *errfn, glob_t *pglob);
-void globfree(glob_t *pglob);
-int stat(char *pathname, struct stat *statbuf);
-char *dirname(char *path);
-int strcmp(char *s1, char *s2);
-int strncasecmp(char *s1, char *s2, long n);
-int memcmp(char *s1, char *s2, long n);
-int printf(char *fmt, ...);
-int sprintf(char *buf, char *fmt, ...);
-int fprintf(FILE *fp, char *fmt, ...);
-int vfprintf(FILE *fp, char *fmt, va_list ap);
-long strlen(char *p);
-int strncmp(char *p, char *q, long n);
-void *memcpy(char *dst, char *src, long n);
-char *strdup(char *p);
-char *strndup(char *p, long n);
-char *strdup(char *p);
-int isspace(int c);
-int ispunct(int c);
-int isdigit(int c);
-int isxdigit(int c);
-char *strstr(char *haystack, char *needle);
-char *strchr(char *s, int c);
-double strtod(char *nptr, char **endptr);
-static void va_end(va_list ap) {}
-long strtoul(char *nptr, char **endptr, int base);
-void exit(int code);
-char *basename(char *path);
-char *strrchr(char *s, int c);
-int unlink(char *pathname);
-int mkstemp(char *template);
-int close(int fd);
-int fork(void);
-int execvp(char *file, char **argv);
-void _exit(int code);
-int wait(int *wstatus);
-int atexit(void (*)(void));
-FILE *open_memstream(char **ptr, size_t *sizeloc);
-char *dirname(char *path);
-char *strncpy(char *dest, char *src, long n);
-int stat(char *pathname, struct stat *statbuf);
-int stat(char *pathname, struct stat *statbuf);
-char *dirname(char *path);
-char *basename(char *path);
-char *strrchr(char *s, int c);
-int unlink(char *pathname);
-int mkstemp(char *template);
-int close(int fd);
-int fork(void);
-int execvp(char *file, char **argv);
-void _exit(int code);
-int wait(int *wstatus);
-int atexit(void (*)(void));
-""")
-
-for path in sys.argv[1:]:
-    with open(path) as file:
-        s = file.read()
-        s = re.sub(r'\\\n', '', s)
-        s = re.sub(r'^\s*#.*', '', s, flags=re.MULTILINE)
-        s = re.sub(r'"\n\s*"', '', s)
-        s = re.sub(r'\bbool\b', '_Bool', s)
-        s = re.sub(r'\berrno\b', '*__errno_location()', s)
-        s = re.sub(r'\btrue\b', '1', s)
-        s = re.sub(r'\bfalse\b', '0', s)
-        s = re.sub(r'\bNULL\b', '0', s)
-        s = re.sub(r'\bva_start\(([^)]*),([^)]*)\)', '*(\\1)=*(__va_elem*)__va_area__', s)
-        s = re.sub(r'\bunreachable\(\)', 'error("unreachable")', s)
-        s = re.sub(r'\bMIN\(([^)]*),([^)]*)\)', '((\\1)<(\\2)?(\\1):(\\2))', s)
-        print(s)