From f8aff3e6998baa5f7df0411273c90804731fa6f0 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Thu, 4 Aug 2011 19:05:36 +0200 Subject: late postmerge fixes --- reportdesign/Package_xml.mk | 32 -------------------------------- reportdesign/prj/build.lst | 1 - reportdesign/prj/makefile.mk | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 33 deletions(-) delete mode 100644 reportdesign/Package_xml.mk create mode 100644 reportdesign/prj/makefile.mk diff --git a/reportdesign/Package_xml.mk b/reportdesign/Package_xml.mk deleted file mode 100644 index cadb0505a667..000000000000 --- a/reportdesign/Package_xml.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -*- 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. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,reportdesign_xml,$(SRCDIR)/reportdesign/prj)) -$(eval $(call gb_Package_add_file,reportdesign_xml,prj/rpt.xml,rpt.xml)) - -# vim: set noet sw=4 ts=4: 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 +# +# 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 -- cgit 1 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/include/basegfx/tuple/b2dtuple.hxx
AgeCommit message (Expand)Author
2023-10-08Drop temporary aliases from Tuple2D and Tuple3DMike Kaganski