Merge branch 'master' into feature/gnumake4

Conflicts:
Repository.mk
RepositoryFixes.mk
configure
configure.in
set_soenv.in
solenv/config/sdev300.ini
solenv/gbuild/ComponentTarget.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/CustomTarget.mk
solenv/gbuild/Deliver.mk
solenv/gbuild/Executable.mk
solenv/gbuild/JavaClassSet.mk
solenv/gbuild/Library.mk
solenv/gbuild/LinkTarget.mk
solenv/gbuild/StaticLibrary.mk
solenv/gbuild/TargetLocations.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/linux.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/solaris.mk
solenv/gbuild/platform/windows.mk
solenv/gbuild/platform/winmingw.mk
solenv/gbuild/templates/Executable.mk
solenv/gbuild/templates/Library.mk
solenv/inc/libs.mk
solenv/inc/unxobsd.mk

1 files changed, 53 insertions, 20 deletions

diff --git a/Repository.mk b/Repository.mk
index c60677f27bbe..d3f99281be1a 100755..100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     mkunroll \
     rscdep \
     so_checksum \
-    sspretty \
 ))
 
 $(eval $(call gb_Helper_register_executables,OOO, \
@@ -43,6 +42,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+    adabasui \
     AppleRemote \
 	adabas \
 	adabasui \
@@ -53,41 +53,59 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     basebmp \
 	canvastools \
 	cppcanvas \
+    chartcontroller \
+    chartmodel \
+    charttools \
+    chartview \
+    cppcanvas \
     cui \
-	dba \
-	dbaxml \
-	dbmm \
-	dbui \
-	dbpool \
-	dbtools \
+    dba \
+    dbaxml \
+    dbmm \
+    dbtools \
+    dbu \
+
     desktop_detector \
+    doctok \
     drawinglayer \
     editeng \
-    eggtray \
-	file \
-	for \
+    for \
 	forui \
+    frm \
     fwe \
     fwi \
     fwk \
     fwl \
     fwm \
+    hwp \
     i18npaper \
     i18nregexp \
     lng \
+    lwpft \
     msfilter \
     msword \
 	odbc \
 	odbcbase \
 	oox \
+	ooxml \
     qstart_gtk \
-	rpt \
-	rptui \
-	rptxml \
+    resourcemodel \
+    rpt \
+    rptui \
+    rptxml \
     sax \
     sb \
+    sc \
+    scd \
 	sdbc \
 	sdbt \
+    scfilt \
+    scui \
+    sd \
+    sdbt \
+    sdd \
+    sdfilt \
+    sdui \
     sfx \
     sm \
     smd \
@@ -103,17 +121,19 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     textconversiondlgs \
     tk \
     tl \
-    utl \
     unordf \
     unoxml \
+    utl \
     vbahelper \
 	writerfilter \
     vcl \
     vclplug_gen \
     vclplug_gtk \
+    vclplug_gtk3 \
     vclplug_kde \
     vclplug_kde4 \
     vclplug_svp \
+    writerfilter \
     xcr \
     xo \
     xof \
@@ -124,7 +144,14 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	test \
     cppunit \
+    crypto \
+    fileacc \
+    icui18n \
+    icule \
+    graphite2_off \
+    ssl \
 ))
 
 
@@ -134,7 +161,6 @@ $(eval $(call gb_Helper_register_libraries,RTLIBS, \
     i18nutil \
     jvmaccess \
     ucbhelper \
-    vos3 \
 ))
 
 $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
@@ -142,10 +168,6 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
     salhelper \
 ))
 
-$(eval $(call gb_Helper_register_libraries,STLLIBS, \
-    stl \
-))
-
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 	cairocanvas \
 	canvasfactory \
@@ -156,13 +178,18 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
     fsstorage \
 	gdipluscanvas \
     hatchwindowfactory \
-    msforms \
+    lomenubar \
+        msforms \
 	nullcanvas \
+    OGLTrans \
     passwordcontainer \
     productregistration \
 	simplecanvas \
+    slideshow \
+    vbaobj \
     vbaswobj \
 	vclcanvas \
+    writerfilter_uno \
 	writerfilter_debug \
 ))
 
@@ -175,8 +202,14 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 	basegfx_s \
+    crypto \
+    graphite2_off \
+    libeay32 \
+    ssleay32 \
     ooopathutils \
     salcpprt \
+    ssl \
+    toolshelpers \
 	vclmain \
 ))