Fix FTFBS stuff

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index ad8c9411c7467b647c7e3ad2cb14de64bf07e0ff..4a29e9c16195391f32b6fc075e03550dad9749b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,68 +1,79 @@
 DESTDIR :=
 PREFIX := /usr/local
 BINDIR := $(PREFIX)/bin
+DATADIR := $(PREFIX)/share
+MANDIR := $(DATADIR)/man
 
 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       \
-          ftepp.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
 
-#default is compiler only
-default: gmqcc
+
+default: all
 %.o: %.c
        $(CC) -c $< -o $@ $(CFLAGS)
 
 exec-standalone.o: exec.c
        $(CC) -c $< -o $@ $(CFLAGS) -DQCVM_EXECUTOR=1
 
-qcvm:     $(OBJ_X)
+qcvm: $(OBJ_X)
        $(CC) -o $@ $^ $(CFLAGS) -lm
 
-# compiler target
 gmqcc: $(OBJ_C) $(OBJ)
        $(CC) -o $@ $^ $(CFLAGS)
 
-all: gmqcc qcvm
+testsuite: $(OBJ_T)
+       $(CC) -o $@ $^ $(CFLAGS)
+
+all: gmqcc qcvm testsuite
+
+check: all
+       @ ./testsuite
 
 clean:
-       rm -f *.o gmqcc qcvm
+       rm -f *.o gmqcc qcvm testsuite *.dat
+
 
-$(OBJ) $(OBJ_C) $(OBJ_X): gmqcc.h
+$(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: install-gmqcc install-qcvm install-doc
 install-gmqcc: gmqcc
-       install -d -m755          $(DESTDIR)$(BINDIR)
-       install    -m755  gmqcc   $(DESTDIR)$(BINDIR)/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
+       install -d -m755               $(DESTDIR)$(BINDIR)
+       install    -m755  qcvm         $(DESTDIR)$(BINDIR)/qcvm
+install-doc:
+       install -d -m755               $(DESTDIR)$(MANDIR)/man1
+       install    -m755  doc/gmqcc.1  $(DESTDIR)$(MANDIR)/man1/
+       install    -m755  doc/qcvm.1   $(DESTDIR)$(MANDIR)/man1/