Merge pull request #80 from AntiheroSoftware/ca65-65816

[cc65] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 051c7eb1fe952cfd93bcc8294f088e620909dbba..7bdd5206ab6fc018205932ef6ca1116b9a5b2a8c 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,3 +1,7 @@
+.SUFFIXES:
+
+.PHONY: all bin $(PROGS) mostlyclean clean install avail unavail
+
 ifeq ($(shell echo),)
 
 PROGS = ar65  \
@@ -22,18 +26,16 @@ LD65_OBJ = $(datadir)/lib
 LD65_CFG = $(datadir)/cfg
 
 CFLAGS += -MMD -MP -O -std=c89 -I common \
-          -Wall -Wextra -Wno-char-subscripts -Werror $(USER_CFLAGS) \
+          -Wall -Wextra -Wno-char-subscripts $(USER_CFLAGS) \
           -DCA65_INC=$(CA65_INC) -DCC65_INC=$(CC65_INC) \
           -DLD65_LIB=$(LD65_LIB) -DLD65_OBJ=$(LD65_OBJ) -DLD65_CFG=$(LD65_CFG)
 
+CFLAGS += $(if $(TRAVIS),-Werror)
+
 LDLIBS += -lm
 
 INSTALL = install
 
-.SUFFIXES:
-
-.PHONY: all bin $(PROGS) mostlyclean clean install avail unavail
-
 all bin: $(PROGS)
 
 mostlyclean:
@@ -116,10 +118,6 @@ $(foreach prog,$(PROGS),$(eval $(call PROG_template,$(prog))))
 
 else # cmd.exe
 
-.SUFFIXES:
-
-.PHONY: all bin mostlyclean clean
-
 all bin:
        msbuild cc65.sln /p:configuration=release /consoleloggerparameters:disableconsolecolor
 
@@ -129,4 +127,6 @@ mostlyclean:
 clean:
        msbuild cc65.sln /p:configuration=release /consoleloggerparameters:disableconsolecolor /target:$@
 
+install avail unavail:
+
 endif # cmd.exe