Merge branch 'cooking' of git://github.com/graphitemaster/gmqcc into cooking

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index 6ba6a3474054a32c4e75b5ebbeb7b50d639ee790..18720c0705d723598b0e2c1e18bcb036f2f630bf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,11 @@ else
 endif
 
 ifneq ($(shell git describe --always 2>/dev/null),)
-    CFLAGS += -DGMQCC_GITINFO="\"$(shell git describe --always)\""
+       CFLAGS += -DGMQCC_GITINFO="\"$(shell git describe --always)\""
+endif
+
+ifeq ($(shell valgrind --version 2>/dev/null),)
+       CFLAGS += -DNVALGRIND
 endif
 
 # do this last otherwise there is whitespace in the command output and
@@ -55,6 +59,7 @@ ifneq ("$(CYGWIN)", "")
        GMQCC     = gmqcc.exe
        TESTSUITE = testsuite.exe
        PAK       = gmqpak.exe
+       CFLAGS   += -DNVALGRIND
 else
 ifneq ("$(MINGW)", "")
        #nullify the common variables that
@@ -67,6 +72,7 @@ ifneq ("$(MINGW)", "")
        GMQCC     = gmqcc.exe
        TESTSUITE = testsuite.exe
        PAK       = gmqpak.exe
+       CFLAGS   += -DNVALGRIND
 else
        QCVM      = qcvm
        GMQCC     = gmqcc
@@ -76,8 +82,8 @@ endif
 endif
 
 #standard rules
-%.o: %.c
-       $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) 
+c.o:
+       $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
 
 exec-standalone.o: exec.c
        $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) -DQCVM_EXECUTOR=1
@@ -142,13 +148,14 @@ install-doc:
 
 # DO NOT DELETE
 
-util.o: gmqcc.h opts.def
-fs.o: gmqcc.h opts.def
-conout.o: gmqcc.h opts.def
+ansi.o: platform.h gmqcc.h opts.def
+util.o: gmqcc.h opts.def platform.h
+stat.o: gmqcc.h opts.def
+fs.o: gmqcc.h opts.def platform.h
 opts.o: gmqcc.h opts.def
+conout.o: gmqcc.h opts.def
 pak.o: gmqcc.h opts.def
-stat.o: gmqcc.h opts.def
-test.o: gmqcc.h opts.def
+test.o: gmqcc.h opts.def platform.h
 main.o: gmqcc.h opts.def lexer.h
 lexer.o: gmqcc.h opts.def lexer.h
 parser.o: parser.h gmqcc.h opts.def lexer.h ast.h ir.h
@@ -159,3 +166,4 @@ ftepp.o: gmqcc.h opts.def lexer.h
 utf8.o: gmqcc.h opts.def
 correct.o: gmqcc.h opts.def
 fold.o: ast.h ir.h gmqcc.h opts.def parser.h lexer.h
+intrin.o: parser.h gmqcc.h opts.def lexer.h ast.h ir.h