Remove gmpak

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index 12151070539d078e9b932d61b0ae232834d078f1..142f16d7dbafe0c942b122e1c3296c4a9b45b02b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,10 @@
 include include.mk
 
 UNAME  ?= $(shell uname)
-CYGWIN  = $(findstring CYGWIN,  $(UNAME))
-MINGW   = $(findstring MINGW32, $(UNAME))
+CYGWIN  = $(findstring CYGWIN, $(UNAME))
+MINGW   = $(findstring MINGW,  $(UNAME))
 
-CFLAGS += -Wall -Wextra -Werror -Wstrict-aliasing
-#turn on tons of warnings if clang is present
+# turn on tons of warnings if clang is present
 # but also turn off the STUPID ONES
 ifeq ($(CC), clang)
        CFLAGS +=                              \
@@ -17,6 +16,9 @@ ifeq ($(CC), clang)
            -Wno-float-equal                   \
            -Wno-unknown-warning-option        \
            -Wno-cast-align                    \
+           -Wno-assign-enum                   \
+           -Wno-empty-body                    \
+           -Wno-date-time                     \
            -pedantic-errors
 else
        ifneq ($(CC), g++)
@@ -40,7 +42,8 @@ endif
 
 # do this last otherwise there is whitespace in the command output and
 # it makes my OCD act up
-CFLAGS += $(OPTIONAL)
+CFLAGS += $(OPTIONAL_CFLAGS)
+LDFLAGS += $(OPTIONAL_LDFLAGS)
 
 #we have duplicate object files when dealing with creating a simple list
 #for dependinces. To combat this we use some clever recrusive-make to
@@ -58,7 +61,6 @@ ifneq ("$(CYGWIN)", "")
        QCVM      = qcvm.exe
        GMQCC     = gmqcc.exe
        TESTSUITE = testsuite.exe
-       PAK       = gmqpak.exe
        CFLAGS   += -DNVALGRIND
 else
 ifneq ("$(MINGW)", "")
@@ -71,13 +73,11 @@ ifneq ("$(MINGW)", "")
        QCVM      = qcvm.exe
        GMQCC     = gmqcc.exe
        TESTSUITE = testsuite.exe
-       PAK       = gmqpak.exe
        CFLAGS   += -DNVALGRIND
 else
        QCVM      = qcvm
        GMQCC     = gmqcc
        TESTSUITE = testsuite
-       PAK       = gmqpak
 endif
 endif
 
@@ -94,9 +94,6 @@ $(GMQCC): $(OBJ_C) $(OBJ_D)
 $(TESTSUITE): $(OBJ_T)
        $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
 
-$(PAK): $(OBJ_P)
-       $(CC) -o $@ $^ $(LDFLAGS)
-
 all: $(GMQCC) $(QCVM) $(TESTSUITE) $(PAK)
 
 check: all
@@ -130,9 +127,6 @@ install-gmqcc: $(GMQCC)
 install-qcvm: $(QCVM)
        install -d -m755               $(DESTDIR)$(BINDIR)
        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    -m644  doc/gmqcc.1  $(DESTDIR)$(MANDIR)/man1/
@@ -143,11 +137,11 @@ install-doc:
 
 ansi.o: platform.h gmqcc.h opts.def
 util.o: gmqcc.h opts.def platform.h
+hash.o: gmqcc.h opts.def
 stat.o: gmqcc.h opts.def
 fs.o: gmqcc.h opts.def platform.h
 opts.o: gmqcc.h opts.def
 conout.o: gmqcc.h opts.def
-pak.o: gmqcc.h opts.def
 test.o: gmqcc.h opts.def platform.h
 main.o: gmqcc.h opts.def lexer.h
 lexer.o: gmqcc.h opts.def lexer.h