Merge remote-tracking branch 'upstream/master' into a5200

[cc65] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 87548628bc5b6c27391e504897198623f7b5bd41..2c2267ae78b76605181926c0769829a350ddb325 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,10 +2,6 @@ ifneq ($(shell echo),)
   CMD_EXE = 1
 endif
 
-.PHONY: all mostlyclean clean install avail unavail bin $(PROGS)
-
-.SUFFIXES:
-
 PROGS = ar65  \
         ca65  \
         cc65  \
@@ -18,6 +14,10 @@ PROGS = ar65  \
         sim65 \
         sp65
 
+.PHONY: all mostlyclean clean install zip avail unavail bin $(PROGS)
+
+.SUFFIXES:
+
 bindir  := $(prefix)/bin
 datadir := $(if $(prefix),$(prefix)/share/cc65,$(abspath ..))
 
@@ -30,12 +30,27 @@ LD65_CFG = $(datadir)/cfg
 CC = $(CROSS_COMPILE)gcc
 AR = $(CROSS_COMPILE)ar
 
-CFLAGS += -MMD -MP -O -I common $(USER_CFLAGS) \
-          -Wall -Wextra -Wno-char-subscripts \
-          -DCA65_INC=$(CA65_INC) -DCC65_INC=$(CC65_INC) \
-          -DLD65_LIB=$(LD65_LIB) -DLD65_OBJ=$(LD65_OBJ) -DLD65_CFG=$(LD65_CFG)
+ifdef CROSS_COMPILE
+  $(info CC: $(CC))
+  $(info AR: $(AR))
+endif
+
+ifdef USER_CFLAGS
+  $(info USER_CFLAGS: $(USER_CFLAGS))
+endif
 
-CFLAGS += $(if $(TRAVIS),-Werror)
+ifndef GIT_SHA
+  GIT_SHA := $(if $(wildcard ../.git),$(shell git rev-parse --short HEAD))
+  ifneq ($(words $(GIT_SHA)),1)
+    GIT_SHA := N/A
+  endif
+endif
+$(info GIT_SHA: $(GIT_SHA))
+
+CFLAGS += -MMD -MP -O -I common \
+          -Wall -Wextra -Wno-char-subscripts $(USER_CFLAGS) \
+          -DGIT_SHA=$(GIT_SHA) -DCA65_INC=$(CA65_INC) -DCC65_INC=$(CC65_INC) \
+          -DLD65_LIB=$(LD65_LIB) -DLD65_OBJ=$(LD65_OBJ) -DLD65_CFG=$(LD65_CFG)
 
 LDLIBS += -lm
 
@@ -97,6 +112,9 @@ unavail:
 
 endif # CMD_EXE
 
+zip:
+       @cd .. && zip cc65 bin/*
+
 define OBJS_template
 
 $1_OBJS := $$(patsubst %.c,../wrk/%.o,$$(wildcard $1/*.c))