You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/14 23:50:43 UTC
svn commit: r1409499 - in /incubator/ooo/branches/gbuild/main: ./ cppcanvas/
cppcanvas/inc/cppcanvas/ cppcanvas/prj/ solenv/inc/
Author: arist
Date: Wed Nov 14 22:50:42 2012
New Revision: 1409499
URL: http://svn.apache.org/viewvc?rev=1409499&view=rev
Log:
gnumake4_014_a93ffc180db8.patch
# HG changeset patch
# User mba
# Date 1298652576 -3600
# Node ID a93ffc180db8763ea23f02af2f02720a4467af1f
# Parent f746defd189436817eaf5e0725930a919139ebba
CWS gnumake4: convert cppcanvas to new build system
Added:
incubator/ooo/branches/gbuild/main/cppcanvas/Library_cppcanvas.mk
incubator/ooo/branches/gbuild/main/cppcanvas/Makefile
incubator/ooo/branches/gbuild/main/cppcanvas/Module_cppcanvas.mk
incubator/ooo/branches/gbuild/main/cppcanvas/Package_inc.mk
incubator/ooo/branches/gbuild/main/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
incubator/ooo/branches/gbuild/main/cppcanvas/prj/makefile.mk
Modified:
incubator/ooo/branches/gbuild/main/Module_ooo.mk
incubator/ooo/branches/gbuild/main/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
incubator/ooo/branches/gbuild/main/cppcanvas/inc/cppcanvas/vclfactory.hxx
incubator/ooo/branches/gbuild/main/cppcanvas/prj/build.lst
incubator/ooo/branches/gbuild/main/cppcanvas/prj/d.lst
incubator/ooo/branches/gbuild/main/solenv/inc/libs.mk
Modified: incubator/ooo/branches/gbuild/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Module_ooo.mk?rev=1409499&r1=1409498&r2=1409499&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Module_ooo.mk (original)
+++ incubator/ooo/branches/gbuild/main/Module_ooo.mk Wed Nov 14 22:50:42 2012
@@ -26,6 +26,7 @@ $(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
canvas \
comphelper \
+ cppcanvas \
drawinglayer \
editeng \
framework \
Added: incubator/ooo/branches/gbuild/main/cppcanvas/Library_cppcanvas.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/cppcanvas/Library_cppcanvas.mk?rev=1409499&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/cppcanvas/Library_cppcanvas.mk (added)
+++ incubator/ooo/branches/gbuild/main/cppcanvas/Library_cppcanvas.mk Wed Nov 14 22:50:42 2012
@@ -0,0 +1,91 @@
+#*************************************************************************
+#
+# 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_Library_Library,cppcanvas))
+
+$(eval $(call gb_Library_add_package_headers,cppcanvas,cppcanvas_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,cppcanvas,$(SRCDIR)/cppcanvas/inc/precompiled_cppcanvas))
+
+$(eval $(call gb_Library_add_api,cppcanvas,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,cppcanvas,\
+ -I$(SRCDIR)/cppcanvas/inc \
+ -I$(SRCDIR)/cppcanvas/inc/pch \
+ -I$(SRCDIR)/cppcanvas/source/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_set_defs,cppcanvas,\
+ $$(DEFS) \
+ -DCPPCANVAS_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,cppcanvas,\
+ tl \
+ cppu \
+ sal \
+ vcl \
+ stl \
+ comphelper \
+ canvastools \
+ cppuhelper \
+ basegfx \
+ i18nisolang1 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,cppcanvas,\
+ cppcanvas/source/mtfrenderer/bitmapaction \
+ cppcanvas/source/mtfrenderer/cachedprimitivebase \
+ cppcanvas/source/mtfrenderer/implrenderer \
+ cppcanvas/source/mtfrenderer/lineaction \
+ cppcanvas/source/mtfrenderer/mtftools \
+ cppcanvas/source/mtfrenderer/pointaction \
+ cppcanvas/source/mtfrenderer/polypolyaction \
+ cppcanvas/source/mtfrenderer/textaction \
+ cppcanvas/source/mtfrenderer/transparencygroupaction \
+ cppcanvas/source/tools/canvasgraphichelper \
+ cppcanvas/source/tools/tools \
+ cppcanvas/source/wrapper/basegfxfactory \
+ cppcanvas/source/wrapper/implbitmap \
+ cppcanvas/source/wrapper/implbitmapcanvas \
+ cppcanvas/source/wrapper/implcanvas \
+ cppcanvas/source/wrapper/implcolor \
+ cppcanvas/source/wrapper/implcustomsprite \
+ cppcanvas/source/wrapper/implfont \
+ cppcanvas/source/wrapper/implpolypolygon \
+ cppcanvas/source/wrapper/implsprite \
+ cppcanvas/source/wrapper/implspritecanvas \
+ cppcanvas/source/wrapper/impltext \
+ cppcanvas/source/wrapper/vclfactory \
+))
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/cppcanvas/Makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/cppcanvas/Makefile?rev=1409499&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/cppcanvas/Makefile (added)
+++ incubator/ooo/branches/gbuild/main/cppcanvas/Makefile Wed Nov 14 22:50:42 2012
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/cppcanvas/Module_cppcanvas.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/cppcanvas/Module_cppcanvas.mk?rev=1409499&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/cppcanvas/Module_cppcanvas.mk (added)
+++ incubator/ooo/branches/gbuild/main/cppcanvas/Module_cppcanvas.mk Wed Nov 14 22:50:42 2012
@@ -0,0 +1,35 @@
+#*************************************************************************
+#
+# 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_Module_Module,cppcanvas))
+
+$(eval $(call gb_Module_add_targets,cppcanvas,\
+ Library_cppcanvas \
+ Package_inc \
+))
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/cppcanvas/Package_inc.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/cppcanvas/Package_inc.mk?rev=1409499&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/cppcanvas/Package_inc.mk (added)
+++ incubator/ooo/branches/gbuild/main/cppcanvas/Package_inc.mk Wed Nov 14 22:50:42 2012
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# 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,cppcanvas_inc,$(SRCDIR)/cppcanvas/inc))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/canvas.hxx,cppcanvas/canvas.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/sprite.hxx,cppcanvas/sprite.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/vclfactory.hxx,cppcanvas/vclfactory.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/font.hxx,cppcanvas/font.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/customsprite.hxx,cppcanvas/customsprite.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/canvasgraphic.hxx,cppcanvas/canvasgraphic.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/polypolygon.hxx,cppcanvas/polypolygon.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/color.hxx,cppcanvas/color.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/spritecanvas.hxx,cppcanvas/spritecanvas.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/text.hxx,cppcanvas/text.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/renderer.hxx,cppcanvas/renderer.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/basegfxfactory.hxx,cppcanvas/basegfxfactory.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/bitmap.hxx,cppcanvas/bitmap.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/bitmapcanvas.hxx,cppcanvas/bitmapcanvas.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/cppcanvasdllapi.h,cppcanvas/cppcanvasdllapi.h))
+
+# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/cppcanvas/inc/cppcanvas/basegfxfactory.hxx?rev=1409499&r1=1409498&r2=1409499&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/cppcanvas/inc/cppcanvas/basegfxfactory.hxx (original)
+++ incubator/ooo/branches/gbuild/main/cppcanvas/inc/cppcanvas/basegfxfactory.hxx Wed Nov 14 22:50:42 2012
@@ -34,6 +34,7 @@
#include <cppcanvas/sprite.hxx>
#include <basegfx/vector/b2isize.hxx>
+#include <cppcanvas/cppcanvasdllapi.h>
namespace basegfx
{
@@ -58,7 +59,7 @@ namespace cppcanvas
only be drawn on exactly that canvas. You have to regenerate
them for different canvases.
*/
- class BaseGfxFactory
+ class CPPCANVAS_DLLPUBLIC BaseGfxFactory
{
public:
static BaseGfxFactory& getInstance();
Added: incubator/ooo/branches/gbuild/main/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h?rev=1409499&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h (added)
+++ incubator/ooo/branches/gbuild/main/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h Wed Nov 14 22:50:42 2012
@@ -0,0 +1,38 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef INCLUDED_CPPCANVASDLLAPI_H
+#define INCLUDED_CPPCANVASDLLAPI_H
+
+#if defined CPPCANVAS_DLLIMPLEMENTATION
+
+#define CPPCANVAS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define CPPCANVAS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define CPPCANVAS_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
Modified: incubator/ooo/branches/gbuild/main/cppcanvas/inc/cppcanvas/vclfactory.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/cppcanvas/inc/cppcanvas/vclfactory.hxx?rev=1409499&r1=1409498&r2=1409499&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/cppcanvas/inc/cppcanvas/vclfactory.hxx (original)
+++ incubator/ooo/branches/gbuild/main/cppcanvas/inc/cppcanvas/vclfactory.hxx Wed Nov 14 22:50:42 2012
@@ -33,6 +33,7 @@
#include <cppcanvas/text.hxx>
#include <cppcanvas/sprite.hxx>
+#include <cppcanvas/cppcanvasdllapi.h>
class Window;
class Bitmap;
@@ -66,7 +67,7 @@ namespace cppcanvas
only be drawn on exactly that canvas. You have to regenerate
them for different canvases.
*/
- class VCLFactory
+ class CPPCANVAS_DLLPUBLIC VCLFactory
{
public:
static VCLFactory& getInstance();
Modified: incubator/ooo/branches/gbuild/main/cppcanvas/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/cppcanvas/prj/build.lst?rev=1409499&r1=1409498&r2=1409499&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/cppcanvas/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/cppcanvas/prj/build.lst Wed Nov 14 22:50:42 2012
@@ -1,7 +1,2 @@
cx cppcanvas : comphelper cppuhelper offapi tools vcl basegfx canvas NULL
-cx cppcanvas usr1 - all cx_mkout NULL
-cx cppcanvas\inc nmake - all cx_inc NULL
-cx cppcanvas\source\tools nmake - all cx_tools cx_inc NULL
-cx cppcanvas\source\wrapper nmake - all cx_wrapper cx_inc NULL
-cx cppcanvas\source\mtfrenderer nmake - all cx_mtfrenderer cx_inc NULL
-cx cppcanvas\util nmake - all cx_util cx_tools cx_wrapper cx_mtfrenderer NULL
+cx cppcanvas\prj nmake - all cx_prj NULL
Modified: incubator/ooo/branches/gbuild/main/cppcanvas/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/cppcanvas/prj/d.lst?rev=1409499&r1=1409498&r2=1409499&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/cppcanvas/prj/d.lst (original)
+++ incubator/ooo/branches/gbuild/main/cppcanvas/prj/d.lst Wed Nov 14 22:50:42 2012
@@ -1,20 +0,0 @@
-..\%__SRC%\bin\cppcanv*.dll %_DEST%\bin%_EXT%\cppcanv*.dll
-..\%__SRC%\lib\icppcanvas.lib %_DEST%\lib%_EXT%\icppcanvas.lib
-..\%__SRC%\lib\cppcanvas.lib %_DEST%\lib%_EXT%\cppcanvas.lib
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-
-mkdir: %_DEST%\inc%_EXT%\cppcanvas
-..\inc\cppcanvas\bitmap.hxx %_DEST%\inc%_EXT%\cppcanvas\bitmap.hxx
-..\inc\cppcanvas\bitmapcanvas.hxx %_DEST%\inc%_EXT%\cppcanvas\bitmapcanvas.hxx
-..\inc\cppcanvas\canvas.hxx %_DEST%\inc%_EXT%\cppcanvas\canvas.hxx
-..\inc\cppcanvas\canvasgraphic.hxx %_DEST%\inc%_EXT%\cppcanvas\canvasgraphic.hxx
-..\inc\cppcanvas\color.hxx %_DEST%\inc%_EXT%\cppcanvas\color.hxx
-..\inc\cppcanvas\customsprite.hxx %_DEST%\inc%_EXT%\cppcanvas\customsprite.hxx
-..\inc\cppcanvas\font.hxx %_DEST%\inc%_EXT%\cppcanvas\font.hxx
-..\inc\cppcanvas\polypolygon.hxx %_DEST%\inc%_EXT%\cppcanvas\polypolygon.hxx
-..\inc\cppcanvas\renderer.hxx %_DEST%\inc%_EXT%\cppcanvas\renderer.hxx
-..\inc\cppcanvas\sprite.hxx %_DEST%\inc%_EXT%\cppcanvas\sprite.hxx
-..\inc\cppcanvas\spritecanvas.hxx %_DEST%\inc%_EXT%\cppcanvas\spritecanvas.hxx
-..\inc\cppcanvas\text.hxx %_DEST%\inc%_EXT%\cppcanvas\text.hxx
-..\inc\cppcanvas\vclfactory.hxx %_DEST%\inc%_EXT%\cppcanvas\vclfactory.hxx
-..\inc\cppcanvas\basegfxfactory.hxx %_DEST%\inc%_EXT%\cppcanvas\basegfxfactory.hxx
Added: incubator/ooo/branches/gbuild/main/cppcanvas/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/cppcanvas/prj/makefile.mk?rev=1409499&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/cppcanvas/prj/makefile.mk (added)
+++ incubator/ooo/branches/gbuild/main/cppcanvas/prj/makefile.mk Wed Nov 14 22:50:42 2012
@@ -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
Modified: incubator/ooo/branches/gbuild/main/solenv/inc/libs.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/inc/libs.mk?rev=1409499&r1=1409498&r2=1409499&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/inc/libs.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/inc/libs.mk Wed Nov 14 22:50:42 2012
@@ -81,7 +81,7 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID)
.IF "$(GUI)"=="OS2"
UCBHELPERLIB=-lucbh$(UCBHELPER_MAJOR)
.ELSE
-UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)
+UCBHELPERLIB=-lucbhelper4$(COMID)
.ENDIF
.IF "$(SYSTEM_OPENSSL)" == "YES"
OPENSSLLIB=$(OPENSSL_LIBS)