summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorBjoern Michaelsen <b_michaelsen@openoffice.org>2010-07-23 12:48:45 +0200
committerBjoern Michaelsen <b_michaelsen@openoffice.org>2010-07-23 12:48:45 +0200
commite401e6846b174c3f5deda3b3e19d89de2e4ac78a (patch)
treeeb2a9a02a8a464c59302b6da0fadca5e5f449e3e /framework
parent17381ec4f0f9aa1b0283ff3096e15bac86413c4d (diff)
gnumake2: some more checks for module makefiles
Diffstat (limited to 'framework')
-rw-r--r--framework/Makefile10
-rw-r--r--framework/prj/makefile.mk9
2 files changed, 16 insertions, 3 deletions
diff --git a/framework/Makefile b/framework/Makefile
index b198cc3d4c32..3225bc97e12c 100644
--- a/framework/Makefile
+++ b/framework/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/framework/prj/makefile.mk b/framework/prj/makefile.mk
index 8b00cb5a5818..3b1b54d4357f 100644
--- a/framework/prj/makefile.mk
+++ b/framework/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)