diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2011-08-04 19:05:36 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-08-04 19:05:36 +0200 |
| commit | f8aff3e6998baa5f7df0411273c90804731fa6f0 (patch) | |
| tree | cb28d22cccae862dbe9fb31deab7e05a2d045afd /reportdesign/prj | |
| parent | b82efddccf7c9be957f3fd450f409387d3905f6a (diff) | |
late postmerge fixes
Diffstat (limited to 'reportdesign/prj')
| -rw-r--r-- | reportdesign/prj/build.lst | 1 | ||||
| -rw-r--r-- | reportdesign/prj/makefile.mk | 40 |
2 files changed, 40 insertions, 1 deletions
diff --git a/reportdesign/prj/build.lst b/reportdesign/prj/build.lst index c08517e01bd6..cf0e16c24999 100644 --- a/reportdesign/prj/build.lst +++ b/reportdesign/prj/build.lst @@ -1,3 +1,2 @@ rd reportdesign : TRANSLATIONS:translations BOOST:boost comphelper dbaccess formula LIBXSLT:libxslt NULL rd reportdesign\prj nmake - all rd_prj NULL -rd reportdesign\prj nmake - all rd_prj NULL diff --git a/reportdesign/prj/makefile.mk b/reportdesign/prj/makefile.mk new file mode 100644 index 000000000000..d30ff8a47e6b --- /dev/null +++ b/reportdesign/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog |