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 | 5bba5a1fea8737ec024b5d3a43a3b408af30c659 (patch) | |
| tree | f339e9b81cbe49dba28f9117d0ca7b3a6750dc71 /sw | |
| parent | 8df0968f98507dd244d8b3845284622a76a6d8c8 (diff) | |
gnumake2: some more checks for module makefiles
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/Makefile | 10 | ||||
| -rw-r--r-- | sw/prj/makefile.mk | 9 |
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) |