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 | 9a43a95ce9bb556bd9d18fce6ad008cb65a8041c (patch) | |
| tree | c09d6c9299a5ca66a44da5c491fd176152da7457 | |
| parent | 51eb081f6d9113be975270435f8f4f8e73e5a5c9 (diff) | |
late postmerge fixes
| -rw-r--r-- | reportdesign/prj/build.lst | 1 | ||||
| -rw-r--r-- | reportdesign/prj/makefile.mk (renamed from reportdesign/Package_xml.mk) | 18 |
2 files changed, 13 insertions, 6 deletions
diff --git a/reportdesign/prj/build.lst b/reportdesign/prj/build.lst index c08517e01..cf0e16c24 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/Package_xml.mk b/reportdesign/prj/makefile.mk index cadb0505a..d30ff8a47 100644 --- a/reportdesign/Package_xml.mk +++ b/reportdesign/prj/makefile.mk @@ -1,9 +1,8 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -26,7 +25,16 @@ # #************************************************************************* -$(eval $(call gb_Package_Package,reportdesign_xml,$(SRCDIR)/reportdesign/prj)) -$(eval $(call gb_Package_add_file,reportdesign_xml,prj/rpt.xml,rpt.xml)) +PRJ=.. +TARGET=prj -# vim: set noet sw=4 ts=4: +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog |