Author: damjan
Date: Sun Mar 13 02:44:44 2016
New Revision: 1734757
URL: http://svn.apache.org/viewvc?rev=1734757&view=rev
Log:
Merge from branches/gbuild:
* r1409549: gnumake4: #i117610#: gbuild: more convenient handling for external
libs:
add local variable LIBS to LinkTarget, which is given verbatim to the linker.
* r1409550: gnumake4: #i117610#: add RepositoryExternal.mk, and use it.
Also had to move FreeBSD's LDFLAGS fixes from main/svtools/Library_svt.mk to
main/RepositoryFixes.mk. Not sure whether OS/2's LDFLAGS fixes are still
necessary?
Build updates by: me
Added:
openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk
- copied, changed from r1409550,
incubator/ooo/branches/gbuild/main/RepositoryExternal.mk
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/Repository.mk
openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk
openoffice/branches/gbuild-reintegration/main/canvas/Library_cairocanvas.mk
openoffice/branches/gbuild-reintegration/main/editeng/Library_editeng.mk
openoffice/branches/gbuild-reintegration/main/linguistic/Library_lng.mk
openoffice/branches/gbuild-reintegration/main/sax/Library_expwrap.mk
openoffice/branches/gbuild-reintegration/main/sax/Library_fastsax.mk
openoffice/branches/gbuild-reintegration/main/sfx2/Library_qstart.mk
openoffice/branches/gbuild-reintegration/main/sfx2/Library_sfx.mk
openoffice/branches/gbuild-reintegration/main/sfx2/Module_sfx2.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Executable.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/GoogleTest.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Helper.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Library.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/LinkTarget.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/freebsd.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk
openoffice/branches/gbuild-reintegration/main/svtools/Library_svt.mk
openoffice/branches/gbuild-reintegration/main/svx/Library_svx.mk
openoffice/branches/gbuild-reintegration/main/svx/Library_svxcore.mk
openoffice/branches/gbuild-reintegration/main/sw/Library_msword.mk
openoffice/branches/gbuild-reintegration/main/sw/Library_sw.mk
openoffice/branches/gbuild-reintegration/main/tools/Library_tl.mk
openoffice/branches/gbuild-reintegration/main/unoxml/Library_unordf.mk
openoffice/branches/gbuild-reintegration/main/unoxml/Library_unoxml.mk
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 13 02:44:44 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409495,1409497-1409515,1409518-1409519,1409523-1409524,1409526,1409529-1409531,1409533,1409535-1409541,1409543-1409544,1409546-1409547
+/incubator/ooo/branches/gbuild:1409313-1409550
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified: openoffice/branches/gbuild-reintegration/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Repository.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Repository.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Repository.mk Sun Mar 13
02:44:44 2016
@@ -99,15 +99,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 \
))
@@ -157,10 +153,8 @@ $(eval $(call gb_Helper_register_librari
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
basegfx_s \
- jpeglib \
ooopathutils \
salcpprt \
- zlib \
graphite \
vclmain \
))
@@ -184,15 +178,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:
Copied: openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk
(from r1409550, incubator/ooo/branches/gbuild/main/RepositoryExternal.mk)
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk?p2=openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk&p1=incubator/ooo/branches/gbuild/main/RepositoryExternal.mk&r1=1409550&r2=1734757&rev=1734757&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/RepositoryExternal.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk Sun Mar
13 02:44:44 2016
@@ -68,6 +68,12 @@ $(call gb_LinkTarget_add_libs,$(1),-ljpe
$(call gb_LinkTarget_set_ldflags,$(1),\
$$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
)
+ifeq ($(OS),FREEBSD)
+# JDK jpeg library on FreeBSD lives under ${JAVA_HOME}/jre/lib/${ARCH}/
+$(call gb_LinkTarget_set_ldflags,$(1),\
+ $$(filter-out -L$$(JAVA_HOME)/jre/lib/%,$$(LDFLAGS)) \
+)
+endif
endef
else # !SYSTEM_JPEG
Modified: openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk Sun Mar 13
02:44:44 2016
@@ -234,27 +234,6 @@ 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
-
ifeq ($(SYSTEM_EXPAT),YES)
gb_Library_TARGETS := $(filter-out expat,$(gb_Library_TARGETS))
endif
Modified:
openoffice/branches/gbuild-reintegration/main/canvas/Library_cairocanvas.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/Library_cairocanvas.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/Library_cairocanvas.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/Library_cairocanvas.mk
Sun Mar 13 02:44:44 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/editeng/Library_editeng.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/editeng/Library_editeng.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/editeng/Library_editeng.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/editeng/Library_editeng.mk
Sun Mar 13 02:44:44 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/linguistic/Library_lng.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/linguistic/Library_lng.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/linguistic/Library_lng.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/linguistic/Library_lng.mk Sun
Mar 13 02:44:44 2016
@@ -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: openoffice/branches/gbuild-reintegration/main/sax/Library_expwrap.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sax/Library_expwrap.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sax/Library_expwrap.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/sax/Library_expwrap.mk Sun
Mar 13 02:44:44 2016
@@ -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: openoffice/branches/gbuild-reintegration/main/sax/Library_fastsax.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sax/Library_fastsax.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sax/Library_fastsax.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/sax/Library_fastsax.mk Sun
Mar 13 02:44:44 2016
@@ -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: openoffice/branches/gbuild-reintegration/main/sfx2/Library_qstart.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sfx2/Library_qstart.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sfx2/Library_qstart.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/sfx2/Library_qstart.mk Sun
Mar 13 02:44:44 2016
@@ -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: openoffice/branches/gbuild-reintegration/main/sfx2/Library_sfx.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sfx2/Library_sfx.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sfx2/Library_sfx.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sfx2/Library_sfx.mk Sun Mar
13 02:44:44 2016
@@ -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: openoffice/branches/gbuild-reintegration/main/sfx2/Module_sfx2.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sfx2/Module_sfx2.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sfx2/Module_sfx2.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sfx2/Module_sfx2.mk Sun Mar
13 02:44:44 2016
@@ -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:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Executable.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Executable.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Executable.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Executable.mk
Sun Mar 13 02:44:44 2016
@@ -78,6 +78,8 @@ $(eval $(foreach method,\
add_api \
add_linked_libs \
add_linked_static_libs \
+ use_external \
+ use_externals \
add_package_headers \
add_sdi_headers \
add_precompiled_header \
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/GoogleTest.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/GoogleTest.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/GoogleTest.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/GoogleTest.mk
Sun Mar 13 02:44:44 2016
@@ -87,6 +87,8 @@ $(eval $(foreach method,\
add_api \
add_linked_libs \
add_linked_static_libs \
+ use_external \
+ use_externals \
add_package_headers \
add_sdi_headers \
add_precompiled_header \
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Helper.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Helper.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Helper.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Helper.mk Sun
Mar 13 02:44:44 2016
@@ -95,6 +95,7 @@ gb_Helper_REPOSITORYNAMES += $(1)
endef
+# RepositoryExternal.mk is optional
define gb_Helper_add_repository
gb_Helper_CURRENTREPOSITORY :=
include $(1)/Repository.mk
@@ -102,6 +103,7 @@ ifeq ($$(gb_Helper_CURRENTREPOSITORY),)
$$(eval $$(call gb_Output_error,No call to gb_Helper_register_repository in
Repository.mk for repository $(1)))
endif
$$(gb_Helper_CURRENTREPOSITORY) := $(1)
+-include $(1)/RepositoryExternal.mk
endef
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Library.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Library.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Library.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Library.mk Sun
Mar 13 02:44:44 2016
@@ -122,6 +122,8 @@ $(eval $(foreach method,\
add_linked_libs \
add_linked_static_libs \
add_external_libs \
+ use_external \
+ use_externals \
add_package_headers \
add_sdi_headers \
add_precompiled_header \
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/LinkTarget.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/LinkTarget.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/LinkTarget.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/LinkTarget.mk
Sun Mar 13 02:44:44 2016
@@ -353,6 +353,7 @@ $(call gb_LinkTarget_get_target,$(1)) :
$(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS :=
$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS :=
$(call gb_LinkTarget_get_target,$(1)) : EXTERNAL_LIBS :=
+$(call gb_LinkTarget_get_target,$(1)) : LIBS :=
$(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE :=
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : PCH_NAME :=
@@ -459,6 +460,10 @@ endif
endef
+define gb_LinkTarget_add_libs
+$(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2)
+endef
+
define gb_LinkTarget_add_linked_libs
ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
$$(eval $$(call gb_Output_info,currently known libraries are: $(sort
$(gb_Library_KNOWNLIBS)),ALL))
@@ -681,4 +686,17 @@ endif
endef
+# this forwards to functions that must be defined in RepositoryExternal.mk.
+# $(call gb_LinkTarget_use_external,library,external)
+define gb_LinkTarget_use_external
+$(eval $(if $(value gb_LinkTarget__use_$(2)),\
+ $(call gb_LinkTarget__use_$(2),$(1)),\
+ $(error gb_LinkTarget_use_external: unknown external: $(2))))
+endef
+
+# $(call gb_LinkTarget_use_externals,library,externals)
+gb_LinkTarget_use_externals = \
+ $(foreach external,$(2),$(call gb_LinkTarget_use_external,$(1),$(external)))
+
+
# vim: set noet sw=4 ts=4:
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/freebsd.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/freebsd.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/freebsd.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/freebsd.mk
Sun Mar 13 02:44:44 2016
@@ -253,6 +253,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
-Wl$(COMMA)--start-group $(foreach
lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib)))
-Wl$(COMMA)--end-group \
+ $(LIBS) \
-o $(1))
endef
@@ -296,20 +297,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
+ ICE
gb_Library_FILENAMES := \
$(foreach
lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT))
\
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk
Sun Mar 13 02:44:44 2016
@@ -236,6 +236,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_filename,$(lib)))) \
$(patsubst %,-l%,$(EXTERNAL_LIBS)) \
-Wl$(COMMA)--start-group $(foreach
lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib)))
-Wl$(COMMA)--end-group \
+ $(LIBS) \
-o $(1))
endef
@@ -279,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
+ ICE
gb_Library_FILENAMES := \
$(foreach
lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT))
\
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk
Sun Mar 13 02:44:44 2016
@@ -285,6 +285,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(OBJCXXOBJECTS),$(call
gb_ObjCxxObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call
gb_StaticLibrary_get_target,$(lib))) \
+ $(LIBS) \
-o $(1) \
`cat $${DYLIB_FILE}` && \
$(if $(filter Library,$(TARGETTYPE)),\
@@ -330,10 +331,8 @@ gb_Library__FRAMEWORKS := \
gb_Library_PLAINLIBS_NONE += \
Cocoa \
objc \
- jpeg \
m \
- pthread \
- z
+ pthread
gb_Library_FILENAMES := \
$(foreach
lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT))
\
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk
Sun Mar 13 02:44:44 2016
@@ -326,6 +326,7 @@ $(call gb_Helper_abbreviate_dirs_native,
$(patsubst %.lib,-l%,$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_filename,$(lib)))) \
$(patsubst %,-l%,$(EXTERNAL_LIBS)) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call
gb_StaticLibrary_get_target,$(lib))) \
+ $(LIBS) \
$(if $(DLLTARGET),-o $(DLLTARGET), -o $(1) ); \
RC=$$?; rm $${RESPONSEFILE} \
$(if $(DLLTARGET),; emximp -p2048 -o $(1) $(DLLDEF) ) \
@@ -367,9 +368,7 @@ gb_Library_PLAINLIBS_NONE += \
ft2lib \
dl \
freetype \
- jpeg \
m \
- z \
pthread
gb_Library_LAYER := \
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk
Sun Mar 13 02:44:44 2016
@@ -213,6 +213,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call
gb_StaticLibrary_get_target,$(lib))) \
+ $(LIBS) \
-o $(1))
endef
@@ -263,15 +264,13 @@ gb_Library_PLAINLIBS_NONE += \
$(gb_STDLIBS) \
dl \
freetype \
- jpeg \
nsl \
pthread \
socket \
X11 \
Xext \
SM \
- ICE \
- z
+ ICE
gb_Library_FILENAMES := \
$(foreach
lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT))
\
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk
Sun Mar 13 02:44:44 2016
@@ -436,6 +436,7 @@ $(call gb_Helper_abbreviate_dirs_native,
$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_filename,$(lib))) \
$(patsubst %,%.lib,$(EXTERNAL_LIBS)) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call
gb_StaticLibrary_get_filename,$(lib))) \
+ $(LIBS) \
$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1));
RC=$$?; rm $${RESPONSEFILE} \
$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false;
fi) ; exit $$RC)
endef
@@ -452,7 +453,6 @@ gb_Library_PLAINEXT := .lib
gb_Library_PLAINLIBS_NONE += \
advapi32 \
- cairo \
d3d9 \
d3dx \
ddraw \
@@ -472,8 +472,7 @@ gb_Library_PLAINLIBS_NONE += \
uuid \
uwinapi \
winmm \
- winspool \
- z
+ winspool
gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk
Sun Mar 13 02:44:44 2016
@@ -416,6 +416,7 @@ $(call gb_Helper_abbreviate_dirs_native,
--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call
gb_StaticLibrary_get_target,$(lib))) --end-group \
--start-group $(patsubst %.dll,-l%,$(foreach
lib,$(LINKED_LIBS),$(call gb_Library_get_dllname,$(lib)))) --end-group \
--start-group $(patsubst %,-l%,$(EXTERNAL_LIBS)) --end-group \
+ $(LIBS) \
$(MINGW_CLIB_DIR)/crtend.o \
-Map $(basename $(1)).map \
-o $(1))
@@ -440,6 +441,7 @@ $(call gb_Helper_abbreviate_dirs_native,
@$${RESPONSEFILE} \
--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call
gb_StaticLibrary_get_target,$(lib))) --end-group \
--start-group $(patsubst %.dll,-l%,$(foreach
lib,$(LINKED_LIBS),$(call gb_Library_get_dllname,$(lib)))) --end-group \
+ $(LIBS) \
$(MINGW_CLIB_DIR)/crtend.o \
-Map $(basename $(DLLTARGET)).map \
-o $(DLLTARGET) && touch $(1))
@@ -481,7 +483,6 @@ gb_Library_PLAINLIBS_NONE += \
$(gb_MINGW_LIBSTDCPP) \
$(gb_MINGW_LIBGCC) \
advapi32 \
- cairo \
d3d9 \
d3dx \
ddraw \
@@ -501,8 +502,7 @@ gb_Library_PLAINLIBS_NONE += \
uuid \
uwinapi \
winmm \
- winspool \
- z
+ winspool
gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
Modified: openoffice/branches/gbuild-reintegration/main/svtools/Library_svt.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/svtools/Library_svt.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/svtools/Library_svt.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/svtools/Library_svt.mk Sun
Mar 13 02:44:44 2016
@@ -58,7 +58,6 @@ $(eval $(call gb_Library_add_linked_libs
cppuhelper \
i18nisolang1 \
i18nutil \
- icuuc \
jvmfwk \
sal \
sot \
@@ -73,32 +72,10 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
-ifeq ($(SYSTEM_JPEG),YES)
-$(eval $(call gb_Library_add_linked_libs,svt,\
- jpeg \
-))
-$(eval $(call gb_Library_set_ldflags,svt,\
- $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
-))
-ifeq ($(OS),FREEBSD)
-# JDK jpeg library on FreeBSD lives under ${JAVA_HOME}/jre/lib/${ARCH}/
-$(eval $(call gb_Library_set_ldflags,svt,\
- $$(filter-out -L$$(JAVA_HOME)/jre/lib/%,$$(LDFLAGS)) \
-))
-endif
-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
+$(call gb_Library_use_externals,svt,\
+ icuuc \
+ jpeg \
+)
$(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/brwbox/brwbox1 \
Modified: openoffice/branches/gbuild-reintegration/main/svx/Library_svx.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/svx/Library_svx.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/svx/Library_svx.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/svx/Library_svx.mk Sun Mar 13
02:44:44 2016
@@ -54,7 +54,6 @@ $(eval $(call gb_Library_add_linked_libs
fwe \
fwk \
i18nisolang1 \
- icuuc \
sal \
sfx \
sot \
@@ -73,6 +72,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: openoffice/branches/gbuild-reintegration/main/svx/Library_svxcore.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/svx/Library_svxcore.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/svx/Library_svxcore.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/svx/Library_svxcore.mk Sun
Mar 13 02:44:44 2016
@@ -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: openoffice/branches/gbuild-reintegration/main/sw/Library_msword.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sw/Library_msword.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sw/Library_msword.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/sw/Library_msword.mk Sun Mar
13 02:44:44 2016
@@ -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: openoffice/branches/gbuild-reintegration/main/sw/Library_sw.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sw/Library_sw.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sw/Library_sw.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sw/Library_sw.mk Sun Mar 13
02:44:44 2016
@@ -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: openoffice/branches/gbuild-reintegration/main/tools/Library_tl.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/tools/Library_tl.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/tools/Library_tl.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/tools/Library_tl.mk Sun Mar
13 02:44:44 2016
@@ -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: openoffice/branches/gbuild-reintegration/main/unoxml/Library_unordf.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/unoxml/Library_unordf.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/unoxml/Library_unordf.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/unoxml/Library_unordf.mk Sun
Mar 13 02:44:44 2016
@@ -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: openoffice/branches/gbuild-reintegration/main/unoxml/Library_unoxml.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/unoxml/Library_unoxml.mk?rev=1734757&r1=1734756&r2=1734757&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/unoxml/Library_unoxml.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/unoxml/Library_unoxml.mk Sun
Mar 13 02:44:44 2016
@@ -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:
