Merge branch 'master' into test-suite

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index d326576da571977ee15a368ff4ab61b2f637f2b5..aa5ef11f11b60b2f9955c596c60b522e78c4dde4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
-CC     ?= clang
-CFLAGS += -Wall -I. -pedantic-errors -std=c90
+DESTDIR :=
+PREFIX := /usr/local
+BINDIR := $(PREFIX)/bin
 
+CC     ?= clang
+CFLAGS += -Wall -I. -fomit-frame-pointer -fno-stack-protector -fno-common
 #turn on tons of warnings if clang is present
 ifeq ($(CC), clang)
        CFLAGS +=                  \
@@ -16,17 +19,23 @@ ifeq ($(CC), clang)
                -Wno-format-nonliteral
 
 endif
-OBJ     = \
+ifeq ($(track), no)
+    CFLAGS += -DNOTRACK
+endif
+
+OBJ     =             \
           util.o      \
           code.o      \
           ast.o       \
-          ir.o
-OBJ_A = test/ast-test.o
-OBJ_I = test/ir-test.o
+          ir.o        \
+          con.o       \
+          ftepp.o
+
+OBJ_T = test.o util.o con.o
 OBJ_C = main.o lexer.o parser.o
-OBJ_X = exec-standalone.o util.o
+OBJ_X = exec-standalone.o util.o con.o
+
 
-#default is compiler only
 default: gmqcc
 %.o: %.c
        $(CC) -c $< -o $@ $(CFLAGS)
@@ -34,25 +43,34 @@ default: gmqcc
 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)
-exec.o: execloop.h
-exec-standalone.o: execloop.h
-test: test_ast test_ir
+qcvm: $(OBJ_X)
+       $(CC) -o $@ $^ $(CFLAGS) -lm
 
-# compiler target
 gmqcc: $(OBJ_C) $(OBJ)
        $(CC) -o $@ $^ $(CFLAGS)
 
-#all target is test and all
-all: test gmqcc
+test: $(OBJ_T)
+       $(CC) -o $@ $^ $(CFLAGS)
+       
+runtests:
+       ./test
+
+all: gmqcc qcvm test
 
 clean:
-       rm -f *.o gmqcc qcvm test_ast test_ir test/*.o
-       
+       rm -f *.o gmqcc qcvm test *.dat
+
+
+$(OBJ) $(OBJ_C) $(OBJ_X): gmqcc.h
+main.o: lexer.h
+parser.o: ast.h lexer.h
+ast.o: ast.h ir.h
+ir.o: ir.h
 
+install: install-gmqcc install-qcvm
+install-gmqcc: gmqcc
+       install -d -m755          $(DESTDIR)$(BINDIR)
+       install    -m755  gmqcc   $(DESTDIR)$(BINDIR)/gmqcc
+install-qcvm: qcvm
+       install -d -m755          $(DESTDIR)$(BINDIR)
+       install    -m755  qcvm    $(DESTDIR)$(BINDIR)/qcvm