Removed references to $TRAVIS from Makefiles.

After all it seems much cleaner to explicitly control the behaviour from the .travis.yml file than to behave differently "under the hood" when detecting a Travis CI build.
This commit is contained in:
Oliver Schmidt
2014-03-16 21:31:00 +01:00
parent 4ea84c4843
commit 1d6000213c
3 changed files with 15 additions and 6 deletions

View File

@@ -30,13 +30,20 @@ LD65_CFG = $(datadir)/cfg
CC = $(CROSS_COMPILE)gcc
AR = $(CROSS_COMPILE)ar
ifdef CROSS_COMPILE
$(info CC: $(CC))
$(info AR: $(AR))
endif
ifdef USER_CFLAGS
$(info USER_CFLAGS: $(USER_CFLAGS))
endif
CFLAGS += -MMD -MP -O -I common \
-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
ifdef CMD_EXE