More ternary fixes

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index dca380612a3d92c036442d6775dcd66746e3498a..29d91c42ec80cefe1eb9d0ff844c4d16ea44b32d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,37 @@
+DESTDIR :=
+PREFIX := /usr/local
+BINDIR := $(PREFIX)/bin
+
 CC     ?= clang
-CFLAGS += -Wall -I. -fomit-frame-pointer -fno-stack-protector -fno-common
+CFLAGS += -Wall -Wextra -I. -pedantic-errors
 #turn on tons of warnings if clang is present
 ifeq ($(CC), clang)
-       CFLAGS +=                  \
+       CFLAGS +=                         \
                -Weverything                  \
-               -Wno-missing-prototypes       \
-               -Wno-unused-parameter         \
-               -Wno-sign-compare             \
-               -Wno-implicit-fallthrough     \
-               -Wno-sign-conversion          \
-               -Wno-conversion               \
-               -Wno-disabled-macro-expansion \
                -Wno-padded                   \
-               -Wno-format-nonliteral
+               -Wno-format-nonliteral        \
+               -Wno-disabled-macro-expansion \
+               -Wno-conversion               \
+               -Wno-missing-prototypes
 
 endif
 ifeq ($(track), no)
     CFLAGS += -DNOTRACK
 endif
 
-OBJ     = \
+OBJ     =             \
           util.o      \
           code.o      \
           ast.o       \
           ir.o        \
-          con.o
-          
+          con.o       \
+          ftepp.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
 
-#default is compiler only
+
 default: gmqcc
 %.o: %.c
        $(CC) -c $< -o $@ $(CFLAGS)
@@ -44,16 +45,28 @@ qcvm: $(OBJ_X)
 gmqcc: $(OBJ_C) $(OBJ)
        $(CC) -o $@ $^ $(CFLAGS)
 
-test: $(OBJ_T)
+testsuite: $(OBJ_T)
        $(CC) -o $@ $^ $(CFLAGS)
-       
-runtests:
-       ./test
 
-#all target is test and all
-all: gmqcc qcvm test
+all: gmqcc qcvm testsuite
+
+check: all
+       ./testsuite
 
 clean:
-       rm -f *.o gmqcc qcvm test *.dat
-       
+       rm -f *.o gmqcc qcvm testsuite *.dat
+
+
+$(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
 
+install: install-gmqcc install-qcvm
+install-gmqcc: gmqcc
+       install -d -m755          $(DESTDIR)$(BINDIR)
+       install    -m755  gmqcc   $(DESTDIR)$(BINDIR)/gmqcc
+install-qcvm: qcvm
+       install -d -m755          $(DESTDIR)$(BINDIR)
+       install    -m755  qcvm    $(DESTDIR)$(BINDIR)/qcvm