X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=91bedc6cfa820264629bfd81e38917c991a8d99e;hb=6caaedd269a1db1ce6e07d85bb857528c3b50795;hp=c800ecaf6200af9d98b8002999e290736522e713;hpb=f0750209b73c2e2caa0ebb0201f1bbe666093ac7;p=xonotic%2Fgmqcc.git

diff --git a/Makefile b/Makefile
index c800eca..91bedc6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,61 +1,44 @@
-CC     ?= clang
-CFLAGS += -Wall -I. -fomit-frame-pointer -fno-stack-protector -O3
-#turn on tons of warnings if clang is present
-ifeq ($(CC), clang)
-	CFLAGS +=                  \
-		-Weverything                  \
-		-Wno-missing-prototypes       \
-		-Wno-unused-parameter         \
-		-Wno-sign-compare             \
-		-Wno-implicit-fallthrough     \
-		-Wno-sign-conversion          \
-		-Wno-conversion               \
-		-Wno-disabled-macro-expansion \
-		-Wno-padded                   \
-		-Wno-format-nonliteral
-
-endif
-ifeq ($(track), no)
-    CFLAGS += -DNOTRACK
-endif
-
-OBJ     = \
-          util.o      \
-          code.o      \
-          ast.o       \
-          ir.o        \
-          error.o     \
-          con.o
-OBJ_A = test/ast-test.o
-OBJ_I = test/ir-test.o
-OBJ_C = main.o lexer.o parser.o
-OBJ_X = exec-standalone.o util.o
-
-#default is compiler only
-default: gmqcc
-%.o: %.c
-	$(CC) -c $< -o $@ $(CFLAGS)
-
-exec-standalone.o: exec.c
-	$(CC) -c $< -o $@ $(CFLAGS) -DQCVM_EXECUTOR=1
-
-# test targets
-test_ast: $(OBJ_A) $(OBJ)
-	$(CC) -o $@ $^ $(CFLAGS)
-test_ir:  $(OBJ_I) $(OBJ)
-	$(CC) -o $@ $^ $(CFLAGS)
-qcvm:     $(OBJ_X)
-	$(CC) -o $@ $^ $(CFLAGS) -lm
-test: test_ast test_ir
-
-# compiler target
-gmqcc: $(OBJ_C) $(OBJ)
-	$(CC) -o $@ $^ $(CFLAGS)
-
-#all target is test and all
-all: test gmqcc
+CC ?= clang
+CFLAGS = -MD -std=gnu99 -Wall -Wextra -pedantic-errors -g3
+LDFLAGS = -lm
+
+CSRCS = ast.c code.c conout.c fold.c ftepp.c intrin.c ir.c lexer.c main.c opts.c parser.c stat.c utf8.c util.c
+TSRCS = conout.c opts.c stat.c test.c util.c
+VSRCS = exec.c stat.c util.c
+
+COBJS = $(CSRCS:.c=.o)
+TOBJS = $(TSRCS:.c=.o)
+VOBJS = $(VSRCS:.c=.o)
+
+CDEPS = $(CSRCS:.c=.d)
+TDEPS = $(TSRCS:.c=.d)
+VDEPS = $(VSRCS:.c=.d)
+
+CBIN = gmqcc
+TBIN = testsuite
+VBIN = qcvm
+
+all: $(CBIN) $(TBIN) $(VBIN)
+
+$(CBIN): $(COBJS)
+	$(CC) $(COBJS) $(LDFLAGS) -o $@
+
+$(TBIN): $(TOBJS)
+	$(CC) $(TOBJS) $(LDFLAGS) -o $@
+
+$(VBIN): $(VOBJS)
+	$(CC) $(VOBJS) $(LDFLAGS) -o $@
+
+.c.o:
+	$(CC) -c $(CFLAGS) $< -o $@
+
+test: $(CBIN) $(TBIN) $(VBIN)
+	@./$(TBIN)
 
 clean:
-	rm -f *.o gmqcc qcvm test_ast test_ir test/*.o
-	
+	rm -f *.d
+	rm -f $(COBJS) $(CDEPS) $(CBIN)
+	rm -f $(TOBJS) $(TDEPS) $(TBIN)
+	rm -f $(VOBJS) $(VDEPS) $(VBIN)
 
+-include *.d