commit 6c5e542c0d28405f0d96ee712bfad90bdc4b4af5 parent 1f43b75a1163e7edec45e03d2905f4abcb105506 Author: Roberto E. Vargas Caballero <k0ga@shike2.com> Date: Fri, 20 Sep 2019 19:30:43 +0200 Move STD to rules.mk This allows to execute some nested Makefiles without including env.sh. Diffstat:
| M | Makefile | | | 1 | - |
| M | scripts/rules.mk | | | 11 | ++++++----- |
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile @@ -3,7 +3,6 @@ PROJECTDIR = . include $(PROJECTDIR)/scripts/rules.mk -STD = c99 PREFIX = $(PWD)/$(PROJECTDIR)/root MANPREFIX = $(PREFIX)/share/man DIRS = src include/scc/scc tests diff --git a/scripts/rules.mk b/scripts/rules.mk @@ -17,11 +17,12 @@ ENVIRON = $(SCRIPTDIR)/env.sh INCLUDE = -I$(INCDIR)/scc -CC = $(CROSS_COMPILE)$(COMP) -AS = $(CROSS_COMPILE)$(ASM) -LD = $(CROSS_COMPILE)$(LINKER) -RL = $(CROSS_COMPILE)$(RANLIB) -AR = $(CROSS_COMPILE)$(ARCHIVE) +STD = c99 +CC = $(CROSS_COMPILE)$(COMP) +AS = $(CROSS_COMPILE)$(ASM) +LD = $(CROSS_COMPILE)$(LINKER) +RL = $(CROSS_COMPILE)$(RANLIB) +AR = $(CROSS_COMPILE)$(ARCHIVE) SCC_CFLAGS =\ $(MORECFLAGS)\