Documented strqtok().

[cc65] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 17e3bc22972735dc5ca9f323713d991ff3ff4145..5aafc4bb8f4b9a44b5d65c531f116bda15679e09 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -27,15 +27,43 @@ LD65_LIB = $(datadir)/lib
 LD65_OBJ = $(datadir)/lib
 LD65_CFG = $(datadir)/cfg
 
+ifdef CMD_EXE
+  NULLDEV = nul:
+  DIRLIST = $(strip $(foreach dir,$1,$(wildcard $(dir))))
+  MKDIR = mkdir $(subst /,\,$1)
+  RMDIR = $(if $(DIRLIST),rmdir /s /q $(subst /,\,$(DIRLIST)))
+else
+  NULLDEV = /dev/null
+  MKDIR = mkdir -p $1
+  RMDIR = $(RM) -r $1
+endif
+
 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
 
-CFLAGS += $(if $(TRAVIS),-Werror)
+ifdef USER_CFLAGS
+  $(info USER_CFLAGS: $(USER_CFLAGS))
+endif
+
+ifdef GIT_SHA
+  $(info GIT_SHA: $(GIT_SHA))
+else
+  GIT_SHA := $(shell git rev-parse --short HEAD 2>$(NULLDEV))
+  ifneq ($(words $(GIT_SHA)),1)
+    GIT_SHA := N/A
+    $(info GIT_SHA: N/A)
+  endif
+endif
+
+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
 
@@ -47,15 +75,6 @@ ifdef CROSS_COMPILE
   EXE_SUFFIX=.exe
 endif
 
-ifdef CMD_EXE
-  DIRLIST = $(strip $(foreach dir,$1,$(wildcard $(dir))))
-  MKDIR = mkdir $(subst /,\,$1)
-  RMDIR = $(if $(DIRLIST),rmdir /s /q $(subst /,\,$(DIRLIST)))
-else
-  MKDIR = mkdir -p $1
-  RMDIR = $(RM) -r $1
-endif
-
 all bin: $(PROGS)
 
 mostlyclean:
@@ -98,7 +117,7 @@ unavail:
 endif # CMD_EXE
 
 zip:
-       cd .. && zip cc65 bin/*
+       @cd .. && zip cc65 bin/*
 
 define OBJS_template