From: Oliver Schmidt Date: Sun, 16 Mar 2014 20:31:00 +0000 (+0100) Subject: Removed references to $TRAVIS from Makefiles. X-Git-Tag: V2.15~101 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1d6000213caac2286367392e45af3229b4378e79;p=cc65 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. --- diff --git a/.travis.yml b/.travis.yml index e2f64a7b7..eae13f70e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,10 @@ language: install: - sudo apt-get install linuxdoc-tools linuxdoc-tools-info binutils-mingw-w64-i686 gcc-mingw-w64-i686 script: - - make - - make -C src clean bin CROSS_COMPILE=i686-w64-mingw32- + - make bin USER_CFLAGS=-Werror + - make lib QUIET=1 + - make -C src clean + - make bin USER_CFLAGS=-Werror CROSS_COMPILE=i686-w64-mingw32- - make doc zip after_success: - make -f Makefile.gh-pages diff --git a/libsrc/Makefile b/libsrc/Makefile index 86eb80b7c..f7afd498f 100644 --- a/libsrc/Makefile +++ b/libsrc/Makefile @@ -253,14 +253,14 @@ export CC65_HOME := $(abspath ..) define ASSEMBLE_recipe -$(if $(TRAVIS),,@echo $(TARGET) - $<) +$(if $(QUIET),,@echo $(TARGET) - $<) @$(CA65) -t $(TARGET) $(CA65FLAGS) --create-dep $(@:.o=.d) -o $@ $< endef # ASSEMBLE_recipe define COMPILE_recipe -$(if $(TRAVIS),,@echo $(TARGET) - $<) +$(if $(QUIET),,@echo $(TARGET) - $<) @$(CC65) -t $(TARGET) $(CC65FLAGS) --create-dep $(@:.o=.d) --dep-target $@ -o $(@:.o=.s) $< @$(CA65) -t $(TARGET) -o $@ $(@:.o=.s) diff --git a/src/Makefile b/src/Makefile index 0ab43081a..17754190c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -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