[Libreoffice-commits] .: Branch 'feature/gnumake2.1' - 2 commits - starmath/prj sw/Library_sw.mk

[Norbert Thiebaud]

 starmath/prj/gbuild.lst  |    1 -
 starmath/prj/makefile.mk |   40 ++++++++++++++++++++++++++++++++++++++++
 sw/Library_sw.mk         |    2 ++
 3 files changed, 42 insertions(+), 1 deletion(-)

New commits:
commit 6f5a90f72a9eab34093ba53e4a08e08beb8ad936
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Jan 16 18:19:24 2011 -0600

    rebase introduced a new file to build in sw

diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 34bfb5f..ed7c53c 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -631,6 +631,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
 	sw/source/ui/shells/langhelper \
 	sw/source/ui/shells/listsh \
 	sw/source/ui/shells/mediash \
+	sw/source/ui/shells/navsh \
 	sw/source/ui/shells/olesh \
 	sw/source/ui/shells/slotadd \
 	sw/source/ui/shells/tabsh \
@@ -714,6 +715,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
 	sw/source/ui/web/wview \
 	sw/source/ui/wrtsh/delete \
 	sw/source/ui/wrtsh/move \
+	sw/source/ui/wrtsh/navmgr \
 	sw/source/ui/wrtsh/select \
 	sw/source/ui/wrtsh/wrtsh1 \
 	sw/source/ui/wrtsh/wrtsh2 \
commit 64a45c8d01804a4571ce1238a5317efcfd9ec609
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Jan 16 18:18:55 2011 -0600

    add mising makefile.mk for gmake of starmath

diff --git a/starmath/prj/gbuild.lst b/starmath/prj/gbuild.lst
index f2bae57..ebfe515 100644
--- a/starmath/prj/gbuild.lst
+++ b/starmath/prj/gbuild.lst
@@ -1,3 +1,2 @@
 sm	starmath	:    l10n svx dtrans NULL
 sm	starmath\prj							nmake	-	all	sm_prj NULL
-
diff --git a/starmath/prj/makefile.mk b/starmath/prj/makefile.mk
new file mode 100644
index 0000000..c677d2b
--- /dev/null
+++ b/starmath/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)