ref: 6c5e542c0d28405f0d96ee712bfad90bdc4b4af5
parent: 1f43b75a1163e7edec45e03d2905f4abcb105506
author: Roberto E. Vargas Caballero <[email protected]>
date: Fri Sep 20 15:30:43 EDT 2019
Move STD to rules.mk This allows to execute some nested Makefiles without including env.sh.
--- 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
--- a/scripts/rules.mk
+++ b/scripts/rules.mk
@@ -17,11 +17,12 @@
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)\