diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-07-23 12:48:45 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-07-23 12:48:45 +0200 |
| commit | 93a3eed87acd6581f851ff92a3332de8e0ff8c29 (patch) | |
| tree | 2b689e3c563fb786b38263a4c14eb3be9412c35d /tools | |
| parent | 74284c8e763f19cd9f7891c5c836e0a53abf06b3 (diff) | |
gnumake2: some more checks for module makefiles
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 10 | ||||
| -rw-r--r-- | tools/prj/makefile.mk | 9 |
2 files changed, 16 insertions, 3 deletions
diff --git a/tools/Makefile b/tools/Makefile index b198cc3d4c32..3225bc97e12c 100644 --- a/tools/Makefile +++ b/tools/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/tools/prj/makefile.mk b/tools/prj/makefile.mk index 8b00cb5a5818..3b1b54d4357f 100644 --- a/tools/prj/makefile.mk +++ b/tools/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) |