[Libreoffice-commits] .: reportdesign/Package_xml.mk reportdesign/prj

[Matus Kukan]

 reportdesign/Package_xml.mk  |   32 --------------------------------
 reportdesign/prj/build.lst   |    1 -
 reportdesign/prj/makefile.mk |   40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 33 deletions(-)

New commits:
commit 9a43a95ce9bb556bd9d18fce6ad008cb65a8041c
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Aug 4 19:05:36 2011 +0200

    late postmerge fixes

diff --git a/reportdesign/Package_xml.mk b/reportdesign/Package_xml.mk
deleted file mode 100644
index cadb050..0000000
--- 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
-# <http://www.openoffice.org/license.html>
-# 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 c08517e..cf0e16c 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 0000000..d30ff8a
--- /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