cfg/atari-xex.cfg: fix typo in comment

[cc65] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 87548628bc5b6c27391e504897198623f7b5bd41..c93a8645f7df477804ecae22d17f784435926542 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,40 +2,71 @@ ifneq ($(shell echo),)
   CMD_EXE = 1
 endif
 
-.PHONY: all mostlyclean clean install avail unavail bin $(PROGS)
+PROGS = ar65     \
+        ca65     \
+        cc65     \
+        chrcvt65 \
+        cl65     \
+        co65     \
+        da65     \
+        grc65    \
+        ld65     \
+        od65     \
+        sim65    \
+        sp65
 
-.SUFFIXES:
+.PHONY: all mostlyclean clean install zip avail unavail bin $(PROGS)
 
-PROGS = ar65  \
-        ca65  \
-        cc65  \
-        cl65  \
-        co65  \
-        da65  \
-        grc65 \
-        ld65  \
-        od65  \
-        sim65 \
-        sp65
+.SUFFIXES:
 
-bindir  := $(prefix)/bin
-datadir := $(if $(prefix),$(prefix)/share/cc65,$(abspath ..))
+bindir  := $(PREFIX)/bin
+datadir := $(if $(PREFIX),$(PREFIX)/share/cc65,$(abspath ..))
 
 CA65_INC = $(datadir)/asminc
 CC65_INC = $(datadir)/include
+CL65_TGT = $(datadir)/target
 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
+
+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) || svnversion 2>$(NULLDEV))
+  ifneq ($(words $(GIT_SHA)),1)
+    GIT_SHA := N/A
+    $(info GIT_SHA: N/A)
+  endif
+endif
 
-CFLAGS += $(if $(TRAVIS),-Werror)
+CFLAGS += -MMD -MP -O3 -I common \
+          -Wall -Wextra -Wno-char-subscripts $(USER_CFLAGS) \
+          -DCA65_INC="$(CA65_INC)" -DCC65_INC="$(CC65_INC)" -DCL65_TGT="$(CL65_TGT)" \
+          -DLD65_LIB="$(LD65_LIB)" -DLD65_OBJ="$(LD65_OBJ)" -DLD65_CFG="$(LD65_CFG)" \
+          -DGIT_SHA=$(GIT_SHA)
 
 LDLIBS += -lm
 
@@ -47,15 +78,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:
@@ -85,7 +107,7 @@ $(RM) /usr/local/bin/$(prog)
 endef # UNAVAIL_recipe
 
 install:
-       $(if $(prefix),,$(error variable `prefix' must be set))
+       $(if $(PREFIX),,$(error variable "PREFIX" must be set))
        $(INSTALL) -d $(DESTDIR)$(bindir)
        $(INSTALL) ../bin/* $(DESTDIR)$(bindir)
 
@@ -97,6 +119,9 @@ unavail:
 
 endif # CMD_EXE
 
+zip:
+       @cd .. && zip cc65 bin/*
+
 define OBJS_template
 
 $1_OBJS := $$(patsubst %.c,../wrk/%.o,$$(wildcard $1/*.c))