X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=6ba6a3474054a32c4e75b5ebbeb7b50d639ee790;hb=a622d5163b9852c66d8399e05e5731d3a538d43b;hp=3ab21a810476f5113507b445434a49850f3afda5;hpb=944ec75687691505fcf54c338964377465ccf4c5;p=xonotic%2Fgmqcc.git

diff --git a/Makefile b/Makefile
index 3ab21a8..6ba6a34 100644
--- 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,30 @@ 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
+
+# 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
@@ -76,10 +77,10 @@ endif
 
 #standard rules
 %.o: %.c
-	$(CC) -c $< -o $@ $(CPPFLAGS) $(CFLAGS)
+	$(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)
@@ -101,7 +102,7 @@ test: all
 	@ ./$(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 +116,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)
@@ -143,10 +151,11 @@ stat.o: gmqcc.h opts.def
 test.o: gmqcc.h opts.def
 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