Merge branch 'master' of github.com:graphitemaster/gmqcc

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index 63b41c629bfae99d7c0c8ace28a1a63bfba1ae8d..eae6f3e65860d859a1f9380119835ca2625d2347 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,10 +25,10 @@ ifeq ($(track), no)
     CFLAGS += -DNOTRACK
 endif
 
-OBJ_D = util.o code.o ast.o ir.o con.o ftepp.o opts.o
-OBJ_T = test.o util.o con.o
+OBJ_D = util.o code.o ast.o ir.o conout.o ftepp.o opts.o
+OBJ_T = test.o util.o conout.o
 OBJ_C = main.o lexer.o parser.o
-OBJ_X = exec-standalone.o util.o con.o
+OBJ_X = exec-standalone.o util.o conout.o
 
 ifneq ("$(CYGWIN)", "")
        #nullify the common variables that
@@ -84,7 +84,7 @@ clean:
        rm -f *.o $(GMQCC) $(QCVM) $(TESTSUITE) *.dat
 
 # deps
-$(OBJ) $(OBJ_C) $(OBJ_X): gmqcc.h opts.def
+$(OBJ_D) $(OBJ_C) $(OBJ_X): gmqcc.h opts.def
 main.o:   lexer.h
 parser.o: ast.h lexer.h
 ast.o:    ast.h ir.h