Fri Jun 17 02:15:28 PDT 2011

editeng/Library_editeng.mk                 |    3 +-
 editeng/source/rtf/segincr.asm             |   39 -----------------------------
 framework/JunitTest_framework_complex.mk   |    2 -
 framework/JunitTest_framework_unoapi.mk    |    2 -
 framework/Library_fwe.mk                   |    3 +-
 framework/test/test.cxx                    |    2 -
 idl/Executable_svidl.mk                    |    3 --
 linguistic/JunitTest_linguistic_complex.mk |    2 -
 linguistic/JunitTest_linguistic_unoapi.mk  |    2 -
 linguistic/Library_lng.mk                  |    3 +-
 sfx2/JunitTest_sfx2_complex.mk             |    2 -
 sfx2/JunitTest_sfx2_unoapi.mk              |    2 -
 sfx2/Library_qstart.mk                     |    9 ++----
 sfx2/Library_sfx.mk                        |    4 +-
 sfx2/Module_sfx2.mk                        |    1 
 svx/JunitTest_svx_unoapi.mk                |    2 -
 svx/Library_svx.mk                         |    3 +-
 svx/Library_svxcore.mk                     |    3 +-
 xmloff/JunitTest_xmloff_unoapi.mk          |    2 -
 19 files changed, 26 insertions(+), 63 deletions(-)

New commits:
commit 67c2143ee1ff75cc92361fe0e2d069ab26fd0101
Author: Michael Stahl <mst at openoffice.org>
Date:   Mon Apr 11 13:23:37 2011 +0000

    gnumake4: #i116959#: user defined LDFLAGS: [hg:5ed23c4158ac]
    
    rename target local variable LDFLAGS.
    add gb_LinkTarget_add_ldflags.
    include user defined LDFLAGS in target local T_LDFLAGS.

diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 8ffefc3..9a21ef5 100755
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -48,8 +48,7 @@ $(eval $(call gb_Library_add_cflags,qstart_gtk,\
     $(filter-out -I%,$(GTK_CFLAGS)) \
 ))
 
-$(eval $(call gb_Library_set_ldflags,qstart_gtk,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,qstart_gtk,\
     $(GTK_LIBS) \
 ))
 
commit dba29770dfc5983299c46e4506d0b7bb9fb04ae9
Author: Michael Stahl <mst at openoffice.org>
Date:   Mon Apr 11 13:23:37 2011 +0000

    gnumake4: #i116959#: rename target local variables {C,CXX,OBJCXX}FLAGS: [hg:8801515221cf]
    
    add a T_ prefix, so we don't need to use override.
    also introduce gb_LinkTarget_add_{c,cxx,objcxx}flags.

diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 408a514..e862f5d 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -94,8 +94,9 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\
 ))
 
 #todo: ImageListDescriptor can't be exported completely without exporting everything
+# FIXME this should be fixed in m106 => remove this
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS))))
+$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(T_CXXFLAGS))))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk
index 6f4b830..a856cf7 100644
--- a/idl/Executable_svidl.mk
+++ b/idl/Executable_svidl.mk
@@ -35,8 +35,7 @@ $(eval $(call gb_Executable_set_include,svidl,\
 	-I$(SRCDIR)/idl/inc \
 ))
 
-$(eval $(call gb_Executable_set_cxxflags,svidl,\
-	$$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,svidl,\
 	-DIDL_COMPILER \
 ))
 
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 2216f54..8ffefc3 100755
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -44,8 +44,7 @@ $(eval $(call gb_Library_set_defs,qstart_gtk,\
     -DENABLE_QUICKSTART_APPLET \
 ))
 
-$(eval $(call gb_Library_set_cflags,qstart_gtk,\
-    $$(CFLAGS) \
+$(eval $(call gb_Library_add_cflags,qstart_gtk,\
     $(filter-out -I%,$(GTK_CFLAGS)) \
 ))
 
commit 9222f911a7b7cf0f0c2a78131fb82506fb8b3692
Author: Michael Stahl <mst at openoffice.org>
Date:   Fri Apr 8 16:00:16 2011 +0000

    gnumake4: remove obsolete 16bit stuff [hg:972105adb559]

diff --git a/editeng/source/rtf/segincr.asm b/editeng/source/rtf/segincr.asm
deleted file mode 100644
index 27575f7..0000000
--- a/editeng/source/rtf/segincr.asm
+++ /dev/null
@@ -1,39 +0,0 @@
-;*************************************************************************
-;
-; 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.
-;
-;*************************************************************************
-
-EXTRN   __AHINCR:abs
-         .MODEL  LARGE
-STARTWS0_SEG SEGMENT WORD PUBLIC 'STARTWS_CODE'
-
-         PUBLIC  _SegIncr
-_SegIncr PROC
-         MOV AX, __AHINCR
-         RET
-_SegIncr ENDP
-
-STARTWS0_SEG ENDS
-         END
commit 40eab148fb324115830ae6d3ea6b3b096f62c436
Author: Michael Stahl <mst at openoffice.org>
Date:   Fri Apr 1 20:49:35 2011 +0000

    gnumake4: #i117610#: add RepositoryExternal.mk, and use it. [hg:62e2f8dc95a7]

diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 9213abe..2682943 100755
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -157,11 +157,12 @@ $(eval $(call gb_Library_add_linked_libs,editeng,\
     cppu \
     vos3 \
     sal \
-    icuuc \
     i18nisolang1 \
     i18npaper \
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,editeng,icuuc)
+
 # vim: set noet sw=4 ts=4:
 
diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk
index 1181a9a..2fa36b1 100644
--- a/linguistic/Library_lng.mk
+++ b/linguistic/Library_lng.mk
@@ -58,10 +58,11 @@ $(eval $(call gb_Library_add_linked_libs,lng,\
 	xo \
 	ucbhelper \
 	utl \
-	icuuc \
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,lng,icuuc)
+
 $(eval $(call gb_Library_add_exception_objects,lng,\
 	linguistic/source/convdic \
 	linguistic/source/convdiclist \
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 2344d79..2216f54 100755
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -73,11 +73,12 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
     utl \
     vcl \
     vos3 \
-    xml2 \
     eggtray \
     sfx \
 ))
 
+$(call gb_Library_use_external,qstart_gtk,libxml2)
+
 $(eval $(call gb_Library_add_exception_objects,qstart_gtk,\
     sfx2/source/appl/shutdowniconunx \
 ))
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index c18b46c..a414041 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_Library_set_include,sfx,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
-    $(LIBXML_CFLAGS) \
 ))
 
 $(eval $(call gb_Library_set_defs,sfx,\
@@ -75,10 +74,11 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
     utl \
     vcl \
     vos3 \
-    xml2 \
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,sfx,libxml2)
+
 $(eval $(call gb_Library_add_exception_objects,sfx,\
     sfx2/source/appl/app \
     sfx2/source/appl/appbas \
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index b88e258..f42b812 100755
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -52,7 +52,6 @@ endif
 endif
 
 #todo: source/dialog BUILD_VER_STRING
-#todo: source/doc SYSTEM_LIBXML2
 #todo: ENABLE_LAYOUT
 #todo: clean up quickstarter stuff in both libraries
 #todo: move standard pool to svl
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 4ce5250..db42bae 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -52,7 +52,6 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
     drawinglayer \
     editeng \
     i18nisolang1 \
-    icuuc \
     sal \
     sfx \
     sot \
@@ -71,6 +70,8 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,svx,icuuc)
+
 $(eval $(call gb_Library_add_exception_objects,svx,\
     svx/source/accessibility/AccessibleControlShape \
     svx/source/accessibility/AccessibleEmptyEditSource \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index dd31e6b..2437ae9 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -68,7 +68,6 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\
     editeng \
     fwe \
     i18nisolang1 \
-    icuuc \
     lng \
     sal \
     sfx \
@@ -86,6 +85,8 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,svxcore,icuuc)
+
 $(eval $(call gb_Library_add_exception_objects,svxcore,\
     svx/source/core/coreservices \
     svx/source/customshapes/EnhancedCustomShape2d \
commit d55a89306e91f4d552f71eb442bc2ea9331e678a
Author: Michael Stahl <mst at openoffice.org>
Date:   Fri Apr 1 20:47:04 2011 +0000

    gnumake4: #i117340#: JavaClassSet: adapt users [hg:efb3d33ce8ca]

diff --git a/framework/JunitTest_framework_complex.mk b/framework/JunitTest_framework_complex.mk
index 5865a6f..d7dba37 100755
--- a/framework/JunitTest_framework_complex.mk
+++ b/framework/JunitTest_framework_complex.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,framework_complex))
+$(eval $(call gb_JunitTest_JunitTest,framework_complex,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,framework_complex,\
     $$(DEFS) \
diff --git a/framework/JunitTest_framework_unoapi.mk b/framework/JunitTest_framework_unoapi.mk
index 1204ee5..840d88c 100755
--- a/framework/JunitTest_framework_unoapi.mk
+++ b/framework/JunitTest_framework_unoapi.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,framework_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,framework_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,framework_unoapi,\
     $$(DEFS) \
diff --git a/linguistic/JunitTest_linguistic_complex.mk b/linguistic/JunitTest_linguistic_complex.mk
index fa7fad3..705ab85 100644
--- a/linguistic/JunitTest_linguistic_complex.mk
+++ b/linguistic/JunitTest_linguistic_complex.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,linguistic_complex))
+$(eval $(call gb_JunitTest_JunitTest,linguistic_complex,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,linguistic_complex,\
 	$$(DEFS) \
diff --git a/linguistic/JunitTest_linguistic_unoapi.mk b/linguistic/JunitTest_linguistic_unoapi.mk
index 237769e..c663874 100644
--- a/linguistic/JunitTest_linguistic_unoapi.mk
+++ b/linguistic/JunitTest_linguistic_unoapi.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,linguistic_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,linguistic_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,linguistic_unoapi,\
 	$$(DEFS) \
diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk
index 800612a..0ab800a 100755
--- a/sfx2/JunitTest_sfx2_complex.mk
+++ b/sfx2/JunitTest_sfx2_complex.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,sfx2_complex))
+$(eval $(call gb_JunitTest_JunitTest,sfx2_complex,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,sfx2_complex,\
     $$(DEFS) \
diff --git a/sfx2/JunitTest_sfx2_unoapi.mk b/sfx2/JunitTest_sfx2_unoapi.mk
index 33602a0..f7fdfae 100644
--- a/sfx2/JunitTest_sfx2_unoapi.mk
+++ b/sfx2/JunitTest_sfx2_unoapi.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,sfx2_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,sfx2_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,sfx2_unoapi,\
     $$(DEFS) \
diff --git a/svx/JunitTest_svx_unoapi.mk b/svx/JunitTest_svx_unoapi.mk
index d6597f8..a8b90a3 100755
--- a/svx/JunitTest_svx_unoapi.mk
+++ b/svx/JunitTest_svx_unoapi.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,svx_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,svx_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,svx_unoapi,\
     $$(DEFS) \
diff --git a/xmloff/JunitTest_xmloff_unoapi.mk b/xmloff/JunitTest_xmloff_unoapi.mk
index 8ac3a5a..d4e5a3c 100755
--- a/xmloff/JunitTest_xmloff_unoapi.mk
+++ b/xmloff/JunitTest_xmloff_unoapi.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,xmloff_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,xmloff_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,xmloff_unoapi,\
     $$(DEFS) \
commit 234846976903d939673850fc5cc26f90d80b66b5
Author: Michael Stahl <mst at openoffice.org>
Date:   Fri Apr 1 20:47:04 2011 +0000

    gnumake4: fix a typo (spotted by gang65) [hg:d60f717932a2]

diff --git a/framework/test/test.cxx b/framework/test/test.cxx
index dc6633c..733a4a5 100644
--- a/framework/test/test.cxx
+++ b/framework/test/test.cxx
@@ -241,7 +241,7 @@ void TestApplication::Main()
 //	Execute();
 //    xFrame->dispose();
 //    delete pMainWindow;
-    if( bState = sal_True )
+	if( bState == sal_True )
     {
         LOG_ERROR( "TestApplication::Main()", "Test successful ..." )
     }
