From e401e6846b174c3f5deda3b3e19d89de2e4ac78a Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <b_michaelsen@openoffice.org>
Date: Fri, 23 Jul 2010 12:48:45 +0200
Subject: gnumake2: some more checks for module makefiles

---
 framework/Makefile        | 10 +++++++++-
 framework/prj/makefile.mk |  9 +++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'framework')

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)
-- 
cgit