Fix a minor bug in the lexer

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index 75d4921ea0c2067ed9260b06d50ff7de7c69c417..a51aed38ac21cc404c5abba7965af8e8b25cf7ac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 CC     ?= clang
-CFLAGS += -Wall -I. -pedantic-errors -std=c90
+CFLAGS += -Wall -I. -pedantic-errors
 
 #turn on tons of warnings if clang is present
 ifeq ($(CC), clang)
@@ -16,18 +16,19 @@ ifeq ($(CC), clang)
                -Wno-format-nonliteral
 
 endif
-OBJ     = lex.o       \
-          error.o     \
-          parse.o     \
-          typedef.o   \
+ifeq ($(track), no)
+    CFLAGS += -DNOTRACK
+endif
+
+OBJ     = \
           util.o      \
           code.o      \
-          asm.o       \
           ast.o       \
-          ir.o 
+          ir.o        \
+          error.o
 OBJ_A = test/ast-test.o
 OBJ_I = test/ir-test.o
-OBJ_C = main.o
+OBJ_C = main.o lexer.o parser.o
 OBJ_X = exec-standalone.o util.o
 
 #default is compiler only
@@ -44,14 +45,14 @@ test_ast: $(OBJ_A) $(OBJ)
 test_ir:  $(OBJ_I) $(OBJ)
        $(CC) -o $@ $^ $(CFLAGS)
 qcvm:     $(OBJ_X)
-       $(CC) -o $@ $^ $(CFLAGS)
+       $(CC) -o $@ $^ $(CFLAGS) -lm
 exec.o: execloop.h
 exec-standalone.o: execloop.h
 test: test_ast test_ir
 
 # compiler target
 gmqcc: $(OBJ_C) $(OBJ)
-       $(CC) -o $@ $^ $(CFLAGS)
+       $(CC) -o $@ $^ $(CFLAGS) $(LIBS)
 
 #all target is test and all
 all: test gmqcc