Author: arist
Date: Wed Nov 14 23:28:46 2012
New Revision: 1409550
URL: http://svn.apache.org/viewvc?rev=1409550&view=rev
Log:
gnumake4_051_62e2f8dc95a7.patch
# HG changeset patch
# User Michael Stahl <m...@openoffice.org>
# Date 1301690975 0
# Node ID 62e2f8dc95a75af0a8dff2e422617264fded66bb
# Parent c7dd91c90ac8f70b7bc8ad83febd86a2a48b9ea9
gnumake4: #i117610#: add RepositoryExternal.mk, and use it.
Added:
incubator/ooo/branches/gbuild/main/RepositoryExternal.mk
Modified:
incubator/ooo/branches/gbuild/main/Repository.mk
incubator/ooo/branches/gbuild/main/RepositoryFixes.mk
incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk
incubator/ooo/branches/gbuild/main/editeng/Library_editeng.mk
incubator/ooo/branches/gbuild/main/linguistic/Library_lng.mk
incubator/ooo/branches/gbuild/main/sax/Library_expwrap.mk
incubator/ooo/branches/gbuild/main/sax/Library_fastsax.mk
incubator/ooo/branches/gbuild/main/sfx2/Library_qstart.mk
incubator/ooo/branches/gbuild/main/sfx2/Library_sfx.mk
incubator/ooo/branches/gbuild/main/sfx2/Module_sfx2.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
incubator/ooo/branches/gbuild/main/svtools/Library_svt.mk
incubator/ooo/branches/gbuild/main/svx/Library_svx.mk
incubator/ooo/branches/gbuild/main/svx/Library_svxcore.mk
incubator/ooo/branches/gbuild/main/sw/Library_msword.mk
incubator/ooo/branches/gbuild/main/sw/Library_sw.mk
incubator/ooo/branches/gbuild/main/tools/Library_tl.mk
incubator/ooo/branches/gbuild/main/unoxml/Library_unordf.mk
incubator/ooo/branches/gbuild/main/unoxml/Library_unoxml.mk
Modified: incubator/ooo/branches/gbuild/main/Repository.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Repository.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Repository.mk (original)
+++ incubator/ooo/branches/gbuild/main/Repository.mk Wed Nov 14 23:28:46 2012
@@ -96,15 +96,11 @@ $(eval $(call gb_Helper_register_librari
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
- xml2 \
xmlreader \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- icuuc \
icule \
- rdf \
- xslt \
))
@@ -154,10 +150,8 @@ $(eval $(call gb_Helper_register_librari
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
basegfx_s \
- jpeglib \
ooopathutils \
salcpprt \
- zlib \
graphite \
vclmain \
))
@@ -181,15 +175,4 @@ $(eval $(call gb_Helper_register_librari
))
endif
-ifeq ($(SYSTEM_EXPAT),YES)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
- expat \
-))
-else
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
- expat_xmlparse \
- expat_xmltok \
-))
-endif
-
# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/RepositoryExternal.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/RepositoryExternal.mk?rev=1409550&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/RepositoryExternal.mk (added)
+++ incubator/ooo/branches/gbuild/main/RepositoryExternal.mk Wed Nov 14
23:28:46 2012
@@ -0,0 +1,281 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+# this file describes all the external libraries
+# depending on the configure options these may be taken from the system,
+# or the internal/bundled copy may be built.
+
+# for every external, a function gb_LinkTarget_use__FOO is defined,
+# once for the system case, once for the internal case.
+
+# in the system case, no libraries should be registered, but the target-local
+# variable LIBS should be set to FOO_LIBS, and INCLUDES to FOO_CFLAGS.
+
+
+ifeq ($(SYSTEM_ZLIB),YES)
+
+define gb_LinkTarget__use_zlib
+$(call gb_LinkTarget_set_defs,$(1),\
+ $$(DEFS) \
+ -DSYSTEM_ZLIB \
+)
+$(call gb_LinkTarget_add_libs,$(1),-lz)
+endef
+
+else # !SYSTEM_ZLIB
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ zlib \
+))
+
+define gb_LinkTarget__use_zlib
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+ zlib \
+)
+endef
+
+endif # SYSTEM_ZLIB
+
+
+ifeq ($(SYSTEM_JPEG),YES)
+
+define gb_LinkTarget__use_jpeg
+$(call gb_LinkTarget_add_libs,$(1),-ljpeg)
+$(call gb_LinkTarget_set_ldflags,$(1),\
+ $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
+)
+endef
+
+else # !SYSTEM_JPEG
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ jpeglib \
+))
+
+define gb_LinkTarget__use_jpeg
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+ jpeglib \
+)
+endef
+
+endif # SYSTEM_JPEG
+
+
+ifeq ($(SYSTEM_EXPAT),YES)
+
+define gb_LinkTarget__use_expat
+$(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter))
+
+$(call gb_LinkTarget_set_defs,$(1),\
+ $$(DEFS) \
+ -DSYSTEM_EXPAT \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),-lexpat)
+endef
+
+else # !SYSTEM_EXPAT
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ ascii_expat_xmlparse \
+ expat_xmlparse \
+ expat_xmltok \
+))
+
+define gb_LinkTarget__use_expat
+$(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter))
+
+$(if $(filter-out ascii_expat_xmlparse,$(2)),\
+ $(call gb_LinkTarget_set_defs,$(1),\
+ $$(DEFS) \
+ -DXML_UNICODE \
+))
+
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+ $(2) \
+ expat_xmltok \
+)
+endef
+
+endif # SYSTEM_EXPAT
+
+# now define 2 wrappers that select which internal static library to use...
+define gb_LinkTarget__use_expat_utf8
+$(call gb_LinkTarget__use_expat,$(1),ascii_expat_xmlparse)
+endef
+
+define gb_LinkTarget__use_expat_utf16
+$(call gb_LinkTarget__use_expat,$(1),expat_xmlparse)
+endef
+
+
+ifeq ($(SYSTEM_LIBXML),YES)
+
+define gb_LinkTarget__use_libxml2
+$(call gb_LinkTarget_set_defs,$(1),\
+ $$(DEFS) \
+ -DSYSTEM_LIBXML \
+)
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(LIBXML_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBXML_LIBS))
+endef
+
+else # !SYSTEM_LIBXML
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+ xml2 \
+))
+
+define gb_LinkTarget__use_libxml2
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+ xml2 \
+)
+endef
+
+endif # SYSTEM_LIBXML
+
+
+ifeq ($(SYSTEM_LIBXSLT),YES)
+
+define gb_LinkTarget__use_libxslt
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(LIBXSLT_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBXSLT_LIBS))
+endef
+
+else # !SYSTEM_LIBXSLT
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ xslt \
+))
+
+define gb_LinkTarget__use_libxslt
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+ xslt \
+)
+endef
+
+endif # SYSTEM_LIBXSLT
+
+
+ifeq ($(SYSTEM_REDLAND),YES)
+
+define gb_LinkTarget__use_librdf
+$(call gb_LinkTarget_set_defs,$(1),\
+ $$(DEFS) \
+ -DSYSTEM_REDLAND \
+)
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(REDLAND_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(REDLAND_LIBS))
+endef
+
+else # !SYSTEM_REDLAND
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ rdf \
+))
+
+define gb_LinkTarget__use_librdf
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+ rdf \
+)
+endef
+
+endif # SYSTEM_REDLAND
+
+
+ifeq ($(SYSTEM_CAIRO),YES)
+
+# FREETYPE_CLAGS from environment if ENABLE_CAIRO is used
+define gb_LinkTarget__use_cairo
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(FREETYPE_CFLAGS) \
+ $(CAIRO_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(CAIRO_LIBS))
+endef
+
+else # !SYSTEM_CAIRO
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ cairo \
+))
+ifneq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ pixman-1 \
+))
+endif # WNT
+
+define gb_LinkTarget__use_cairo
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/cairo \
+ $(FREETYPE_CFLAGS) \
+)
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+ cairo \
+)
+ifneq ($(OS),WNT)
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+ pixman-1 \
+)
+endif
+endef
+
+endif # SYSTEM_CAIRO
+
+
+ifeq ($(SYSTEM_ICU),YES)
+
+define gb_LinkTarget__use_icuuc
+$(call gb_LinkTarget_add_libs,$(1),-licuuc)
+endef
+
+else # !SYSTEM_ICU
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ icuuc \
+))
+
+define gb_LinkTarget__use_icuuc
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+ icuuc \
+)
+endef
+
+endif # SYSTEM_ICU
+
+# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/RepositoryFixes.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/RepositoryFixes.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/RepositoryFixes.mk (original)
+++ incubator/ooo/branches/gbuild/main/RepositoryFixes.mk Wed Nov 14 23:28:46
2012
@@ -260,25 +260,4 @@ gb_Library_TARGETS := $(filter-out crypt
gb_Library_TARGETS := $(filter-out ssl,$(gb_Library_TARGETS))
endif
-ifeq ($(SYSTEM_LIBXML),YES)
-gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_LIBXSLT),YES)
-gb_Library_TARGETS := $(filter-out xslt,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_REDLAND),YES)
-gb_Library_TARGETS := $(filter-out rdf,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_ICU),YES)
-gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_CAIRO),YES)
-gb_Library_TARGETS := $(filter-out cairo,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out pixman-1,$(gb_Library_TARGETS))
-endif
-
# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk (original)
+++ incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk Wed Nov 14
23:28:46 2012
@@ -51,22 +51,6 @@ $(eval $(call gb_Library_set_defs,cairoc
))
endif
-ifeq ($(SYSTEM_CAIRO),YES)
-# FREETYPE_CLAGS from environment if ENABLE_CAIRO is used
-# $(CAIRO_CFLAGS) currently not set; taking usr/include directly
-$(eval $(call gb_Library_set_include,cairocanvas,\
- $$(INCLUDE) \
- $(FREETYPE_CFLAGS) \
- -I/usr/include \
-))
-else
-$(eval $(call gb_Library_set_include,cairocanvas,\
- $$(INCLUDE) \
- -I$(OUTDIR)/inc/cairo \
- $(FREETYPE_CFLAGS) \
-))
-endif
-
$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
sal \
stl \
@@ -100,6 +84,7 @@ $(eval $(call gb_Library_add_exception_o
canvas/source/cairo/cairo_textlayout \
))
+$(call gb_Library_use_external,cairocanvas,cairo)
ifeq ($(OS),WNT)
@@ -107,18 +92,12 @@ $(eval $(call gb_Library_add_exception_o
canvas/source/cairo/cairo_win32_cairo \
))
$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
- cairo \
gdi32 \
user32 \
))
else
-$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
- cairo \
- pixman-1 \
-))
-
ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_add_exception_objects,cairocanvas,\
canvas/source/cairo/cairo_quartz_cairo \
Modified: incubator/ooo/branches/gbuild/main/editeng/Library_editeng.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/editeng/Library_editeng.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/editeng/Library_editeng.mk (original)
+++ incubator/ooo/branches/gbuild/main/editeng/Library_editeng.mk Wed Nov 14
23:28:46 2012
@@ -157,11 +157,12 @@ $(eval $(call gb_Library_add_linked_libs
cppu \
vos3 \
sal \
- icuuc \
i18nisolang1 \
i18npaper \
$(gb_STDLIBS) \
))
+$(call gb_Library_use_external,editeng,icuuc)
+
# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/linguistic/Library_lng.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/linguistic/Library_lng.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/linguistic/Library_lng.mk (original)
+++ incubator/ooo/branches/gbuild/main/linguistic/Library_lng.mk Wed Nov 14
23:28:46 2012
@@ -62,10 +62,11 @@ $(eval $(call gb_Library_add_linked_libs
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 \
Modified: incubator/ooo/branches/gbuild/main/sax/Library_expwrap.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sax/Library_expwrap.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/Library_expwrap.mk (original)
+++ incubator/ooo/branches/gbuild/main/sax/Library_expwrap.mk Wed Nov 14
23:28:46 2012
@@ -43,13 +43,6 @@ $(eval $(call gb_Library_set_defs,expwra
$$(DEFS) \
))
-ifeq ($(SYSTEM_ZLIB),YES)
-$(eval $(call gb_Library_set_defs,expwrap,\
- $$(DEFS) \
- -DSYSTEM_ZLIB \
-))
-endif
-
$(eval $(call gb_Library_add_linked_libs,expwrap,\
sal \
cppu \
@@ -58,24 +51,7 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
-ifeq ($(SYSTEM_EXPAT),YES)
-$(eval $(call gb_Library_set_defs,expwrap,\
- $$(DEFS) \
- -DSYSTEM_EXPAT \
-))
-$(eval $(call gb_Library_add_linked_libs,expwrap,\
- expat \
-))
-else
-$(eval $(call gb_Library_set_defs,expwrap,\
- $$(DEFS) \
- -DXML_UNICODE \
-))
-$(eval $(call gb_Library_add_linked_static_libs,expwrap,\
- expat_xmlparse \
- expat_xmltok \
-))
-endif
+$(call gb_Library_use_external,expwrap,expat_utf16)
$(eval $(call gb_Library_add_exception_objects,expwrap,\
sax/source/expatwrap/attrlistimpl \
Modified: incubator/ooo/branches/gbuild/main/sax/Library_fastsax.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sax/Library_fastsax.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/Library_fastsax.mk (original)
+++ incubator/ooo/branches/gbuild/main/sax/Library_fastsax.mk Wed Nov 14
23:28:46 2012
@@ -59,20 +59,7 @@ $(eval $(call gb_Library_set_defs,fastsa
))
endif
-ifeq ($(SYSTEM_EXPAT),YES)
-$(eval $(call gb_Library_set_defs,fastsax,\
- $$(DEFS) \
- -DSYSTEM_EXPAT \
-))
-$(eval $(call gb_Library_add_linked_libs,fastsax,\
- expat \
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,fastsax,\
- expat_xmlparse \
- expat_xmltok \
-))
-endif
+$(call gb_Library_use_external,fastsax,expat_utf8)
# re-uses xml2utf object from sax.uno lib (see below)
$(eval $(call gb_Library_add_exception_objects,fastsax,\
Modified: incubator/ooo/branches/gbuild/main/sfx2/Library_qstart.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sfx2/Library_qstart.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sfx2/Library_qstart.mk (original)
+++ incubator/ooo/branches/gbuild/main/sfx2/Library_qstart.mk Wed Nov 14
23:28:46 2012
@@ -78,10 +78,11 @@ $(eval $(call gb_Library_add_linked_libs
utl \
vcl \
vos3 \
- xml2 \
sfx \
))
+$(call gb_Library_use_external,qstart_gtk,libxml2)
+
$(eval $(call gb_Library_add_exception_objects,qstart_gtk,\
sfx2/source/appl/shutdowniconunx \
))
Modified: incubator/ooo/branches/gbuild/main/sfx2/Library_sfx.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sfx2/Library_sfx.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sfx2/Library_sfx.mk (original)
+++ incubator/ooo/branches/gbuild/main/sfx2/Library_sfx.mk Wed Nov 14 23:28:46
2012
@@ -48,7 +48,6 @@ $(eval $(call gb_Library_set_include,sfx
-I$(WORKDIR)/inc/ \
$$(INCLUDE) \
-I$(OUTDIR)/inc \
- $(LIBXML_CFLAGS) \
))
$(eval $(call gb_Library_set_defs,sfx,\
@@ -75,10 +74,11 @@ $(eval $(call gb_Library_add_linked_libs
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 \
Modified: incubator/ooo/branches/gbuild/main/sfx2/Module_sfx2.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sfx2/Module_sfx2.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sfx2/Module_sfx2.mk (original)
+++ incubator/ooo/branches/gbuild/main/sfx2/Module_sfx2.mk Wed Nov 14 23:28:46
2012
@@ -50,7 +50,6 @@ $(eval $(call gb_Module_add_targets,sfx2
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
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
(original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk Wed Nov
14 23:28:46 2012
@@ -280,20 +280,16 @@ gb_Library_UNOEXT := .uno$(gb_Library_PL
endif
gb_Library_PLAINLIBS_NONE += \
- cairo \
fontconfig \
Xrender \
- pixman-1 \
dl \
freetype \
- jpeg \
m \
pthread \
X11 \
Xext \
SM \
ICE \
- z \
cppunit
gb_Library_FILENAMES := \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk
(original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk Wed Nov
14 23:28:46 2012
@@ -330,10 +330,8 @@ gb_Library__FRAMEWORKS := \
gb_Library_PLAINLIBS_NONE += \
Cocoa \
objc \
- jpeg \
m \
pthread \
- z \
cppunit
gb_Library_FILENAMES := \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk
(original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk Wed
Nov 14 23:28:46 2012
@@ -264,7 +264,6 @@ gb_Library_PLAINLIBS_NONE += \
$(gb_STDLIBS) \
dl \
freetype \
- jpeg \
nsl \
pthread \
socket \
@@ -272,7 +271,6 @@ gb_Library_PLAINLIBS_NONE += \
Xext \
SM \
ICE \
- z \
cppunit
gb_Library_FILENAMES := \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
(original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk Wed
Nov 14 23:28:46 2012
@@ -457,7 +457,6 @@ gb_Library_PLAINEXT := .lib
gb_Library_PLAINLIBS_NONE += \
advapi32 \
- cairo \
d3d9 \
d3dx \
ddraw \
@@ -478,7 +477,6 @@ gb_Library_PLAINLIBS_NONE += \
uwinapi \
winmm \
winspool \
- z \
cppunit
gb_Library_LAYER := \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
(original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk Wed
Nov 14 23:28:46 2012
@@ -483,7 +483,6 @@ gb_Library_PLAINLIBS_NONE += \
$(gb_MINGW_LIBSTDCPP) \
$(gb_MINGW_LIBGCC) \
advapi32 \
- cairo \
d3d9 \
d3dx \
ddraw \
@@ -504,7 +503,6 @@ gb_Library_PLAINLIBS_NONE += \
uwinapi \
winmm \
winspool \
- z \
cppunit
gb_Library_LAYER := \
Modified: incubator/ooo/branches/gbuild/main/svtools/Library_svt.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svtools/Library_svt.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svtools/Library_svt.mk (original)
+++ incubator/ooo/branches/gbuild/main/svtools/Library_svt.mk Wed Nov 14
23:28:46 2012
@@ -58,7 +58,6 @@ $(eval $(call gb_Library_add_linked_libs
cppuhelper \
i18nisolang1 \
i18nutil \
- icuuc \
jvmfwk \
sal \
sot \
@@ -73,26 +72,10 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
-ifeq ($(SYSTEM_JPEG),YES)
-$(eval $(call gb_Library_add_linked_libs,svt,\
+$(call gb_Library_use_externals,svt,\
+ icuuc \
jpeg \
-))
-$(eval $(call gb_Library_set_ldflags,svt,\
- $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
-))
-ifeq ($(GUIBASE),os2)
-# YD FIXME above is not working... needs ldflags hack...
-$(eval $(call gb_Library_set_ldflags,svt,\
- $$(LDFLAGS) \
- -ljpeg \
-))
-endif
-
-else
-$(eval $(call gb_Library_add_linked_static_libs,svt,\
- jpeglib \
-))
-endif
+)
$(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/brwbox/brwbox1 \
Modified: incubator/ooo/branches/gbuild/main/svx/Library_svx.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svx/Library_svx.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svx/Library_svx.mk (original)
+++ incubator/ooo/branches/gbuild/main/svx/Library_svx.mk Wed Nov 14 23:28:46
2012
@@ -52,7 +52,6 @@ $(eval $(call gb_Library_add_linked_libs
drawinglayer \
editeng \
i18nisolang1 \
- icuuc \
sal \
sfx \
sot \
@@ -71,6 +70,8 @@ $(eval $(call gb_Library_add_linked_libs
$(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 \
Modified: incubator/ooo/branches/gbuild/main/svx/Library_svxcore.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/svx/Library_svxcore.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/svx/Library_svxcore.mk (original)
+++ incubator/ooo/branches/gbuild/main/svx/Library_svxcore.mk Wed Nov 14
23:28:46 2012
@@ -68,7 +68,6 @@ $(eval $(call gb_Library_add_linked_libs
editeng \
fwe \
i18nisolang1 \
- icuuc \
lng \
sal \
sfx \
@@ -86,6 +85,8 @@ $(eval $(call gb_Library_add_linked_libs
$(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 \
Modified: incubator/ooo/branches/gbuild/main/sw/Library_msword.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sw/Library_msword.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sw/Library_msword.mk (original)
+++ incubator/ooo/branches/gbuild/main/sw/Library_msword.mk Wed Nov 14 23:28:46
2012
@@ -54,7 +54,6 @@ $(eval $(call gb_Library_add_linked_libs
editeng \
i18nisolang1 \
i18nutil \
- icuuc \
msfilter \
sal \
sfx \
@@ -74,6 +73,8 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
+$(call gb_Library_use_external,msword,icuuc)
+
$(eval $(call gb_Library_add_exception_objects,msword,\
sw/source/filter/rtf/rtffld \
sw/source/filter/rtf/rtffly \
Modified: incubator/ooo/branches/gbuild/main/sw/Library_sw.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sw/Library_sw.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sw/Library_sw.mk (original)
+++ incubator/ooo/branches/gbuild/main/sw/Library_sw.mk Wed Nov 14 23:28:46 2012
@@ -61,7 +61,6 @@ $(eval $(call gb_Library_add_linked_libs
editeng \
i18nisolang1 \
i18nutil \
- icuuc \
lng \
sal \
salhelper \
@@ -84,6 +83,8 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
+$(call gb_Library_use_external,sw,icuuc)
+
$(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/SwNumberTree/SwNodeNum \
sw/source/core/SwNumberTree/SwNumberTree \
Modified: incubator/ooo/branches/gbuild/main/tools/Library_tl.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/tools/Library_tl.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/tools/Library_tl.mk (original)
+++ incubator/ooo/branches/gbuild/main/tools/Library_tl.mk Wed Nov 14 23:28:46
2012
@@ -132,19 +132,7 @@ $(eval $(call gb_Library_add_exception_o
))
endif
-ifeq ($(SYSTEM_ZLIB),YES)
-$(eval $(call gb_Library_set_cxxflags,tl,\
- $$(CXXFLAGS) \
- -DSYSTEM_ZLIB \
-))
-$(eval $(call gb_Library_add_linked_libs,tl,\
- z \
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,tl,\
- zlib \
-))
-endif
+$(call gb_Library_use_external,tl,zlib)
ifeq ($(OS),OS2)
# YD FIXME above is not working... needs ldflags hack...
Modified: incubator/ooo/branches/gbuild/main/unoxml/Library_unordf.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/unoxml/Library_unordf.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/unoxml/Library_unordf.mk (original)
+++ incubator/ooo/branches/gbuild/main/unoxml/Library_unordf.mk Wed Nov 14
23:28:46 2012
@@ -43,12 +43,15 @@ $(eval $(call gb_Library_add_linked_libs
cppu \
sal \
stl \
- rdf \
- xml2 \
- xslt \
$(gb_STDLIBS) \
))
+$(call gb_Library_use_externals,unordf,\
+ librdf \
+ libxml2 \
+ libxslt \
+)
+
$(eval $(call gb_Library_add_exception_objects,unordf,\
unoxml/source/rdf/CBlankNode \
unoxml/source/rdf/CURI \
@@ -57,19 +60,5 @@ $(eval $(call gb_Library_add_exception_o
unoxml/source/rdf/librdf_services \
))
-ifeq ($(SYSTEM_REDLAND),YES)
-$(eval $(call gb_Library_set_cxxflags,unordf,\
- $$(CXXFLAGS) \
- -DSYSTEM_REDLAND $$(REDLAND_CFLAGS) \
-))
-endif
-
-ifeq ($(SYSTEM_LIBXSLT),YES)
-$(eval $(call gb_Library_set_cxxflags,unordf,\
- $$(CXXFLAGS) \
- $$(LIBXSLT_CFLAGS) \
-))
-endif
-
# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/unoxml/Library_unoxml.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/unoxml/Library_unoxml.mk?rev=1409550&r1=1409549&r2=1409550&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/unoxml/Library_unoxml.mk (original)
+++ incubator/ooo/branches/gbuild/main/unoxml/Library_unoxml.mk Wed Nov 14
23:28:46 2012
@@ -46,10 +46,11 @@ $(eval $(call gb_Library_add_linked_libs
cppu \
sal \
stl \
- xml2 \
$(gb_STDLIBS) \
))
+$(call gb_Library_use_external,unoxml,libxml2)
+
$(eval $(call gb_Library_add_exception_objects,unoxml,\
unoxml/source/dom/node \
unoxml/source/dom/document \
@@ -85,12 +86,5 @@ $(eval $(call gb_Library_add_exception_o
unoxml/source/service/services \
))
-ifeq ($(SYSTEM_LIBXML),YES)
-$(eval $(call gb_Library_set_cxxflags,unoxml,\
- $$(CXXFLAGS) \
- -DSYSTEM_LIBXML $$(LIBXML_CFLAGS) \
-))
-endif
-
# vim: set noet sw=4 ts=4:
