X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=Makefile;h=4444566cd93d7c4417e6ea7fc5085203fe4014d3;hp=eca94e99ed8189847ca24c00880de116982eea61;hb=0291726c092b42ec9c5aae076ee4eaba26ee5a48;hpb=685925398c725e5722690b622e7938fd04c805ce

diff --git a/Makefile b/Makefile
index eca94e9..4444566 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,9 @@
-DESTDIR :=
-OPTIONAL:=
-PREFIX  := /usr/local
-BINDIR  := $(PREFIX)/bin
-DATADIR := $(PREFIX)/share
-MANDIR  := $(DATADIR)/man
+include include.mk
 
 UNAME  ?= $(shell uname)
 CYGWIN  = $(findstring CYGWIN,  $(UNAME))
 MINGW   = $(findstring MINGW32, $(UNAME))
 
-CC      ?= clang
-# linker flags and optional additional libraries if required
-LDFLAGS +=
-LIBS    += -lm
-
 CFLAGS  += -Wall -Wextra -Werror -fno-strict-aliasing $(OPTIONAL)
 ifneq ($(shell git describe --always 2>/dev/null),)
     CFLAGS += -DGMQCC_GITINFO="\"$(shell git describe --always)\""
@@ -30,6 +20,7 @@ ifeq ($(CC), clang)
 	    -Wno-missing-prototypes            \
 	    -Wno-float-equal                   \
 	    -Wno-unknown-warning-option        \
+	    -Wno-cast-align                    \
 	    -Wstrict-prototypes
 else
 	#Tiny C Compiler doesn't know what -pedantic-errors is
@@ -46,15 +37,6 @@ else
 	endif
 endif
 
-ifeq ($(track), no)
-	CFLAGS += -DNOTRACK
-endif
-
-OBJ_C = main.o lexer.o parser.o fs.o stat.o util.o code.o ast.o ir.o conout.o ftepp.o opts.o utf8.o correct.o
-OBJ_P = util.o fs.o conout.o opts.o pak.o stat.o
-OBJ_T = test.o util.o conout.o fs.o stat.o
-OBJ_X = exec-standalone.o util.o conout.o fs.o stat.o
-
 #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
@@ -92,85 +74,7 @@ else
 endif
 endif
 
-#gource flags
-GOURCEFLAGS=                  \
-    --date-format "%d %B, %Y" \
-    --seconds-per-day 0.01    \
-    --auto-skip-seconds 1     \
-    --title "GMQCC"           \
-    --key                     \
-    --camera-mode overview    \
-    --highlight-all-users     \
-    --file-idle-time 0        \
-    --hide progress,mouse     \
-    --stop-at-end             \
-    --max-files 99999999999   \
-    --max-file-lag 0.000001   \
-    --bloom-multiplier 1.3    \
-    --logo doc/html/gmqcc.png \
-    -1280x720
-
-#ffmpeg flags for gource
-FFMPEGFLAGS=                  \
-    -y                        \
-    -r 60                     \
-    -f image2pipe             \
-    -vcodec ppm               \
-    -i -                      \
-    -vcodec libx264           \
-    -preset ultrafast         \
-    -crf 1                    \
-    -threads 0                \
-    -bf 0
-
-#splint flags
-SPLINTFLAGS =            \
-    -redef               \
-    -noeffect            \
-    -nullderef           \
-    -usedef              \
-    -type                \
-    -mustfreeonly        \
-    -nullstate           \
-    -varuse              \
-    -mustfreefresh       \
-    -compdestroy         \
-    -compmempass         \
-    -nullpass            \
-    -onlytrans           \
-    -predboolint         \
-    -boolops             \
-    -incondefs           \
-    -macroredef          \
-    -retvalint           \
-    -nullret             \
-    -predboolothers      \
-    -globstate           \
-    -dependenttrans      \
-    -branchstate         \
-    -compdef             \
-    -temptrans           \
-    -usereleased         \
-    -warnposix           \
-    +charindex           \
-    -kepttrans           \
-    -unqualifiedtrans    \
-    +matchanyintegral    \
-    +voidabstract        \
-    -nullassign          \
-    -unrecog             \
-    -casebreak           \
-    -retvalbool          \
-    -retvalother         \
-    -mayaliasunique      \
-    -realcompare         \
-    -observertrans       \
-    -abstract            \
-    -statictrans         \
-    -castfcnptr
-
 #standard rules
-default: all
 %.o: %.c
 	$(CC) -c $< -o $@ $(CPPFLAGS) $(CFLAGS)
 
@@ -197,7 +101,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
@@ -209,8 +113,14 @@ gource-record:
 	@ gource $(GOURCEFLAGS) -o - | ffmpeg $(FFMPEGFLAGS) gource.mp4
 
 depend:
-	@makedepend    -Y -w 65536 2> /dev/null \
-		$(subst .o,.c,$(DEPS))
+	@ 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
@@ -229,14 +139,6 @@ install-doc:
 	install    -m644  doc/qcvm.1   $(DESTDIR)$(MANDIR)/man1/
 	install    -m644  doc/gmqpak.1 $(DESTDIR)$(MANDIR)/man1/
 
-uninstall:
-	rm -f $(DESTDIR)$(BINDIR)/gmqcc
-	rm -f $(DESTDIR)$(BINDIR)/qcvm
-	rm -f $(DESTDIR)$(BINDIR)/gmqpak
-	rm -f $(DESTDIR)$(MANDIR)/man1/doc/gmqcc.1
-	rm -f $(DESTDIR)$(MANDIR)/man1/doc/qcvm.1
-	rm -f $(DESTDIR)$(MANDIR)/man1/doc/gmqpak.1
-
 # DO NOT DELETE
 
 util.o: gmqcc.h opts.def