Update specification.tex

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index e31c0987124ba0596fd39040d18a920c312cabfe..410a97d19c4c6d98c5c35662aa506581b0f06856 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,14 +9,14 @@ CYGWIN  = $(findstring CYGWIN,  $(UNAME))
 MINGW   = $(findstring MINGW32, $(UNAME))
 
 CC     ?= clang
-CFLAGS += -Wall -Wextra -I. -fno-strict-aliasing -fsigned-char -Wno-overlength-strings
+CFLAGS += -Wall -Wextra -Werror -I. -fno-strict-aliasing -fsigned-char
 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 +=                               \
+       CFLAGS +=                              \
                -Weverything                       \
                -Wno-padded                        \
                -Wno-format-nonliteral             \
@@ -41,10 +41,11 @@ ifeq ($(track), no)
     CFLAGS += -DNOTRACK
 endif
 
-OBJ_D = util.o code.o ast.o ir.o conout.o ftepp.o opts.o file.o utf8.o correct.o
-OBJ_T = test.o util.o conout.o file.o
-OBJ_C = main.o lexer.o parser.o file.o
-OBJ_X = exec-standalone.o util.o conout.o file.o
+OBJ_D = util.o code.o ast.o ir.o conout.o ftepp.o opts.o fs.o utf8.o correct.o
+OBJ_P = util.o fs.o conout.o opts.o pak.o
+OBJ_T = test.o util.o conout.o fs.o
+OBJ_C = main.o lexer.o parser.o fs.o
+OBJ_X = exec-standalone.o util.o conout.o fs.o
 
 ifneq ("$(CYGWIN)", "")
        #nullify the common variables that
@@ -56,6 +57,7 @@ ifneq ("$(CYGWIN)", "")
        QCVM      = qcvm.exe
        GMQCC     = gmqcc.exe
        TESTSUITE = testsuite.exe
+       PAK       = pak.exe
 else
 ifneq ("$(MINGW)", "")
        #nullify the common variables that
@@ -67,6 +69,7 @@ ifneq ("$(MINGW)", "")
        QCVM      = qcvm.exe
        GMQCC     = gmqcc.exe
        TESTSUITE = testsuite.exe
+       PAK       = pak.exe
 else
        #arm support for linux .. we need to allow unaligned accesses
        #to memory otherwise we just segfault everywhere
@@ -77,6 +80,7 @@ else
        QCVM      = qcvm
        GMQCC     = gmqcc
        TESTSUITE = testsuite
+       PAK       = pak
 endif
 endif
 
@@ -146,17 +150,20 @@ $(GMQCC): $(OBJ_C) $(OBJ_D)
        $(CC) -o $@ $^ $(CFLAGS)
 
 $(TESTSUITE): $(OBJ_T)
+       $(CC) -o $@ $^ $(CFLAGS) -lm
+
+$(PAK): $(OBJ_P)
        $(CC) -o $@ $^ $(CFLAGS)
 
-all: $(GMQCC) $(QCVM) $(TESTSUITE)
+all: $(GMQCC) $(QCVM) $(TESTSUITE) $(PAK)
 
 check: all
        @ ./$(TESTSUITE)
-test: check
+test: all
        @ ./$(TESTSUITE)
 
 clean:
-       rm -f *.o $(GMQCC) $(QCVM) $(TESTSUITE) *.dat
+       rm -f *.o $(GMQCC) $(QCVM) $(TESTSUITE) $(PAK) *.dat
 
 splint:
        @  splint $(SPLINTFLAGS) *.c *.h
@@ -170,6 +177,8 @@ depend:
                $(subst .o,.c,$(OBJ_C))
        @makedepend -a -Y -w 65536 2> /dev/null \
                $(subst .o,.c,$(OBJ_X))
+       @makedepend -a -Y -w 65536 2> /dev/null \
+               $(subst .o,.c,$(OBJ_P))
 
 #install rules
 install: install-gmqcc install-qcvm install-doc
@@ -199,20 +208,20 @@ ir.o: gmqcc.h opts.def ir.h
 conout.o: gmqcc.h opts.def
 ftepp.o: gmqcc.h opts.def lexer.h
 opts.o: gmqcc.h opts.def
-file.o: gmqcc.h opts.def
+fs.o: gmqcc.h opts.def
 utf8.o: gmqcc.h opts.def
 correct.o: gmqcc.h opts.def
 
 test.o: gmqcc.h opts.def
 util.o: gmqcc.h opts.def
 conout.o: gmqcc.h opts.def
-file.o: gmqcc.h opts.def
+fs.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
-file.o: gmqcc.h opts.def
+fs.o: gmqcc.h opts.def
 
 util.o: gmqcc.h opts.def
 conout.o: gmqcc.h opts.def
-file.o: gmqcc.h opts.def
+fs.o: gmqcc.h opts.def