X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=0d1cee7025918aca55abc5311559c46f23a88a7a;hb=e6c1d66c35267392527a5177a82c48737ce9831b;hp=5c26cdfda8a4b9241777b77a525ce86319b98ae9;hpb=148f7babcd5493675f129dffa913e3761a00b785;p=xonotic%2Fgmqcc.git

diff --git a/Makefile b/Makefile
index 5c26cdf..8a5e72f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,34 +1,46 @@
-DESTDIR :=
-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
-CFLAGS += -Wall -Wextra -I. -pedantic-errors -std=gnu99
+CFLAGS  += -Wall -Wextra -Werror -fno-strict-aliasing $(OPTIONAL)
+ifneq ($(shell git describe --always 2>/dev/null),)
+    CFLAGS += -DGMQCC_GITINFO="\"$(shell git describe --always)\""
+endif
 #turn on tons of warnings if clang is present
 # but also turn off the STUPID ONES
 ifeq ($(CC), clang)
-	CFLAGS +=                         \
-		-Weverything                  \
-		-Wno-padded                   \
-		-Wno-format-nonliteral        \
-		-Wno-disabled-macro-expansion \
-		-Wno-conversion               \
-		-Wno-missing-prototypes
-endif
-ifeq ($(track), no)
-    CFLAGS += -DNOTRACK
+	CFLAGS +=                              \
+	    -Weverything                       \
+	    -Wno-padded                        \
+	    -Wno-format-nonliteral             \
+	    -Wno-disabled-macro-expansion      \
+	    -Wno-conversion                    \
+	    -Wno-missing-prototypes            \
+	    -Wno-float-equal                   \
+	    -Wno-unknown-warning-option        \
+	    -Wstrict-prototypes
+else
+	#Tiny C Compiler doesn't know what -pedantic-errors is
+	# and instead of ignoring .. just errors.
+	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
 
-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_C = main.o lexer.o parser.o
-OBJ_X = exec-standalone.o util.o con.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
+RMDUP = $(if $1,$(firstword $1) $(call RMDUP,$(filter-out $(firstword $1),$1)))
+DEPS := $(call RMDUP, $(OBJ_P) $(OBJ_T) $(OBJ_C) $(OBJ_X))
 
 ifneq ("$(CYGWIN)", "")
 	#nullify the common variables that
@@ -40,6 +52,7 @@ ifneq ("$(CYGWIN)", "")
 	QCVM      = qcvm.exe
 	GMQCC     = gmqcc.exe
 	TESTSUITE = testsuite.exe
+	PAK       = gmqpak.exe
 else
 ifneq ("$(MINGW)", "")
 	#nullify the common variables that
@@ -51,54 +64,88 @@ ifneq ("$(MINGW)", "")
 	QCVM      = qcvm.exe
 	GMQCC     = gmqcc.exe
 	TESTSUITE = testsuite.exe
+	PAK       = gmqpak.exe
 else
 	QCVM      = qcvm
 	GMQCC     = gmqcc
 	TESTSUITE = testsuite
+	PAK       = gmqpak
 endif
 endif
 
 #standard rules
-default: all
 %.o: %.c
-	$(CC) -c $< -o $@ $(CFLAGS)
+	$(CC) -c $< -o $@ $(CPPFLAGS) $(CFLAGS)
 
 exec-standalone.o: exec.c
-	$(CC) -c $< -o $@ $(CFLAGS) -DQCVM_EXECUTOR=1
+	$(CC) -c $< -o $@ $(CPPFLAGS) $(CFLAGS) -DQCVM_EXECUTOR=1
 
 $(QCVM): $(OBJ_X)
-	$(CC) -o $@ $^ $(CFLAGS) -lm
+	$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 $(GMQCC): $(OBJ_C) $(OBJ_D)
-	$(CC) -o $@ $^ $(CFLAGS)
+	$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 $(TESTSUITE): $(OBJ_T)
-	$(CC) -o $@ $^ $(CFLAGS)
+	$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
 
-all: $(GMQCC) $(QCVM) $(TESTSUITE)
+$(PAK): $(OBJ_P)
+	$(CC) -o $@ $^ $(LDFLAGS)
+
+all: $(GMQCC) $(QCVM) $(TESTSUITE) $(PAK)
 
 check: all
 	@ ./$(TESTSUITE)
+test: all
+	@ ./$(TESTSUITE)
 
 clean:
-	rm -f *.o $(GMQCC) $(QCVM) $(TESTSUITE) *.dat
+	rm -f *.o $(GMQCC) $(QCVM) $(TESTSUITE) $(PAK) *.dat gource.mp4 *.exe
+
+splint:
+	@  splint $(SPLINTFLAGS) *.c *.h
 
-# deps
-$(OBJ) $(OBJ_C) $(OBJ_X): gmqcc.h opts.def
-main.o:   lexer.h
-parser.o: ast.h lexer.h
-ast.o:    ast.h ir.h
-ir.o:     ir.h
+gource:
+	@ gource $(GOURCEFLAGS)
+
+gource-record:
+	@ gource $(GOURCEFLAGS) -o - | ffmpeg $(FFMPEGFLAGS) gource.mp4
+
+depend:
+	@ makedepend -Y -w 65536 2> /dev/null $(subst .o,.c,$(DEPS))
 
 #install rules
-install: install-gmqcc install-qcvm install-doc
+install: install-gmqcc install-qcvm install-gmqpak install-doc
 install-gmqcc: $(GMQCC)
 	install -d -m755               $(DESTDIR)$(BINDIR)
-	install    -m755  $(GMQCC)     $(DESTDIR)$(BINDIR)/gmqcc
+	install    -m755  $(GMQCC)     $(DESTDIR)$(BINDIR)/$(GMQCC)
 install-qcvm: $(QCVM)
 	install -d -m755               $(DESTDIR)$(BINDIR)
-	install    -m755  $(QCVM)      $(DESTDIR)$(BINDIR)/qcvm
+	install    -m755  $(QCVM)      $(DESTDIR)$(BINDIR)/$(QCVM)
+install-gmqpak: $(PAK)
+	install -d -m755               $(DESTDIR)$(BINDIR)
+	install    -m755  $(PAK)       $(DESTDIR)$(BINDIR)/$(PAK)
 install-doc:
 	install -d -m755               $(DESTDIR)$(MANDIR)/man1
-	install    -m755  doc/gmqcc.1  $(DESTDIR)$(MANDIR)/man1/
-	install    -m755  doc/qcvm.1   $(DESTDIR)$(MANDIR)/man1/
+	install    -m644  doc/gmqcc.1  $(DESTDIR)$(MANDIR)/man1/
+	install    -m644  doc/qcvm.1   $(DESTDIR)$(MANDIR)/man1/
+	install    -m644  doc/gmqpak.1 $(DESTDIR)$(MANDIR)/man1/
+
+# DO NOT DELETE
+
+util.o: gmqcc.h opts.def
+fs.o: gmqcc.h opts.def
+conout.o: gmqcc.h opts.def
+opts.o: gmqcc.h opts.def
+pak.o: gmqcc.h opts.def
+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
+code.o: gmqcc.h opts.def
+ast.o: gmqcc.h opts.def ast.h ir.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