Fix windows builds, add strip target for makefiles, update distro build makefiles...

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index 3ab21a810476f5113507b445434a49850f3afda5..96193e76abfa6175aca2ffcc013e69cfad6af5f8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,7 @@ UNAME  ?= $(shell uname)
 CYGWIN  = $(findstring CYGWIN,  $(UNAME))
 MINGW   = $(findstring MINGW32, $(UNAME))
 
-CFLAGS  += -Wall -Wextra -Werror -fno-strict-aliasing $(OPTIONAL)
-ifneq ($(shell git describe --always 2>/dev/null),)
-    CFLAGS += -DGMQCC_GITINFO="\"$(shell git describe --always)\""
-endif
+CFLAGS += -Wall -Wextra -Werror -Wstrict-aliasing
 #turn on tons of warnings if clang is present
 # but also turn off the STUPID ONES
 ifeq ($(CC), clang)
@@ -17,26 +14,34 @@ ifeq ($(CC), clang)
            -Wno-format-nonliteral             \
            -Wno-disabled-macro-expansion      \
            -Wno-conversion                    \
-           -Wno-missing-prototypes            \
            -Wno-float-equal                   \
            -Wno-unknown-warning-option        \
            -Wno-cast-align                    \
-           -Wstrict-prototypes
+           -pedantic-errors
 else
-       #Tiny C Compiler doesn't know what -pedantic-errors is
-       # and instead of ignoring .. just errors.
+       ifneq ($(CC), g++)
+               CFLAGS += -Wmissing-prototypes -Wstrict-prototypes
+       endif
+
        ifneq ($(CC), tcc)
                CFLAGS += -pedantic-errors
        else
                CFLAGS += -Wno-pointer-sign -fno-common
        endif
-       
-       #-Wstrict-prototypes is not valid in g++
-       ifneq ($(CC), g++)
-               CFLAGS += -Wstrict-prototypes
-       endif
 endif
 
+ifneq ($(shell git describe --always 2>/dev/null),)
+       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
+# it makes my OCD act up
+CFLAGS += $(OPTIONAL)
+
 #we have duplicate object files when dealing with creating a simple list
 #for dependinces. To combat this we use some clever recrusive-make to
 #filter the list and remove duplicates which we use for make depend
@@ -54,6 +59,7 @@ ifneq ("$(CYGWIN)", "")
        GMQCC     = gmqcc.exe
        TESTSUITE = testsuite.exe
        PAK       = gmqpak.exe
+       CFLAGS   += -DNVALGRIND
 else
 ifneq ("$(MINGW)", "")
        #nullify the common variables that
@@ -66,6 +72,7 @@ ifneq ("$(MINGW)", "")
        GMQCC     = gmqcc.exe
        TESTSUITE = testsuite.exe
        PAK       = gmqpak.exe
+       CFLAGS   += -DNVALGRIND
 else
        QCVM      = qcvm
        GMQCC     = gmqcc
@@ -75,11 +82,11 @@ endif
 endif
 
 #standard rules
-%.o: %.c
-       $(CC) -c $< -o $@ $(CPPFLAGS) $(CFLAGS)
+c.o:
+       $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
 
 exec-standalone.o: exec.c
-       $(CC) -c $< -o $@ $(CPPFLAGS) $(CFLAGS) -DQCVM_EXECUTOR=1
+       $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) -DQCVM_EXECUTOR=1
 
 $(QCVM): $(OBJ_X)
        $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
@@ -100,8 +107,13 @@ check: all
 test: all
        @ ./$(TESTSUITE)
 
+strip: $(GMQCC) $(QCVM) $(TESTSUITE)
+       strip $(GMQCC)
+       strip $(QCVM)
+       strip $(TESTSUITE)
+
 clean:
-       rm -f *.o $(GMQCC) $(QCVM) $(TESTSUITE) $(PAK) *.dat gource.mp4 *.exe
+       rm -rf *.o $(GMQCC) $(QCVM) $(TESTSUITE) $(PAK) *.dat gource.mp4 *.exe gm-qcc.tgz ./cov-int
 
 splint:
        @  splint $(SPLINTFLAGS) *.c *.h
@@ -115,6 +127,13 @@ gource-record:
 depend:
        @ makedepend -Y -w 65536 2> /dev/null $(subst .o,.c,$(DEPS))
 
+
+coverity:
+       @cov-build --dir cov-int $(MAKE)
+       @tar czf gm-qcc.tgz cov-int
+       @rm -rf cov-int
+       @echo gm-qcc.tgz generated, submit for analysis
+
 #install rules
 install: install-gmqcc install-qcvm install-gmqpak install-doc
 install-gmqcc: $(GMQCC)
@@ -134,19 +153,22 @@ 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: gmqcc.h opts.def lexer.h ast.h ir.h intrin.h
+parser.o: parser.h gmqcc.h opts.def lexer.h ast.h ir.h
 code.o: gmqcc.h opts.def
-ast.o: gmqcc.h opts.def ast.h ir.h
+ast.o: gmqcc.h opts.def ast.h ir.h parser.h lexer.h
 ir.o: gmqcc.h opts.def ir.h
 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