[Libreoffice-commits] .: Branch 'feature/gnumake2' - 11 commits - svl/Makefile svl/prj svtools/Executable_g2g.mk svtools/Makefile svtools/source toolkit/Makefile toolkit/Package_inc.mk tools/Executable_mkunroll.mk tools/Executable_rscdep.mk tools/Executable_so_checksum.mk tools/Executable_sspretty.mk tools/Library_tl.mk tools/Makefile tools/Module_tools.mk tools/Package_inc.mk
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Mon Dec 20 10:02:39 PST 2010
svl/Makefile | 4 +--
svl/prj/build.lst | 2 -
svtools/Executable_g2g.mk | 1
svtools/Makefile | 4 +--
svtools/source/filter.vcl/filter/FilterConfigCache.cxx | 2 -
svtools/source/filter.vcl/filter/FilterConfigItem.cxx | 2 -
toolkit/Makefile | 4 +--
toolkit/Package_inc.mk | 7 ++++++
tools/Executable_mkunroll.mk | 2 -
tools/Executable_rscdep.mk | 2 -
tools/Executable_so_checksum.mk | 2 -
tools/Executable_sspretty.mk | 2 -
tools/Library_tl.mk | 7 ++----
tools/Makefile | 4 +--
tools/Module_tools.mk | 18 +----------------
tools/Package_inc.mk | 2 -
16 files changed, 29 insertions(+), 36 deletions(-)
New commits:
commit 97f05b7ba5e2ce7b3703011e26993f20492f8e36
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Dec 20 11:43:54 2010 -0600
fixing namespace collision
diff --git a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx b/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
index f00fd2d..123f4de 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::container ; // XNameAccess
using namespace ::com::sun::star::uno ; // Reference
using namespace ::com::sun::star::beans ; // PropertyValue
using namespace ::utl ; // getProcessServiceFactory();
-using namespace ::rtl ;
+using ::rtl::OUString;
const char* FilterConfigCache::FilterConfigCacheEntry::InternalPixelFilterNameList[] =
{
diff --git a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
index d6b2377..345f784 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
@@ -39,7 +39,7 @@
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-using namespace ::rtl;
+using ::rtl::OUString;
using namespace ::utl ; // getProcessServiceFactory
using namespace ::com::sun::star::lang ; // XMultiServiceFactory
using namespace ::com::sun::star::beans ; // PropertyValue
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 069efc5..b88b51b 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_Library_set_include,tl,\
$(eval $(call gb_Library_set_defs,tl,\
$$(DEFS) \
- -DSHARED_LIB \
-DTOOLS_DLLIMPLEMENTATION \
-DVCL \
))
commit 983d51490413289bfcc99db8d0d29cde8e0d3d73
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Dec 20 09:36:18 2010 -0600
using set_defs instead of set_cxxflags in library tl as we should
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 68e1a14..069efc5 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -44,8 +44,8 @@ $(eval $(call gb_Library_set_include,tl,\
-I$(OUTDIR)/inc/stl \
))
-$(eval $(call gb_Library_set_cxxflags,tl,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_defs,tl,\
+ $$(DEFS) \
-DSHARED_LIB \
-DTOOLS_DLLIMPLEMENTATION \
-DVCL \
commit 4bfeb3e4dd7190e3dd91a8d93d7232433a3a0c0e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Dec 20 09:23:18 2010 -0600
getting rid of obsolete install and uninstall targets
diff --git a/svl/prj/makefile.mk b/svl/prj/makefile.mk
index 4a86a6d..ab983d2 100644
--- a/svl/prj/makefile.mk
+++ b/svl/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
.ENDIF
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk
index 4a86a6d..ab983d2 100644
--- a/svtools/prj/makefile.mk
+++ b/svtools/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
.ENDIF
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
diff --git a/toolkit/prj/makefile.mk b/toolkit/prj/makefile.mk
index 4a86a6d..ab983d2 100644
--- a/toolkit/prj/makefile.mk
+++ b/toolkit/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
.ENDIF
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk
index 4a86a6d..ab983d2 100644
--- a/tools/prj/makefile.mk
+++ b/tools/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
.ENDIF
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
commit cfb225acb47c4e9662280cfabfcfc67431569ecb
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Dec 20 08:59:14 2010 -0600
fix merge error
diff --git a/toolkit/Package_inc.mk b/toolkit/Package_inc.mk
index 3fc23a5..e6167a6 100644
--- a/toolkit/Package_inc.mk
+++ b/toolkit/Package_inc.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/mutexandbroadca
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/mutexhelper.hxx,toolkit/helper/mutexhelper.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/property.hxx,toolkit/helper/property.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/servicenames.hxx,toolkit/helper/servicenames.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/solarrelease.hxx,toolkit/helper/solarrelease.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/throbberimpl.hxx,toolkit/helper/throbberimpl.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/tkresmgr.hxx,toolkit/helper/tkresmgr.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unomemorystream.hxx,toolkit/helper/unomemorystream.hxx))
commit a49cbbbeb3bd032c6a90730b84f3c9a7f30c2cc6
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Dec 20 08:43:50 2010 -0600
more missing headers from toolkit
diff --git a/toolkit/Package_inc.mk b/toolkit/Package_inc.mk
index 5b40430..3fc23a5 100644
--- a/toolkit/Package_inc.mk
+++ b/toolkit/Package_inc.mk
@@ -44,18 +44,25 @@ $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrolbas
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrolmodel.hxx,toolkit/controls/unocontrolmodel.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrols.hxx,toolkit/controls/unocontrols.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/dllapi.h,toolkit/dllapi.h))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/accessibilityclient.hxx,toolkit/helper/accessibilityclient.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/accessiblefactory.hxx,toolkit/helper/accessiblefactory.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/convert.hxx,toolkit/helper/convert.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/emptyfontdescriptor.hxx,toolkit/helper/emptyfontdescriptor.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/externallock.hxx,toolkit/helper/externallock.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/fixedhyperbase.hxx,toolkit/helper/fixedhyperbase.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/formpdfexport.hxx,toolkit/helper/formpdfexport.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/imagealign.hxx,toolkit/helper/imagealign.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/listenermultiplexer.hxx,toolkit/helper/listenermultiplexer.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/macros.hxx,toolkit/helper/macros.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/mutexandbroadcasthelper.hxx,toolkit/helper/mutexandbroadcasthelper.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/mutexhelper.hxx,toolkit/helper/mutexhelper.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/property.hxx,toolkit/helper/property.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/servicenames.hxx,toolkit/helper/servicenames.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/solarrelease.hxx,toolkit/helper/solarrelease.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/throbberimpl.hxx,toolkit/helper/throbberimpl.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/tkresmgr.hxx,toolkit/helper/tkresmgr.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unomemorystream.hxx,toolkit/helper/unomemorystream.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unopropertyarrayhelper.hxx,toolkit/helper/unopropertyarrayhelper.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unowrapper.hxx,toolkit/helper/unowrapper.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/vclunohelper.hxx,toolkit/helper/vclunohelper.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/unohlp.hxx,toolkit/helper/vclunohelper.hxx))
commit 0432605f5c3bd44374051f103f96e2a3534501d8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Dec 20 08:42:49 2010 -0600
added missing header for windows in toolkit
diff --git a/toolkit/Package_inc.mk b/toolkit/Package_inc.mk
index be23e1a..5b40430 100644
--- a/toolkit/Package_inc.mk
+++ b/toolkit/Package_inc.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxcontainer.hxx,
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxdevice.hxx,toolkit/awt/vclxdevice.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxfont.hxx,toolkit/awt/vclxfont.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxmenu.hxx,toolkit/awt/vclxmenu.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxsystemdependentwindow.hxx,toolkit/awt/vclxsystemdependentwindow.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxtoolkit.hxx,toolkit/awt/vclxtoolkit.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxtopwindow.hxx,toolkit/awt/vclxtopwindow.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxwindow.hxx,toolkit/awt/vclxwindow.hxx))
commit 70bd913a8491ebb4ac822946c9a5770a2849a91e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Dec 20 07:40:55 2010 -0600
updated license headers
diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
index e40f6f7..784db2b 100644
--- a/tools/Executable_mkunroll.mk
+++ b/tools/Executable_mkunroll.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index 02b720b..80f4a63 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk
index 3b63897..45edbdb 100644
--- a/tools/Executable_so_checksum.mk
+++ b/tools/Executable_so_checksum.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk
index b59125b..8a2db85 100644
--- a/tools/Executable_sspretty.mk
+++ b/tools/Executable_sspretty.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 55199a7..68e1a14 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index f0ac044..e66c6a3 100644
--- a/tools/Package_inc.mk
+++ b/tools/Package_inc.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
commit db14f83d4474c82bd7d9efc9c0faf066c9f12a3b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Dec 20 07:40:08 2010 -0600
updated license headers
diff --git a/svl/Makefile b/svl/Makefile
index 24d04e5..ff9d4f2 100644
--- a/svl/Makefile
+++ b/svl/Makefile
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index 46f3d12..97069d5 100644
--- a/svtools/Executable_g2g.mk
+++ b/svtools/Executable_g2g.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,g2g,\
))
$(eval $(call gb_Executable_add_linked_libs,g2g,\
+ jvmfwk \
stl \
vcl \
tl \
diff --git a/svtools/Makefile b/svtools/Makefile
index 24d04e5..ff9d4f2 100644
--- a/svtools/Makefile
+++ b/svtools/Makefile
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
diff --git a/toolkit/Makefile b/toolkit/Makefile
index 24d04e5..ff9d4f2 100644
--- a/toolkit/Makefile
+++ b/toolkit/Makefile
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
diff --git a/tools/Makefile b/tools/Makefile
index 24d04e5..ff9d4f2 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk
index eabb317..da9c551 100644
--- a/tools/Module_tools.mk
+++ b/tools/Module_tools.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -25,6 +25,7 @@
#
#*************************************************************************
+
$(eval $(call gb_Module_Module,tools))
$(eval $(call gb_Module_add_targets,tools,\
@@ -36,19 +37,4 @@ $(eval $(call gb_Module_add_targets,tools,\
Package_inc \
))
-# TODO:
-#COPY tools/unxlngx6.pro/lib/atools.lib unxlngx6.pro/lib/atools.lib
-#COPY tools/unxlngx6.pro/lib/bootstrp2.lib unxlngx6.pro/lib/bootstrp2.lib
-#COPY tools/unxlngx6.pro/lib/btstrp.lib unxlngx6.pro/lib/btstrp.lib
-#COPY tools/unxlngx6.pro/lib/libatools.a unxlngx6.pro/lib/libatools.a
-#COPY tools/unxlngx6.pro/lib/libbootstrp2.a unxlngx6.pro/lib/libbootstrp2.a
-#COPY tools/unxlngx6.pro/lib/libbtstrp.a unxlngx6.pro/lib/libbtstrp.a
-#COPY tools/unxlngx6.pro/lib/libstdstrm.a unxlngx6.pro/lib/libstdstrm.a
-#COPY tools/unxlngx6.pro/lib/stdstrm.lib unxlngx6.pro/lib/stdstrm.lib
-#COPY tools/unxlngx6.pro/obj/pathutils.obj unxlngx6.pro/lib/pathutils-obj.obj
-#COPY tools/unxlngx6.pro/slo/pathutils.obj unxlngx6.pro/lib/pathutils-slo.obj
-
-#todo: link tools dynamically everywhere
-#todo: ALWAYSDBGFLAG etc.
-
# vim: set noet sw=4 ts=4:
commit d25509c92395663d8f62ef50cf3079043ae36e6b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Dec 20 06:34:12 2010 -0600
#i115558# svl needs to depend on libxslt for xsltproc
diff --git a/svl/prj/build.lst b/svl/prj/build.lst
index f2d4bf3..8f2e1d8 100644
--- a/svl/prj/build.lst
+++ b/svl/prj/build.lst
@@ -1,4 +1,4 @@
-sl svl : l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot NULL
+sl svl : l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot libxslt NULL
sl svl usr1 - all svl_mkout NULL
sl svl\inc nmake - all svl_inc NULL
sl svl\unx\source\svdde nmake - u svl_usdde svl_inc NULL
commit e71ac19f8ae15d259584e2ff18d67cd1cdab7d44
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Dec 20 05:52:56 2010 -0600
fix naming for partial build vars
diff --git a/svl/Makefile b/svl/Makefile
index 828f0a8..24d04e5 100644
--- a/svl/Makefile
+++ b/svl/Makefile
@@ -29,8 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
$(error No environment set!)
endif
-gb_PARTITIALBUILD := T
-include $(SOLARSRC)/SourcePath.mk
+gb_PARTIALBUILD := T
GBUILDDIR := $(SOLARENV)/gbuild
include $(GBUILDDIR)/gbuild.mk
diff --git a/svtools/Makefile b/svtools/Makefile
index 828f0a8..24d04e5 100644
--- a/svtools/Makefile
+++ b/svtools/Makefile
@@ -29,8 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
$(error No environment set!)
endif
-gb_PARTITIALBUILD := T
-include $(SOLARSRC)/SourcePath.mk
+gb_PARTIALBUILD := T
GBUILDDIR := $(SOLARENV)/gbuild
include $(GBUILDDIR)/gbuild.mk
diff --git a/toolkit/Makefile b/toolkit/Makefile
index 828f0a8..24d04e5 100644
--- a/toolkit/Makefile
+++ b/toolkit/Makefile
@@ -29,8 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
$(error No environment set!)
endif
-gb_PARTITIALBUILD := T
-include $(SOLARSRC)/SourcePath.mk
+gb_PARTIALBUILD := T
GBUILDDIR := $(SOLARENV)/gbuild
include $(GBUILDDIR)/gbuild.mk
diff --git a/tools/Makefile b/tools/Makefile
index 828f0a8..24d04e5 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -29,8 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
$(error No environment set!)
endif
-gb_PARTITIALBUILD := T
-include $(SOLARSRC)/SourcePath.mk
+gb_PARTIALBUILD := T
GBUILDDIR := $(SOLARENV)/gbuild
include $(GBUILDDIR)/gbuild.mk
commit fabb52e1b681db8b69c40c272197da85b2c99749
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Dec 20 04:44:49 2010 -0600
first try at local build dirs
diff --git a/svl/Makefile b/svl/Makefile
index 9d5b8e7..828f0a8 100644
--- a/svl/Makefile
+++ b/svl/Makefile
@@ -29,6 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
$(error No environment set!)
endif
+gb_PARTITIALBUILD := T
include $(SOLARSRC)/SourcePath.mk
GBUILDDIR := $(SOLARENV)/gbuild
include $(GBUILDDIR)/gbuild.mk
diff --git a/svl/prj/makefile.mk b/svl/prj/makefile.mk
index ab983d2..4a86a6d 100644
--- a/svl/prj/makefile.mk
+++ b/svl/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
.ENDIF
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
diff --git a/svtools/Makefile b/svtools/Makefile
index 9d5b8e7..828f0a8 100644
--- a/svtools/Makefile
+++ b/svtools/Makefile
@@ -29,6 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
$(error No environment set!)
endif
+gb_PARTITIALBUILD := T
include $(SOLARSRC)/SourcePath.mk
GBUILDDIR := $(SOLARENV)/gbuild
include $(GBUILDDIR)/gbuild.mk
diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk
index ab983d2..4a86a6d 100644
--- a/svtools/prj/makefile.mk
+++ b/svtools/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
.ENDIF
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
diff --git a/toolkit/Makefile b/toolkit/Makefile
index 9d5b8e7..828f0a8 100644
--- a/toolkit/Makefile
+++ b/toolkit/Makefile
@@ -29,6 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
$(error No environment set!)
endif
+gb_PARTITIALBUILD := T
include $(SOLARSRC)/SourcePath.mk
GBUILDDIR := $(SOLARENV)/gbuild
include $(GBUILDDIR)/gbuild.mk
diff --git a/toolkit/prj/makefile.mk b/toolkit/prj/makefile.mk
index ab983d2..4a86a6d 100644
--- a/toolkit/prj/makefile.mk
+++ b/toolkit/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
.ENDIF
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
diff --git a/tools/Makefile b/tools/Makefile
index 9d5b8e7..828f0a8 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -29,6 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
$(error No environment set!)
endif
+gb_PARTITIALBUILD := T
include $(SOLARSRC)/SourcePath.mk
GBUILDDIR := $(SOLARENV)/gbuild
include $(GBUILDDIR)/gbuild.mk
diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk
index ab983d2..4a86a6d 100644
--- a/tools/prj/makefile.mk
+++ b/tools/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
.ENDIF
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
More information about the Libreoffice-commits
mailing list