summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/Makefile10
-rw-r--r--sw/prj/makefile.mk9
2 files changed, 16 insertions, 3 deletions
diff --git a/sw/Makefile b/sw/Makefile
index b198cc3d4c32..3225bc97e12c 100644
--- a/sw/Makefile
+++ b/sw/Makefile
@@ -25,7 +25,15 @@
#
#*************************************************************************
-include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePath.mk
+ifneq ($(MAKE_VERSION),3.81)
+$(error You need at least GNU Make 3.81!)
+endif
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk
GBUILDDIR := $(SOLARENV)/gbuild
include $(GBUILDDIR)/gbuild.mk
diff --git a/sw/prj/makefile.mk b/sw/prj/makefile.mk
index 8b00cb5a5818..3b1b54d4357f 100644
--- a/sw/prj/makefile.mk
+++ b/sw/prj/makefile.mk
@@ -25,11 +25,16 @@
#
#*************************************************************************
-.IF $(VERBOSE)
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
VERBOSEFLAG :=
.ELSE
VERBOSEFLAG := -s
.ENDIF
all:
- @cd .. && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)