[Libreoffice-commits] .: 10 commits - config_host.mk.in configure.in Makefile.top Module_tail_build.mk ooo.lst.in RepositoryFixes.mk RepositoryModule_ooo.mk sc/source solenv/gbuild stoc/source stoc/util unusedcode.easy xsltml/ExternalPackage_xsltml.mk xsltml/Makefile xsltml/makefile.mk xsltml/Module_xsltml.mk xsltml/prj xsltml/UnpackedTarball_xsltml.mk xsltml/xsltml_2.1.2.patch

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Sep 26 02:47:28 PDT 2012 

 Makefile.top                                               |    2 
 Module_tail_build.mk                                       |    1 
 RepositoryFixes.mk                                         |    1 
 RepositoryModule_ooo.mk                                    |    1 
 config_host.mk.in                                          |    3 
 configure.in                                               |    5 -
 ooo.lst.in                                                 |    4 
 sc/source/ui/vba/excelvbahelper.cxx                        |   17 ---
 sc/source/ui/vba/excelvbahelper.hxx                        |    2 
 solenv/gbuild/AllLangZip.mk                                |    3 
 solenv/gbuild/CliAssembly.mk                               |    9 --
 solenv/gbuild/CliLibrary.mk                                |    6 -
 solenv/gbuild/CliNativeLibrary.mk                          |    6 -
 solenv/gbuild/CliUnoApi.mk                                 |    6 -
 solenv/gbuild/ComponentTarget.mk                           |    4 
 solenv/gbuild/Configuration.mk                             |   22 -----
 solenv/gbuild/CustomTarget.mk                              |    4 
 solenv/gbuild/Dictionary.mk                                |    6 -
 solenv/gbuild/ExtensionTarget.mk                           |    3 
 solenv/gbuild/ExternalPackage.mk                           |    6 -
 solenv/gbuild/ExternalProject.mk                           |    6 -
 solenv/gbuild/Helper.mk                                    |   18 ----
 solenv/gbuild/InstallModule.mk                             |    3 
 solenv/gbuild/InstallModuleTarget.mk                       |   18 ----
 solenv/gbuild/InstallScript.mk                             |    6 -
 solenv/gbuild/Library.mk                                   |    1 
 solenv/gbuild/Package.mk                                   |    5 -
 solenv/gbuild/Rdb.mk                                       |    5 -
 solenv/gbuild/StaticLibrary.mk                             |    5 -
 solenv/gbuild/TargetLocations.mk                           |    8 -
 solenv/gbuild/UnoApiTarget.mk                              |    4 
 solenv/gbuild/UnpackedTarball.mk                           |   14 ---
 solenv/gbuild/gbuild.mk                                    |   12 ++
 solenv/gbuild/platform/IOS_ARM_GCC.mk                      |    3 
 solenv/gbuild/platform/WNT_INTEL_GCC.mk                    |   14 ---
 solenv/gbuild/platform/WNT_INTEL_MSC.mk                    |    7 -
 solenv/gbuild/platform/macosx.mk                           |    3 
 solenv/gbuild/platform/solaris.mk                          |    3 
 solenv/gbuild/platform/unxgcc.mk                           |    3 
 stoc/source/invocation/invocation.component                |    2 
 stoc/source/invocation/invocation.cxx                      |    2 
 stoc/source/invocation_adapterfactory/iafactory.cxx        |    2 
 stoc/source/invocation_adapterfactory/invocadapt.component |    2 
 stoc/source/namingservice/namingservice.component          |    2 
 stoc/source/namingservice/namingservice.cxx                |    2 
 stoc/source/proxy_factory/proxyfac.component               |    2 
 stoc/source/proxy_factory/proxyfac.cxx                     |    2 
 stoc/source/stocservices/stocservices.cxx                  |    6 -
 stoc/util/stocservices.component                           |    2 
 unusedcode.easy                                            |    2 
 xsltml/ExternalPackage_xsltml.mk                           |   22 +++++
 xsltml/Makefile                                            |    7 +
 xsltml/Module_xsltml.mk                                    |   21 ++++
 xsltml/UnpackedTarball_xsltml.mk                           |   28 ++++++
 xsltml/makefile.mk                                         |   57 -------------
 xsltml/prj/d.lst                                           |    6 -
 xsltml/xsltml_2.1.2.patch                                  |   36 --------
 57 files changed, 122 insertions(+), 330 deletions(-)

New commits:
commit c640a42f29bd0bb47ac783b6324bd5c73fec7312
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Sep 24 13:49:02 2012 +0200

    xsltml: convert to gbuild
    
    Change-Id: I7074c377b6a8f8250adcae73178882fc9e68c696

diff --git a/Makefile.top b/Makefile.top
index 8b914a6..da83b1b 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -189,6 +189,7 @@ xmloff\
 xmlreader\
 xmlscript\
 xmlsecurity\
+xsltml\
 
 dmake_modules:=\
 apache-commons\
@@ -250,7 +251,6 @@ stlport\
 sysui\
 tomcat\
 xpdf\
-xsltml\
 zlib\
 
 export gb_TAILBUILDTARGET=all slowcheck
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index bbde5cb..8e5c1c1 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -216,6 +216,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	xmlreader \
     xmlscript \
     xmlsecurity \
+	xsltml \
 ))
 
 ifeq ($(MERGELIBS),TRUE)
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index a0b7be2..0e3dcae 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -183,6 +183,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     xmlreader \
     xmlscript \
     xmlsecurity \
+	xsltml \
 ))
 
 # vim: set noet ts=4 sw=4:
diff --git a/config_host.mk.in b/config_host.mk.in
index ff4b83e..2d9577f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -645,8 +645,9 @@ export WPS_LIBS=@WPS_LIBS@
 export WPS_TARBALL=@WPS_TARBALL@
 export XCLASSPATH=@XCLASSPATH@
 export XINERAMA_LINK=@XINERAMA_LINK@
+export XMLLINT=@XMLLINT@
 export XRANDR_CFLAGS=@XRANDR_CFLAGS@
 export XRANDR_DLOPEN=@XRANDR_DLOPEN@
 export XRANDR_LIBS=@XRANDR_LIBS@
+export XSLTML_TARBALL=@XSLTML_TARBALL@
 export XSLTPROC=@XSLTPROC@
-export XMLLINT=@XMLLINT@
diff --git a/configure.in b/configure.in
index 6abfc26..3434f74 100644
--- a/configure.in
+++ b/configure.in
@@ -9681,7 +9681,7 @@ AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
 if test "x$enable_ext_wiki_publisher" = "xyes" -a "x$enable_extension_integration" != "xno" -a "$with_java" != "no"; then
   AC_MSG_RESULT([yes])
   ENABLE_MEDIAWIKI=YES
-  BUILD_TYPE="$BUILD_TYPE SWEXT"
+  XSLTML_TARBALL=a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
   if test  "x$with_java" = "xno"; then
     AC_MSG_ERROR([Wiki Publisher requires Java! Enable Java if you want to build it.])
   fi
@@ -9691,6 +9691,7 @@ else
   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI"
 fi
 AC_SUBST(ENABLE_MEDIAWIKI)
+AC_SUBST(XSLTML_TARBALL)
 
 if test "$ENABLE_MEDIAWIKI" = "YES"; then
     AC_MSG_CHECKING([which Servlet API Jar to use])
diff --git a/ooo.lst.in b/ooo.lst.in
index 2509aae..95a4b86 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -36,7 +36,7 @@ f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
 fa9aa839145cdf860bf596532bb8af97-cppunit-1.13.1.tar.gz
 @MOZ_TARBALL@
 a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
-a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+ at XSLTML_TARBALL@
 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
 bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
diff --git a/xsltml/ExternalPackage_xsltml.mk b/xsltml/ExternalPackage_xsltml.mk
new file mode 100644
index 0000000..bac40f1
--- /dev/null
+++ b/xsltml/ExternalPackage_xsltml.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,xsltml_xsl,xsltml))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,xsltml_xsl,bin/xslt/export/xsltml,\
+	entities.xsl \
+	glayout.xsl \
+	mmltex.xsl \
+	cmarkup.xsl \
+	scripts.xsl \
+	tables.xsl \
+	tokens.xsl \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xsltml/Makefile b/xsltml/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/xsltml/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/xsltml/Module_xsltml.mk b/xsltml/Module_xsltml.mk
new file mode 100644
index 0000000..68de9f2
--- /dev/null
+++ b/xsltml/Module_xsltml.mk
@@ -0,0 +1,21 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,xsltml))
+
+ifeq ($(ENABLE_MEDIAWIKI),YES)
+
+$(eval $(call gb_Module_add_targets,xsltml,\
+	ExternalPackage_xsltml \
+	UnpackedTarball_xsltml \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/xsltml/UnpackedTarball_xsltml.mk b/xsltml/UnpackedTarball_xsltml.mk
new file mode 100644
index 0000000..4151d26
--- /dev/null
+++ b/xsltml/UnpackedTarball_xsltml.mk
@@ -0,0 +1,28 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,xsltml))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,xsltml,$(XSLTML_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,xsltml,\
+	cmarkup.xsl \
+	entities.xsl \
+	glayout.xsl \
+	mmltex.xsl \
+	scripts.xsl \
+	tables.xsl \
+	tokens.xsl \
+))
+ 
+$(eval $(call gb_UnpackedTarball_add_patches,xsltml,\
+	xsltml/xsltml_2.1.2.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xsltml/makefile.mk b/xsltml/makefile.mk
deleted file mode 100644
index af0498a..0000000
--- a/xsltml/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=.
-
-PRJNAME=xsltml
-TARGET=xsltml
-
-.IF "$(ENABLE_MEDIAWIKI)" == "YES"
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=xsltml_2.1.2
-TARFILE_MD5=a7983f859eafb2677d7ff386a023bc40
-PATCH_FILES=$(TARFILE_NAME).patch
-TARFILE_IS_FLAT:=TRUE
-
-CONVERTFILES=\
-    README \
-    entities.xsl \
-    glayout.xsl \
-    mmltex.xsl \
-    cmarkup.xsl \
-    scripts.xsl \
-    tables.xsl \
-    tokens.xsl \
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	set_ext.mk
-.INCLUDE :	target.mk
-.INCLUDE :	tg_ext.mk
-
-.ELSE
- at all:
-    @echo "MediaWiki Publisher extension disabled."
-.ENDIF
-
diff --git a/xsltml/prj/d.lst b/xsltml/prj/d.lst
index ee5b0e2..e69de29 100644
--- a/xsltml/prj/d.lst
+++ b/xsltml/prj/d.lst
@@ -1,6 +0,0 @@
-mkdir: %_DEST%\bin\xslt
-mkdir: %_DEST%\bin\xslt\export
-mkdir: %_DEST%\bin\xslt\export\xsltml
-
-..\%__SRC%\misc\build\xsltml_2.1.2\*.xsl %_DEST%\bin\xslt\export\xsltml\*.xsl
-
diff --git a/xsltml/prj/dmake b/xsltml/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/xsltml/xsltml_2.1.2.patch b/xsltml/xsltml_2.1.2.patch
index 04de2ea..292338b 100644
--- a/xsltml/xsltml_2.1.2.patch
+++ b/xsltml/xsltml_2.1.2.patch
@@ -95,13 +95,6 @@
  </xsl:template>
  
  <!-- 4.4.10.4 determinant  -->
-@@ -1103,4 +1110,4 @@
- 	<xsl:if test="$this-p < $p"><xsl:text>)</xsl:text></xsl:if>
- </xsl:template>
- 
--</xsl:stylesheet>
-+</xsl:stylesheet>
-\ No newline at end of file
 --- misc/xsltml_2.1.2/entities.xsl	2009-03-27 08:11:02.000000000 +0100
 +++ misc/build/xsltml_2.1.2/entities.xsl	2008-03-07 21:36:34.000000000 +0100
 @@ -4,17 +4,56 @@
@@ -1161,13 +1154,6 @@
  		<xsl:text>}</xsl:text>
  	</xsl:if>
  	<xsl:if test="@background">
-@@ -219,4 +229,4 @@
- 	<xsl:apply-templates/>
- </xsl:template>
- 
--</xsl:stylesheet>
-+</xsl:stylesheet>
-\ No newline at end of file
 --- misc/xsltml_2.1.2/mmltex.xsl	2009-03-27 08:11:02.000000000 +0100
 +++ misc/build/xsltml_2.1.2/mmltex.xsl	2008-03-07 21:36:34.000000000 +0100
 @@ -6,9 +6,9 @@
@@ -1182,13 +1168,6 @@
       copyright and other information                                        -->
  <!-- ====================================================================== -->
  
-@@ -33,4 +33,4 @@
- 	<xsl:text>&#xA;\]</xsl:text>
- </xsl:template>
- 
--</xsl:stylesheet>
-+</xsl:stylesheet>
-\ No newline at end of file
 --- misc/xsltml_2.1.2/scripts.xsl	2009-03-27 08:11:02.000000000 +0100
 +++ misc/build/xsltml_2.1.2/scripts.xsl	2008-03-07 21:36:34.000000000 +0100
 @@ -1,12 +1,13 @@
@@ -1294,13 +1273,6 @@
  			<xsl:text>\underbrace{</xsl:text>
  			<xsl:apply-templates select="./*[1]"/>
  			<xsl:text>}</xsl:text>
-@@ -372,4 +409,4 @@
- 	</xsl:choose>
- </xsl:template>
- 
--</xsl:stylesheet>
-+</xsl:stylesheet>
-\ No newline at end of file
 --- misc/xsltml_2.1.2/tables.xsl	2009-03-27 08:11:02.000000000 +0100
 +++ misc/build/xsltml_2.1.2/tables.xsl	2008-03-07 21:36:34.000000000 +0100
 @@ -1,130 +1,218 @@
@@ -1434,6 +1406,7 @@
 -</xsl:template>
 -
 -</xsl:stylesheet>
+\ No newline at end of file
 +<?xml version='1.0' encoding="UTF-8"?>
 +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 +		xmlns:m="http://www.w3.org/1998/Math/MathML"
@@ -1738,10 +1711,3 @@
  		</xsl:call-template>
  		<xsl:text>}{</xsl:text>
  	</xsl:if>
-@@ -325,4 +343,4 @@
- 	</xsl:call-template>
- </xsl:template>
- 
--</xsl:stylesheet>
-+</xsl:stylesheet>
-\ No newline at end of file
commit a52703c0cc90dbadf999562adddad203b0feb4f3
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Tue Sep 25 09:17:18 2012 +0200

    this belongs to RepositoryFixes
    
    Change-Id: I37af685c39606f9bee173d81f6a4d5f0dd63af7e

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 6beb818..e496618 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -80,6 +80,7 @@ gb_Library_FILENAMES := $(patsubst npsoplugin:inpsoplugin%,npsoplugin:npsoplugin
 
 gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
 gb_StaticLibrary_FILENAMES := $(patsubst png:png%,png:libpng%,$(gb_StaticLibrary_FILENAMES))
+gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES))
 
 ifeq ($(COM),GCC)
 gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES))
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 8bd053b..308200e 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -346,8 +346,6 @@ gb_StaticLibrary_PLAINEXT := .a
 gb_StaticLibrary_FILENAMES := \
 	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
 
-gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES))
-
 gb_StaticLibrary_StaticLibrary_platform =
 
 # Executable class
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 264856c..33ee98d 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -551,8 +551,6 @@ gb_StaticLibrary_PLAINEXT := .lib
 gb_StaticLibrary_FILENAMES := \
 	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
 
-gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES))
-
 define gb_StaticLibrary_StaticLibrary_platform
 $(call gb_LinkTarget_get_target,$(2)) \
 $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
commit dd38937ba4dcfe6cdfce581ed2ac51398087e5d3
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Sep 24 23:05:03 2012 +0200

    gbuild: use include directly; it's even shorter
    
    Change-Id: Id56efb715c9bd27b389b0fa9f38bcd0fe12ac9d4

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index fa742ce..3771605 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -95,18 +95,6 @@ define gb_Helper_get_outdir_clean_target
 $$(subst $(OUTDIR)/,$(WORKDIR)/Clean/OutDir/,$(1))
 endef
 
-# RepositoryExternal.mk is optional
-define gb_Helper_add_repository
-include $(1)/Repository.mk
--include $(1)/RepositoryExternal.mk
-
-endef
-
-define gb_Helper_add_repositories
-$(foreach repo,$(1),$(call gb_Helper_add_repository,$(repo)))
-
-endef
-
 define gb_Helper_init_registries
 gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
 gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 3ab221f..5afce29 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -157,7 +157,9 @@ include $(GBUILDDIR)/Helper.mk
 include $(GBUILDDIR)/TargetLocations.mk
 
 $(eval $(call gb_Helper_init_registries))
-$(eval $(call gb_Helper_add_repositories,$(SRCDIR)))
+# RepositoryExternal.mk is optional
+include $(SRCDIR)/Repository.mk
+-include $(SRCDIR)/RepositoryExternal.mk
 
 gb_Library_DLLPOSTFIX := lo
 
commit 599a94827e2b3957db3abf758d48ff7b3977e2f2
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Sep 24 22:38:50 2012 +0200

    gbuild: remove gb_Library_TARGETS and replace gb_Library_get_implibname
    
    Also makes more visible that gb_Library_PLAINLIBS_NONE are special.
    
    Change-Id: I58a667d75a0d964c8f02e36a4645402417a1a621

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index a1aa433..fa742ce 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -120,12 +120,6 @@ $$(foreach group,$$(gb_Jar_VALIDGROUPS),$$(eval gb_Jar_$$(group) :=))
 
 endef
 
-define gb_Helper_collect_libtargets
-gb_Library_TARGETS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group)))
-gb_StaticLibrary_TARGETS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group)))
-
-endef
-
 define gb_Helper_collect_knownlibs
 gb_Library_KNOWNLIBS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group)))
 gb_StaticLibrary_KNOWNLIBS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group)))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 01ee922..5d49d6a 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -37,7 +37,6 @@
 #  gb_Library_DLLFILENAMES
 #  gb_Library_FILENAMES
 #  gb_Library_Library_platform
-#  gb_Library_TARGETS
 
 # doesn't do anything, just used for hooking up component target
 .PHONY: $(call gb_Library__get_final_target,%)
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 124b009..a09f720 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -33,7 +33,6 @@
 #  gb_StaticLibrary_OUTDIRLOCATION := $(OUTDIR)/lib
 # defined by platform
 #  gb_StaticLibrary_FILENAMES
-#  gb_StaticLibrary_TARGETS
 
 
 # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index fb35d9c..b217fd3 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -67,11 +67,11 @@ gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1)
 
 
 define gb_Library_get_target
-$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_Library_TARGETS)):%,$(gb_Library_FILENAMES)))
+$(if $(filter $(1),$(gb_Library_PLAINLIBS_NONE)),,$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(1):%,$(gb_Library_FILENAMES))))
 endef
 
 define gb_StaticLibrary_get_target
-$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_StaticLibrary_TARGETS)):%,$(gb_StaticLibrary_FILENAMES)))
+$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
 endef
 
 
@@ -194,11 +194,11 @@ gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done
 gb_Library__get_final_target = $(WORKDIR)/Dummy/$(1)
 
 define gb_Library_get_external_headers_target
-$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES)))
+$(if $(filter $(1),$(gb_Library_PLAINLIBS_NONE)),,$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES))))
 endef
 
 define gb_Library_get_headers_target
-$(patsubst $(1):%,$(WORKDIR)/Headers/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES)))
+$(if $(filter $(1),$(gb_Library_PLAINLIBS_NONE)),,$(patsubst $(1):%,$(WORKDIR)/Headers/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES))))
 endef
 
 define gb_StaticLibrary_get_external_headers_target
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index bd1b315..3ab221f 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -158,7 +158,6 @@ include $(GBUILDDIR)/TargetLocations.mk
 
 $(eval $(call gb_Helper_init_registries))
 $(eval $(call gb_Helper_add_repositories,$(SRCDIR)))
-$(eval $(call gb_Helper_collect_libtargets))
 
 gb_Library_DLLPOSTFIX := lo
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index d8242aa..8bd053b 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -141,7 +141,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
 		$(NATIVERES) \
 		$(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \
-		$(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib))))) \
+		$(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \
 		$(LIBS) \
 		-Wl$(COMMA)-Map$(COMMA)$(basename $(1)).map \
 		-o $(1)))
@@ -161,7 +161,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
 		$(NATIVERES) \
 		$(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \
-		$(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib))))) \
+		$(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \
 		$(LIBS) \
 		-Wl$(COMMA)-Map$(COMMA)$(dir $(1))$(notdir $(basename $(DLLTARGET)).map) \
 		-Wl$(COMMA)--out-implib$(COMMA)$(1) \
@@ -338,11 +338,6 @@ define gb_Library_get_dllname
 $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES)))
 endef
 
-define gb_Library_get_implibname
-$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_FILENAMES)))
-endef
-
-
 # StaticLibrary class
 
 gb_StaticLibrary_SYSPRE := lib
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index dd7fe1f..264856c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -460,7 +460,7 @@ gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
 
 gb_Library_FILENAMES :=\
-	$(foreach lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_KNOWNLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
 
 gb_Library_DLLEXT := .dll
 gb_Library_MAJORVER := 3
commit a7d45d8d7a67d07bf83634a2ba7320b78b32f79c
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Sep 24 22:13:56 2012 +0200

    gbuild: remove empty gb_StaticLibrary_JPEGLIBS and gb_StaticLibrary_DEFS
    
    Change-Id: I364ba0155e30909fd77c0c73e27e5c9ee0a59168

diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 12834d8..124b009 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -32,7 +32,6 @@
 # defined globally in gbuild.mk
 #  gb_StaticLibrary_OUTDIRLOCATION := $(OUTDIR)/lib
 # defined by platform
-#  gb_StaticLibrary_DEFS
 #  gb_StaticLibrary_FILENAMES
 #  gb_StaticLibrary_TARGETS
 
@@ -63,9 +62,6 @@ endef
 define gb_StaticLibrary__StaticLibrary_impl
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),StaticLibrary)
-$(call gb_LinkTarget_add_defs,$(2),\
-	$(gb_StaticLibrary_DEFS) \
-)
 $(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \
 	| $(dir $(call gb_StaticLibrary_get_target,$(1))).dir
 $(call gb_StaticLibrary_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 7656bdd..daef827 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -248,13 +248,10 @@ endef
 
 # StaticLibrary class
 
-gb_StaticLibrary_DEFS :=
 gb_StaticLibrary_SYSPRE := lib
 gb_StaticLibrary_PLAINEXT := .a
-gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
 
 gb_StaticLibrary_FILENAMES := \
-	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
 	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
 
 gb_StaticLibrary_StaticLibrary_platform =
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index b244ceb..d8242aa 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -345,13 +345,10 @@ endef
 
 # StaticLibrary class
 
-gb_StaticLibrary_DEFS :=
 gb_StaticLibrary_SYSPRE := lib
 gb_StaticLibrary_PLAINEXT := .a
-gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
 
 gb_StaticLibrary_FILENAMES := \
-	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
 	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
 
 gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES))
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 180a93f..dd7fe1f 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -544,14 +544,11 @@ endef
 
 # StaticLibrary class
 
-gb_StaticLibrary_DEFS :=
 gb_StaticLibrary_TARGETTYPEFLAGS := -LIB
 gb_StaticLibrary_SYSPRE :=
 gb_StaticLibrary_PLAINEXT := .lib
-gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
 
 gb_StaticLibrary_FILENAMES := \
-	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
 	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
 
 gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES))
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 984621f..8317c40 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -324,13 +324,10 @@ endef
 
 # StaticLibrary class
 
-gb_StaticLibrary_DEFS :=
 gb_StaticLibrary_SYSPRE := lib
 gb_StaticLibrary_PLAINEXT := .a
-gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
 
 gb_StaticLibrary_FILENAMES := \
-	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
 	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
 
 gb_StaticLibrary_StaticLibrary_platform =
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 3a95d90..6c77d71 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -300,13 +300,10 @@ gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script)
 
 # StaticLibrary class
 
-gb_StaticLibrary_DEFS :=
 gb_StaticLibrary_SYSPRE := lib
 gb_StaticLibrary_PLAINEXT := .a
-gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
 
 gb_StaticLibrary_FILENAMES := \
-	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
 	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
 
 gb_StaticLibrary_StaticLibrary_platform =
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 6e50439..0e18a74 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -296,13 +296,10 @@ gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script)
 
 # StaticLibrary class
 
-gb_StaticLibrary_DEFS :=
 gb_StaticLibrary_SYSPRE := lib
 gb_StaticLibrary_PLAINEXT := .a
-gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
 
 gb_StaticLibrary_FILENAMES := \
-	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
 	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
 
 gb_StaticLibrary_StaticLibrary_platform =
commit e02011c5c59dbb99fc6f33b9ed2727e02fe67c02
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Sep 24 23:20:18 2012 +0200

    fix typo
    
    Change-Id: I82da01827472c1fbcbfd821713ba7152421f18ff

diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 599b52c..c479c0e 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -40,11 +40,11 @@ endef
 define gb_UnpackedTarget__command_unzip
 unzip \
 	-qq \
-	-d $(UNPACKED_DIR) $(UNPACKED_TARBALL) && \
+	-d $(UNPACKED_DIR) $(UNPACKED_TARBALL) \
 $(if $(filter-out 0,$(UNPACKED_STRIP_COMPONENTS)),\
-	UNZIP_DIR=`ls $(UNPACKED_DIR)` && \
-	mv $(UNPACKED_DIR)/$$UNZIP_DIR/* $(UNPACKED_DIR) && \
-	rmdir $(UNPACKED_DIR)/$$UNZIP_DIR \
+	&& UNZIP_DIR=`ls $(UNPACKED_DIR)` \
+	&& mv $(UNPACKED_DIR)/$$UNZIP_DIR/* $(UNPACKED_DIR) \
+	&& rmdir $(UNPACKED_DIR)/$$UNZIP_DIR \
 )
 endef
 
commit e24c2e106e76d9b50a923ed27f8f8fdd2db9b93a
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Sep 24 14:06:54 2012 +0200

    download seamonkey only when it is needed
    
    Change-Id: I6c2f2796db7b24043627435b3f91846416655911

diff --git a/configure.in b/configure.in
index 5163859..6abfc26 100644
--- a/configure.in
+++ b/configure.in
@@ -8013,6 +8013,7 @@ else
     AC_MSG_RESULT([internal])
     SYSTEM_MOZILLA=NO
     BUILD_TYPE="$BUILD_TYPE MOZ"
+    MOZ_TARBALL=a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
     if test -z "$with_mozilla_version"; then
         MOZILLA_VERSION=
     else
@@ -8185,6 +8186,7 @@ AC_SUBST(MOZ_FLAVOUR)
 AC_SUBST(MOZ_INC)
 AC_SUBST(MOZ_LIB)
 AC_SUBST(MOZ_LIB_XPCOM)
+AC_SUBST(MOZ_TARBALL)
 
 dnl ===================================================================
 dnl Check for system NSS
diff --git a/ooo.lst.in b/ooo.lst.in
index bf3bca0..2509aae 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -34,7 +34,7 @@ f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
 3fa4d5236f2a36ca5c3af6715e837691-curl-7.26.0.tar.gz
 8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
 fa9aa839145cdf860bf596532bb8af97-cppunit-1.13.1.tar.gz
-a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
+ at MOZ_TARBALL@
 a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
commit 81a244a56a1d943b01d3b0b71fc657d22fd1eb35
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Sep 21 17:37:14 2012 +0200

    stoc: add more component prefixes
    
    Except bootstrap, javaloader and javavm. They are special.
    
    Change-Id: I28e28d07b4b1daf45f7416151a94ac376fc01db7

diff --git a/stoc/source/invocation/invocation.component b/stoc/source/invocation/invocation.component
index 9a88647..d2ca9c4 100644
--- a/stoc/source/invocation/invocation.component
+++ b/stoc/source/invocation/invocation.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="invocation"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.stoc.Invocation">
     <service name="com.sun.star.script.Invocation"/>
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index 59b5c29..8b7ea70 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -1211,7 +1211,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL invocation_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 396f0e1..cd53f32 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -967,7 +967,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload(
 }
 
 //==============================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL invocadapt_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper(
diff --git a/stoc/source/invocation_adapterfactory/invocadapt.component b/stoc/source/invocation_adapterfactory/invocadapt.component
index 09670aa..551f4ab 100644
--- a/stoc/source/invocation_adapterfactory/invocadapt.component
+++ b/stoc/source/invocation_adapterfactory/invocadapt.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="invocadapt"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.stoc.InvocationAdapterFactory">
     <service name="com.sun.star.script.InvocationAdapterFactory"/>
diff --git a/stoc/source/namingservice/namingservice.component b/stoc/source/namingservice/namingservice.component
index 53d0a14..0f6a41f 100644
--- a/stoc/source/namingservice/namingservice.component
+++ b/stoc/source/namingservice/namingservice.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="namingservice"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.stoc.NamingService">
     <service name="com.sun.star.uno.NamingService"/>
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index ee9fc1b..4f08a9c 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -203,7 +203,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL namingservice_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/stoc/source/proxy_factory/proxyfac.component b/stoc/source/proxy_factory/proxyfac.component
index ed717a8..912ed15 100644
--- a/stoc/source/proxy_factory/proxyfac.component
+++ b/stoc/source/proxy_factory/proxyfac.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="proxyfac"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.reflection.ProxyFactory">
     <service name="com.sun.star.reflection.ProxyFactory"/>
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index 54868e4..cf211e0 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -510,7 +510,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
     return g_moduleCount.canUnload( &g_moduleCount, pTime );
 }
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL proxyfac_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper(
diff --git a/stoc/source/stocservices/stocservices.cxx b/stoc/source/stocservices/stocservices.cxx
index f30bd35..0ec496e 100644
--- a/stoc/source/stocservices/stocservices.cxx
+++ b/stoc/source/stocservices/stocservices.cxx
@@ -99,11 +99,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 
 #endif
 
-#ifdef DISABLE_DYNLOADING
-#define component_getFactory stocservices_component_getFactory
-#endif
-
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL stocservices_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/stoc/util/stocservices.component b/stoc/util/stocservices.component
index f43185e..5bd0dd2 100644
--- a/stoc/util/stocservices.component
+++ b/stoc/util/stocservices.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="stocservices"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.stoc.TypeConverter">
     <service name="com.sun.star.script.Converter"/>
commit 5c87937273c93ff9e9630f9b718fc911bb1665f9
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Sep 21 16:41:13 2012 +0200

    unusedcode: more removing
    
    Change-Id: Ic8be585925edd63724d28a255c9e33170a4a041e

diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx
index 2da0df5..cfbb7e7 100644
--- a/sc/source/ui/vba/excelvbahelper.cxx
+++ b/sc/source/ui/vba/excelvbahelper.cxx
@@ -102,23 +102,6 @@ getUnoSheetModuleObj( const uno::Reference< table::XCellRange >& xRange ) throw
     return getUnoSheetModuleObj( xSheet );
 }
 
-ScDocShell* GetDocShellFromRanges( const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges ) throw ( uno::RuntimeException )
-{
-    // need the ScCellRangesBase to get docshell
-    uno::Reference< uno::XInterface > xIf( xRanges, uno::UNO_QUERY_THROW );
-    return GetDocShellFromRange( xIf );
-}
-
-ScDocument* GetDocumentFromRange( const uno::Reference< uno::XInterface >& xRange ) throw ( uno::RuntimeException )
-{
-        ScDocShell* pDocShell = GetDocShellFromRange( xRange );
-        if ( !pDocShell )
-        {
-                throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access underlying document from uno range object" ) ), uno::Reference< uno::XInterface >() );
-        }
-        return pDocShell->GetDocument();
-}
-
 void implSetZoom( const uno::Reference< frame::XModel >& xModel, sal_Int16 nZoom, std::vector< SCTAB >& nTabs )
 {
     ScTabViewShell* pViewSh = excel::getBestViewShell( xModel );
diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx
index 2009cc3..955802c 100644
--- a/sc/source/ui/vba/excelvbahelper.hxx
+++ b/sc/source/ui/vba/excelvbahelper.hxx
@@ -68,8 +68,6 @@ css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const cs
 css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::frame::XModel >& xModel, SCTAB nTab ) throw ( css::uno::RuntimeException );
 
 ScDocShell* GetDocShellFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ) throw ( css::uno::RuntimeException );
-ScDocShell* GetDocShellFromRanges( const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges ) throw ( css::uno::RuntimeException );
-ScDocument* GetDocumentFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ) throw ( css::uno::RuntimeException );
 void setUpDocumentModules( const css::uno::Reference< css::sheet::XSpreadsheetDocument >& xDoc );
 
 // ============================================================================
diff --git a/unusedcode.easy b/unusedcode.easy
index 9a307b0..71c68b7 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -84,8 +84,6 @@ dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString
 formula::FormulaTokenIterator::First()
 framework::OReadMenuDocumentHandler::getServiceFactory()
 jfw_plugin::VendorBase::createInstance()
-ooo::vba::excel::GetDocShellFromRanges(com::sun::star::uno::Reference<com::sun::star::sheet::XSheetCellRangeContainer> const&)
-ooo::vba::excel::GetDocumentFromRange(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&)
 oox::drawingml::TextListStyle::dump() const
 oox::ole::AxFormPageModel::AxFormPageModel()
 oox::ole::AxMultiPageModel::AxMultiPageModel()
commit bc234b4e1103cf8f79a7526ad80dcd9d0b78b89b
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat Sep 22 19:10:13 2012 +0200

    gbuild: use one pattern rule for creating directories
    
    Change-Id: I0164552ea9f2024eb5c44ad3b2b6181f6a9e3a1e

diff --git a/solenv/gbuild/AllLangZip.mk b/solenv/gbuild/AllLangZip.mk
index fa3b9de..e3cbc6a 100644
--- a/solenv/gbuild/AllLangZip.mk
+++ b/solenv/gbuild/AllLangZip.mk
@@ -14,9 +14,6 @@
 
 gb_AllLangZip_LANGS := $(if $(strip $(gb_WITH_LANG)),$(gb_WITH_LANG),en-US)
 
-$(dir $(call gb_AllLangZip_get_target,%)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_AllLangZip_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),ALZ,4)
 	touch $@
diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk
index e3a87bd..f78fae5 100644
--- a/solenv/gbuild/CliAssembly.mk
+++ b/solenv/gbuild/CliAssembly.mk
@@ -21,9 +21,6 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
-$(dir $(call gb_CliConfigTarget_get_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_CliConfigTarget_get_target,%) :
 	$(call gb_CliConfigTarget__command,$@,$*,$<)
 
@@ -64,12 +61,6 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
-$(dir $(call gb_CliAssemblyTarget_get_target,%)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(dir $(call gb_CliAssemblyTarget_get_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_CliAssemblyTarget_get_target,%) :
 	$(if $(strip $(CLI_ASSEMBLY_VERSION)),,$(call gb_Output_error,assembly version not set))
 	$(if $(strip $(CLI_ASSEMBLY_CONFIGFILE)),,$(call gb_Output_error,assembly configuration file not set))
diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index 9cf6bd5..d22fc2e 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -47,12 +47,6 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
-$(dir $(call gb_CliLibraryTarget_get_target,%)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(dir $(call gb_CliLibraryTarget_get_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_CliLibraryTarget_get_target,%) :
 	$(call gb_CliLibraryTarget__command,$@,$*,$<,$?,$^)
 
diff --git a/solenv/gbuild/CliNativeLibrary.mk b/solenv/gbuild/CliNativeLibrary.mk
index f5c1249..6ced5e9 100644
--- a/solenv/gbuild/CliNativeLibrary.mk
+++ b/solenv/gbuild/CliNativeLibrary.mk
@@ -22,12 +22,6 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
-$(dir $(call gb_CliNativeLibraryTarget_get_target,%)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(dir $(call gb_CliNativeLibraryTarget_get_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_CliNativeLibraryTarget_get_target,%) :
 	$(call gb_CliNativeLibraryTarget__command,$@,$*,$<)
 
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index f0a2735..fae0343 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -29,12 +29,6 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
-$(dir $(call gb_CliUnoApiTarget_get_target,%)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(dir $(call gb_CliUnoApiTarget_get_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 # TODO depending on the whole URE might be overkill, but I do not have a
 # Windows machine to debug it...
 $(call gb_CliUnoApiTarget_get_target,%) : \
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index e99ffab..f01a687 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -55,10 +55,6 @@ $(call gb_ComponentTarget_get_target,%) : \
 		$(call gb_ComponentTarget_get_source,%) $(gb_XSLTPROCTARGET)
 	$(call gb_ComponentTarget__command,$@,$<,$*)
 
-# the .dir is for make 3.81, which ignores trailing /
-$(dir $(call gb_ComponentTarget_get_outdir_target,))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_ComponentTarget_get_outdir_target,%) :
 	$(call gb_Deliver_deliver,$<,$@)
 
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index e02d0da..7168917 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -101,12 +101,6 @@ $(call gb_XcsTarget_get_clean_target,%) :
 		rm -f $(call gb_XcsTarget_get_target,$*) \
 			  $(call gb_XcsTarget_get_outdir_target,$(XCSFILE)))
 
-# the .dir is for make 3.81, which ignores trailing /
-$(dir $(call gb_XcsTarget_get_outdir_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(dir $(call gb_XcsTarget_get_outdir_target,%)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_XcsTarget_get_outdir_target,%) :
 	$(call gb_Helper_abbreviate_dirs,\
 		$(call gb_Deliver_deliver,$<,$@))
@@ -148,12 +142,6 @@ $(call gb_XcuDataTarget_get_clean_target,%) :
 		rm -f $(call gb_XcuDataTarget_get_target,$*) \
 			  $(call gb_XcuDataTarget_get_outdir_target,$(XCUFILE)))
 
-# the .dir is for make 3.81, which ignores trailing /
-$(dir $(call gb_XcuDataTarget_get_outdir_target,))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(dir $(call gb_XcuDataTarget_get_outdir_target,)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_XcuDataTarget_get_outdir_target,%) :
 	$(call gb_Helper_abbreviate_dirs,\
 		$(call gb_Deliver_deliver,$<,$@))
@@ -191,10 +179,6 @@ $(call gb_XcuModuleTarget_get_clean_target,%) :
 		rm -f $(call gb_XcuModuleTarget_get_target,$*) \
 			  $(call gb_XcuModuleTarget_get_outdir_target,$(XCUFILE)))
 
-# the .dir is for make 3.81, which ignores trailing /
-$(dir $(call gb_XcuModuleTarget_get_outdir_target,))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_XcuModuleTarget_get_outdir_target,%) :
 	$(call gb_Helper_abbreviate_dirs,\
 		$(call gb_Deliver_deliver,$<,$@))
@@ -230,12 +214,6 @@ $(call gb_XcuLangpackTarget_get_clean_target,%) :
 			  $(call gb_XcuLangpackTarget__get_target_with_lang,$*,$(lang)) \
 			  $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(XCUFILE),$(lang))))
 
-# the .dir is for make 3.81, which ignores trailing /
-$(dir $(call gb_XcuLangpackTarget_get_outdir_target,))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(dir $(call gb_XcuLangpackTarget_get_outdir_target,)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_XcuLangpackTarget_get_outdir_target,%) :
 	$(call gb_Helper_abbreviate_dirs,\
 		$(call gb_Deliver_deliver,$<,$@))
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index d8b59d2..95eb3d1 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -26,10 +26,6 @@
 #
 #*************************************************************************
 
-# the .dir is for make 3.81, which ignores trailing /
-$(call gb_CustomTarget_get_workdir,%)/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_CustomTarget_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),CUS,3)
 	touch $@
diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index c40e376..1634c62 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -22,12 +22,6 @@ $(call gb_Helper_abbreviate_dirs,\
 endef
 	#$(gb_ThesaurusIndexTarget_CHECK_COMMAND) $(THESAURUS_FILE) && \
 
-$(dir $(call gb_ThesaurusIndexTarget_get_target,%)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(dir $(call gb_ThesaurusIndexTarget_get_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_ThesaurusIndexTarget_get_target,%) : $(gb_ThesaurusIndexTarget_INDEX_TARGET) | $(gb_ThesaurusIndexTarget_CHECK_TARGET)
 	$(call gb_ThesaurusIndexTarget__command,$@,$*)
 
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 75b9e0c..9c108ae 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -71,9 +71,6 @@ $(if $(PLATFORM),\
 	cp -f $(1) $(2))
 endef
 
-$(call gb_ExtensionTarget_get_workdir,%)/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 # remove extension directory in workdir and oxt file in workdir
 $(call gb_ExtensionTarget_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),OXT,3)
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index f24a2ca..31a1848 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -19,12 +19,6 @@
 #
 # Uff, I hope this is at least partially understandable :-)
 
-$(dir $(call gb_ExternalPackage_get_target,%)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(dir $(call gb_ExternalPackage_get_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_ExternalPackage_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),EPK,2)
 	touch $@
diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 5731cbf..b8dc5d4 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -33,12 +33,6 @@
 # directory is work dir, accessible only from recipes via variable
 # $(EXTERNAL_WORKDIR).
 
-$(dir $(call gb_ExternalProject_get_statedir,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(dir $(call gb_ExternalProject_get_target,%)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_ExternalProject_get_preparation_target,%) :
 	touch $@
 
diff --git a/solenv/gbuild/InstallModule.mk b/solenv/gbuild/InstallModule.mk
index cb37a49..1ac028c 100644
--- a/solenv/gbuild/InstallModule.mk
+++ b/solenv/gbuild/InstallModule.mk
@@ -27,9 +27,6 @@
 
 # InstallModule class
 
-$(dir $(call gb_InstallModule_get_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_InstallModule_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),IMO,3)
 	touch $@
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index b008bdd..345aff5 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -53,9 +53,6 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
-$(dir $(call gb_ScpTemplateTarget_get_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_ScpTemplateTarget_get_target,%) : $(gb_ScpTemplateTarget_TARGET)
 	$(call gb_ScpTemplateTarget__command,$@,$*)
 
@@ -92,9 +89,6 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
-$(dir $(call gb_ScpPreprocessTarget_get_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_ScpPreprocessTarget_get_target,%) : $(gb_ScpPreprocessTarget_TARGET)
 	$(call gb_ScpPreprocessTarget__command,$@,$*)
 
@@ -125,9 +119,6 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
-$(dir $(call gb_ScpMergeTarget_get_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_ScpMergeTarget_get_target,%) : $(gb_ScpMergeTarget_TARGET)
 	$(call gb_ScpMergeTarget__command,$@,$*)
 
@@ -161,9 +152,6 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
-$(dir $(call gb_ScpConvertTarget_get_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_ScpConvertTarget_get_target,%) : $(gb_ScpConvertTarget_TARGET)
 	$(call gb_ScpConvertTarget__command,$@,$*)
 
@@ -195,9 +183,6 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
-$(dir $(call gb_ScpTarget_get_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_ScpTarget_get_target,%) : $(gb_ScpTarget_TARGET)
 	$(call gb_ScpTarget__command,$@,$*)
 
@@ -253,9 +238,6 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
-$(dir $(call gb_InstallModuleTarget_get_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_InstallModuleTarget_get_target,%) :
 	$(call gb_InstallModuleTarget__command,$@,$*)
 
diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk
index 6b22c43..c521c00 100644
--- a/solenv/gbuild/InstallScript.mk
+++ b/solenv/gbuild/InstallScript.mk
@@ -61,12 +61,6 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
-$(dir $(call gb_InstallScriptTarget_get_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(dir $(call gb_InstallScriptTarget_get_target,%)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_InstallScriptTarget_get_target,%) : $(gb_InstallScriptTarget_TARGET)
 	$(call gb_InstallScriptTarget__command,$@,$*)
 
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 534e39a..24d23d2 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -31,12 +31,7 @@
 
 # a pattern rule with multiple targets is actually executed only once for each
 # match, so define only pattern rules with one target here
-# the .dir is for make 3.81, which ignores trailing /
 define gb_PackagePart__rule
-$(1)/.dir :
-	$$(if $$(wildcard $$(dir $$@)),,mkdir -p $$(dir $$@))
-$(1)/%/.dir :
-	$$(if $$(wildcard $$(dir $$@)),,mkdir -p $$(dir $$@))
 $(1)/% :
 	$$(call gb_Deliver_deliver,$$<,$$@)
 endef
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index 0328156..ce11ee0 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -47,11 +47,6 @@ $(call gb_Rdb_get_clean_target,%) :
 	$(call gb_Helper_abbreviate_dirs,\
 		rm -f $(call gb_Rdb_get_outdir_target,$*) $(call gb_Rdb_get_target,$*))
 
-# DO NOT DEFINE: it overwrites the definition from Package.mk for xml/
-# and doesn't work on 3.81
-#$(dir $(call gb_Rdb_get_outdir_target,))%/.dir :
-#	mkdir -p $(dir $@)
-
 $(call gb_Rdb_get_outdir_target,%) :
 	$(call gb_Deliver_deliver,$<,$@)
 
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index c085c4c..88d3e9d 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -42,10 +42,6 @@ gb_UnoApiPartTarget_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp
 # invoked with the .idl file corresponding to the .urd in that case.
 # Touch the .urd file, so it is newer than the .done file, causing that to
 # be rebuilt and overwriting the .urd file again.
-# the .dir is for make 3.81, which ignores trailing /
-$(dir $(call gb_UnoApiPartTarget_get_target,))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_UnoApiPartTarget_get_target,%.urd) :
 	touch $@
 
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 63f32a6..599b52c 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -58,9 +58,6 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
-$(dir $(call gb_UnpackedTarget_get_target,%)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_UnpackedTarget_get_target,%).tar.bz2 :
 	$(call gb_UnpackedTarget__command,untar,$@,$*,-j)
 
@@ -154,9 +151,6 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
-$(dir $(call gb_UnpackedTarball_get_target,%)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_UnpackedTarball_get_preparation_target,%) :
 	touch $@
 
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 8334ead..bd1b315 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -69,6 +69,13 @@ endif
 
 include $(GBUILDDIR)/Output.mk
 
+# general purpose rules for creating directories
+# the .dir is for make 3.81, which ignores trailing /
+$(OUTDIR)/%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(WORKDIR)/%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 ifneq ($(strip $(PRODUCT)$(product)),)
 gb_PRODUCT := $(true)

More information about the Libreoffice-commits mailing list