Author: damjan
Date: Sun Mar 13 18:28:29 2016
New Revision: 1734836
URL: http://svn.apache.org/viewvc?rev=1734836&view=rev
Log:
Merge from branches/gbuild:
* r1409569: gnumake4: #i116959#: kill
gb_LinkTarget_set_{defs,cflags,cxxflags,objcxxflags}
* r1409568: gnumake4: Output.mk: enable gb_COLOR on xtermc
* r1409567: gnumake4: Helper.mk: check for duplicate registration;
the error message you would get when trying to build a twice
* r1409566: gnumake4: JavaClassSet.mk: strip whitespace when
adding to CLASSPATH
Also converted a number of other makefiles with gb_LinkTarget_set_defs
to gb_LinkTarget_add_defs, which it needs to build.
BUILDS
Build updates by: me
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/ext_libraries/apr-util/apr-util-1.4.1.makewin32.patch
openoffice/branches/gbuild-reintegration/ext_libraries/serf/win/Library_serf.mk
openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk
openoffice/branches/gbuild-reintegration/main/basebmp/GoogleTest_basebmp.mk
openoffice/branches/gbuild-reintegration/main/basebmp/Library_basebmp.mk
openoffice/branches/gbuild-reintegration/main/basegfx/Library_basegfx.mk
openoffice/branches/gbuild-reintegration/main/basegfx/StaticLibrary_basegfx_s.mk
openoffice/branches/gbuild-reintegration/main/canvas/Library_cairocanvas.mk
openoffice/branches/gbuild-reintegration/main/canvas/Library_canvasfactory.mk
openoffice/branches/gbuild-reintegration/main/canvas/Library_canvastools.mk
openoffice/branches/gbuild-reintegration/main/canvas/Library_directx5canvas.mk
openoffice/branches/gbuild-reintegration/main/canvas/Library_directx9canvas.mk
openoffice/branches/gbuild-reintegration/main/canvas/Library_gdipluscanvas.mk
openoffice/branches/gbuild-reintegration/main/canvas/Library_nullcanvas.mk
openoffice/branches/gbuild-reintegration/main/canvas/Library_simplecanvas.mk
openoffice/branches/gbuild-reintegration/main/canvas/Library_vclcanvas.mk
openoffice/branches/gbuild-reintegration/main/comphelper/Library_comphelp.mk
openoffice/branches/gbuild-reintegration/main/cppcanvas/Library_cppcanvas.mk
openoffice/branches/gbuild-reintegration/main/drawinglayer/Library_drawinglayer.mk
openoffice/branches/gbuild-reintegration/main/editeng/Library_editeng.mk
openoffice/branches/gbuild-reintegration/main/formula/Library_for.mk
openoffice/branches/gbuild-reintegration/main/formula/Library_forui.mk
openoffice/branches/gbuild-reintegration/main/framework/Library_fwe.mk
openoffice/branches/gbuild-reintegration/main/framework/Library_fwi.mk
openoffice/branches/gbuild-reintegration/main/linguistic/Library_lng.mk
openoffice/branches/gbuild-reintegration/main/oox/Library_oox.mk
openoffice/branches/gbuild-reintegration/main/padmin/Library_spa.mk
openoffice/branches/gbuild-reintegration/main/sax/Library_expwrap.mk
openoffice/branches/gbuild-reintegration/main/sax/Library_fastsax.mk
openoffice/branches/gbuild-reintegration/main/sax/Library_sax.mk
openoffice/branches/gbuild-reintegration/main/sfx2/Library_qstart.mk
openoffice/branches/gbuild-reintegration/main/sfx2/Library_sfx.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Helper.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JavaClassSet.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/Output.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/StaticLibrary.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/templates/Library.mk
openoffice/branches/gbuild-reintegration/main/sot/Library_sot.mk
openoffice/branches/gbuild-reintegration/main/starmath/Library_sm.mk
openoffice/branches/gbuild-reintegration/main/starmath/Library_smd.mk
openoffice/branches/gbuild-reintegration/main/svgio/Library_svgio.mk
openoffice/branches/gbuild-reintegration/main/svl/Library_svl.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/svx/Library_textconversiondlgs.mk
openoffice/branches/gbuild-reintegration/main/sw/Library_msword.mk
openoffice/branches/gbuild-reintegration/main/sw/Library_sw.mk
openoffice/branches/gbuild-reintegration/main/sw/Library_swd.mk
openoffice/branches/gbuild-reintegration/main/sw/Library_swui.mk
openoffice/branches/gbuild-reintegration/main/toolkit/Library_tk.mk
openoffice/branches/gbuild-reintegration/main/tools/Library_tl.mk
openoffice/branches/gbuild-reintegration/main/ucbhelper/Library_ucbhelper.mk
openoffice/branches/gbuild-reintegration/main/unotools/Library_utl.mk
openoffice/branches/gbuild-reintegration/main/unoxml/Library_unordf.mk
openoffice/branches/gbuild-reintegration/main/unoxml/Library_unoxml.mk
openoffice/branches/gbuild-reintegration/main/vbahelper/Library_vbahelper.mk
openoffice/branches/gbuild-reintegration/main/vcl/Library_desktop_detector.mk
openoffice/branches/gbuild-reintegration/main/vcl/Library_vcl.mk
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gen.mk
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gtk.mk
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde.mk
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde4.mk
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_svp.mk
openoffice/branches/gbuild-reintegration/main/vcl/StaticLibrary_vclmain.mk
openoffice/branches/gbuild-reintegration/main/writerfilter/Library_writerfilter.mk
openoffice/branches/gbuild-reintegration/main/writerfilter/Library_writerfilter_debug.mk
openoffice/branches/gbuild-reintegration/main/xmloff/Library_xo.mk
openoffice/branches/gbuild-reintegration/main/xmlreader/Library_xmlreader.mk
openoffice/branches/gbuild-reintegration/main/xmlscript/Library_xcr.mk
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 13 18:28:29 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409565
+/incubator/ooo/branches/gbuild:1409313-1409569
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified:
openoffice/branches/gbuild-reintegration/ext_libraries/apr-util/apr-util-1.4.1.makewin32.patch
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/ext_libraries/apr-util/apr-util-1.4.1.makewin32.patch?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/ext_libraries/apr-util/apr-util-1.4.1.makewin32.patch
(original)
+++
openoffice/branches/gbuild-reintegration/ext_libraries/apr-util/apr-util-1.4.1.makewin32.patch
Sun Mar 13 18:28:29 2016
@@ -1,6 +1,6 @@
--- misc/apr-util-1.4.1/Library_apr-util.mk 2012-01-05 14:49:40.529219100
+0100
+++ misc/build/apr-util-1.4.1/Library_apr-util.mk 2012-01-05
14:47:18.621102400 +0100
-@@ -1 +1,90 @@
+@@ -1 +1,89 @@
-dummy
+#/**************************************************************
+# *
@@ -34,8 +34,7 @@
+ -I$(OUTDIR)/inc/apr \
+))
+
-+$(eval $(call gb_Library_set_defs,apr-util,\
-+ $$(DEFS) \
++$(eval $(call gb_Library_add_defs,apr-util,\
+ -DAPU_DECLARE_EXPORT -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL
-DWIN32_EXPORTS \
+))
+
Modified:
openoffice/branches/gbuild-reintegration/ext_libraries/serf/win/Library_serf.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/ext_libraries/serf/win/Library_serf.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/ext_libraries/serf/win/Library_serf.mk
(original)
+++
openoffice/branches/gbuild-reintegration/ext_libraries/serf/win/Library_serf.mk
Sun Mar 13 18:28:29 2016
@@ -31,8 +31,7 @@ $(eval $(call gb_Library_set_include,ser
-I$(OUTDIR)/inc/external/zlib \
))
-$(eval $(call gb_Library_set_defs,serf,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,serf,\
-DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS \
))
Modified: openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk Sun Mar
13 18:28:29 2016
@@ -39,8 +39,7 @@
ifeq ($(SYSTEM_ZLIB),YES)
define gb_LinkTarget__use_zlib
-$(call gb_LinkTarget_set_defs,$(1),\
- $$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(1),\
-DSYSTEM_ZLIB \
)
$(call gb_LinkTarget_add_libs,$(1),-lz)
@@ -96,8 +95,7 @@ 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) \
+$(call gb_LinkTarget_add_defs,$(1),\
-DSYSTEM_EXPAT \
)
@@ -116,8 +114,7 @@ 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) \
+ $(call gb_LinkTarget_add_defs,$(1),\
-DXML_UNICODE \
))
@@ -142,8 +139,7 @@ endef
ifeq ($(SYSTEM_LIBXML),YES)
define gb_LinkTarget__use_libxml2
-$(call gb_LinkTarget_set_defs,$(1),\
- $$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(1),\
-DSYSTEM_LIBXML \
)
$(call gb_LinkTarget_set_include,$(1),\
@@ -196,8 +192,7 @@ endif # SYSTEM_LIBXSLT
ifeq ($(SYSTEM_REDLAND),YES)
define gb_LinkTarget__use_librdf
-$(call gb_LinkTarget_set_defs,$(1),\
- $$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(1),\
-DSYSTEM_REDLAND \
)
$(call gb_LinkTarget_set_include,$(1),\
Modified:
openoffice/branches/gbuild-reintegration/main/basebmp/GoogleTest_basebmp.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basebmp/GoogleTest_basebmp.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/basebmp/GoogleTest_basebmp.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/basebmp/GoogleTest_basebmp.mk
Sun Mar 13 18:28:29 2016
@@ -53,8 +53,4 @@ $(eval $(call gb_GoogleTest_add_api,base
offapi \
))
-$(eval $(call gb_GoogleTest_set_include,basebmp_test,\
- $$(INCLUDE) \
-))
-
# vim: set noet sw=4 ts=4:
Modified:
openoffice/branches/gbuild-reintegration/main/basebmp/Library_basebmp.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basebmp/Library_basebmp.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/basebmp/Library_basebmp.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/basebmp/Library_basebmp.mk
Sun Mar 13 18:28:29 2016
@@ -40,8 +40,7 @@ $(eval $(call gb_Library_set_include,bas
$$(INCLUDE) \
))
-$(eval $(call gb_Library_set_defs,basebmp,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,basebmp,\
-DBASEBMP_DLLIMPLEMENTATION \
))
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/Library_basegfx.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/Library_basegfx.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/basegfx/Library_basegfx.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/basegfx/Library_basegfx.mk
Sun Mar 13 18:28:29 2016
@@ -43,8 +43,7 @@ $(eval $(call gb_Library_set_include,bas
$$(INCLUDE) \
))
-$(eval $(call gb_Library_set_defs,basegfx,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,basegfx,\
-DBASEGFX_DLLIMPLEMENTATION \
))
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/StaticLibrary_basegfx_s.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/StaticLibrary_basegfx_s.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/StaticLibrary_basegfx_s.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/StaticLibrary_basegfx_s.mk
Sun Mar 13 18:28:29 2016
@@ -48,8 +48,7 @@ $(eval $(call gb_StaticLibrary_set_inclu
# this means that all code of this static library will end in a dll
# thus the _DLL define must be set to avoid link problems with stlport symbols
# the BASEGFX_STATICLIBRARY define will expand all BASEGFX_DLLPRIVATE/PUBLIC
macros to nothing
-$(eval $(call gb_StaticLibrary_set_defs,basegfx_s,\
- $$(DEFS) \
+$(eval $(call gb_StaticLibrary_add_defs,basegfx_s,\
-DBASEGFX_STATICLIBRARY \
-D_DLL \
))
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=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/Library_cairocanvas.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/Library_cairocanvas.mk
Sun Mar 13 18:28:29 2016
@@ -40,13 +40,8 @@ $(eval $(call gb_Library_set_include,cai
-I$(SRCDIR)/canvas/inc/pch \
))
-$(eval $(call gb_Library_set_defs,cairocanvas,\
- $$(DEFS) \
-))
-
ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,cairocanvas,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,cairocanvas,\
-DVERBOSE \
))
endif
Modified:
openoffice/branches/gbuild-reintegration/main/canvas/Library_canvasfactory.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/Library_canvasfactory.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/canvas/Library_canvasfactory.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/canvas/Library_canvasfactory.mk
Sun Mar 13 18:28:29 2016
@@ -40,10 +40,6 @@ $(eval $(call gb_Library_set_include,can
-I$(SRCDIR)/canvas/inc/pch \
))
-$(eval $(call gb_Library_set_defs,canvasfactory,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,canvasfactory,\
sal \
stl \
Modified:
openoffice/branches/gbuild-reintegration/main/canvas/Library_canvastools.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/Library_canvastools.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/Library_canvastools.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/Library_canvastools.mk
Sun Mar 13 18:28:29 2016
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -42,21 +42,18 @@ $(eval $(call gb_Library_set_include,can
-I$(SRCDIR)/canvas/inc/pch \
))
-$(eval $(call gb_Library_set_defs,canvastools,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,canvastools,\
-DCANVASTOOLS_DLLIMPLEMENTATION \
))
ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,canvastools,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,canvastools,\
-DVERBOSE \
))
endif
ifneq ($(strip $(PROFILER)$(profiler)),)
-$(eval $(call gb_Library_set_defs,canvastools,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,canvastools,\
-DPROFILER \
))
endif
@@ -91,7 +88,7 @@ $(eval $(call gb_Library_add_exception_o
canvas/source/tools/verifyinput \
))
-ifeq ($(strip $(ENABLE_AGG)),YES)
+ifeq ($(strip $(ENABLE_AGG)),YES)
$(eval $(call gb_Library_add_exception_objects,canvastools,\
canvas/source/tools/bitmap \
canvas/source/tools/image \
@@ -99,9 +96,8 @@ $(eval $(call gb_Library_add_exception_o
$(eval $(call gb_Library_add_linked_libs,canvastools,\
agg \
))
-ifneq ($(strip $(AGG_VERSION)),)
-$(eval $(call gb_Library_set_defs,canvastools,\
- $$(DEFS) \
+ifneq ($(strip $(AGG_VERSION)),)
+$(eval $(call gb_Library_add_defs,canvastools,\
-DAGG_VERSION=$(AGG_VERSION) \
))
endif
Modified:
openoffice/branches/gbuild-reintegration/main/canvas/Library_directx5canvas.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/Library_directx5canvas.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/canvas/Library_directx5canvas.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/canvas/Library_directx5canvas.mk
Sun Mar 13 18:28:29 2016
@@ -41,14 +41,12 @@ $(eval $(call gb_Library_set_include,dir
-I$(SRCDIR)/canvas/source/directx \
))
-$(eval $(call gb_Library_set_defs,directx5canvas,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,directx5canvas,\
-DDIRECTX_VERSION=0x0500 \
))
ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,directx5canvas,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,directx5canvas,\
-DVERBOSE \
))
endif
Modified:
openoffice/branches/gbuild-reintegration/main/canvas/Library_directx9canvas.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/Library_directx9canvas.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/canvas/Library_directx9canvas.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/canvas/Library_directx9canvas.mk
Sun Mar 13 18:28:29 2016
@@ -40,14 +40,12 @@ $(eval $(call gb_Library_set_include,dir
-I$(SRCDIR)/canvas/inc/pch \
))
-$(eval $(call gb_Library_set_defs,directx9canvas,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,directx9canvas,\
-DDIRECTX_VERSION=0x0900 \
))
ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,directx9canvas,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,directx9canvas,\
-DVERBOSE \
))
endif
Modified:
openoffice/branches/gbuild-reintegration/main/canvas/Library_gdipluscanvas.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/Library_gdipluscanvas.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/canvas/Library_gdipluscanvas.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/canvas/Library_gdipluscanvas.mk
Sun Mar 13 18:28:29 2016
@@ -40,14 +40,12 @@ $(eval $(call gb_Library_set_include,gdi
-I$(SRCDIR)/canvas/inc/pch \
))
-$(eval $(call gb_Library_set_defs,gdipluscanvas,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,gdipluscanvas,\
-DDIRECTX_VERSION=0x0900 \
))
ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,gdipluscanvas,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,gdipluscanvas,\
-DVERBOSE \
))
endif
Modified:
openoffice/branches/gbuild-reintegration/main/canvas/Library_nullcanvas.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/Library_nullcanvas.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/Library_nullcanvas.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/Library_nullcanvas.mk
Sun Mar 13 18:28:29 2016
@@ -38,13 +38,8 @@ $(eval $(call gb_Library_set_include,nul
-I$(SRCDIR)/canvas/inc/pch \
))
-$(eval $(call gb_Library_set_defs,nullcanvas,\
- $$(DEFS) \
-))
-
ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,nullcanvas,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,nullcanvas,\
-DVERBOSE \
))
endif
Modified:
openoffice/branches/gbuild-reintegration/main/canvas/Library_simplecanvas.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/Library_simplecanvas.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/canvas/Library_simplecanvas.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/canvas/Library_simplecanvas.mk
Sun Mar 13 18:28:29 2016
@@ -40,13 +40,8 @@ $(eval $(call gb_Library_set_include,sim
-I$(SRCDIR)/canvas/inc/pch \
))
-$(eval $(call gb_Library_set_defs,simplecanvas,\
- $$(DEFS) \
-))
-
ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,simplecanvas,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,simplecanvas,\
-DVERBOSE \
))
endif
Modified:
openoffice/branches/gbuild-reintegration/main/canvas/Library_vclcanvas.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/Library_vclcanvas.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/Library_vclcanvas.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/Library_vclcanvas.mk
Sun Mar 13 18:28:29 2016
@@ -40,13 +40,8 @@ $(eval $(call gb_Library_set_include,vcl
-I$(SRCDIR)/canvas/inc/pch \
))
-$(eval $(call gb_Library_set_defs,vclcanvas,\
- $$(DEFS) \
-))
-
ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,vclcanvas,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclcanvas,\
-DVERBOSE \
))
endif
Modified:
openoffice/branches/gbuild-reintegration/main/comphelper/Library_comphelp.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/comphelper/Library_comphelp.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/comphelper/Library_comphelp.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/comphelper/Library_comphelp.mk
Sun Mar 13 18:28:29 2016
@@ -35,8 +35,7 @@ $(eval $(call gb_Library_set_include,com
$$(INCLUDE) \
))
-$(eval $(call gb_Library_set_defs,comphelper,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,comphelper,\
-DCOMPHELPER_DLLIMPLEMENTATION \
))
Modified:
openoffice/branches/gbuild-reintegration/main/cppcanvas/Library_cppcanvas.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/cppcanvas/Library_cppcanvas.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/cppcanvas/Library_cppcanvas.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/cppcanvas/Library_cppcanvas.mk
Sun Mar 13 18:28:29 2016
@@ -43,8 +43,7 @@ $(eval $(call gb_Library_set_include,cpp
$$(INCLUDE) \
))
-$(eval $(call gb_Library_set_defs,cppcanvas,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,cppcanvas,\
-DCPPCANVAS_DLLIMPLEMENTATION \
))
Modified:
openoffice/branches/gbuild-reintegration/main/drawinglayer/Library_drawinglayer.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/drawinglayer/Library_drawinglayer.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/drawinglayer/Library_drawinglayer.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/drawinglayer/Library_drawinglayer.mk
Sun Mar 13 18:28:29 2016
@@ -42,8 +42,7 @@ $(eval $(call gb_Library_add_api,drawing
offapi \
))
-$(eval $(call gb_Library_set_defs,drawinglayer,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,drawinglayer,\
-DDRAWINGLAYER_DLLIMPLEMENTATION \
))
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=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/editeng/Library_editeng.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/editeng/Library_editeng.mk
Sun Mar 13 18:28:29 2016
@@ -33,14 +33,12 @@ $(eval $(call gb_Library_set_include,edi
-I$(SRCDIR)/editeng/inc \
))
-$(eval $(call gb_Library_set_defs,editeng,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,editeng,\
-DEDITENG_DLLIMPLEMENTATION \
))
ifneq ($(strip $(EDITDEBUG)),)
-$(eval $(call gb_Library_set_defs,editeng,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,editeng,\
-DEDITDEBUG \
))
endif
Modified: openoffice/branches/gbuild-reintegration/main/formula/Library_for.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/formula/Library_for.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/formula/Library_for.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/formula/Library_for.mk Sun
Mar 13 18:28:29 2016
@@ -42,8 +42,7 @@ $(eval $(call gb_Library_add_api,for, \
offapi \
))
-$(eval $(call gb_Library_set_defs,for,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,for,\
-DFORMULA_DLLIMPLEMENTATION \
))
Modified: openoffice/branches/gbuild-reintegration/main/formula/Library_forui.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/formula/Library_forui.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/formula/Library_forui.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/formula/Library_forui.mk Sun
Mar 13 18:28:29 2016
@@ -40,8 +40,7 @@ $(eval $(call gb_Library_add_api,forui,
offapi \
))
-$(eval $(call gb_Library_set_defs,forui,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,forui,\
-DFORMULA_DLLIMPLEMENTATION \
))
Modified: openoffice/branches/gbuild-reintegration/main/framework/Library_fwe.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/Library_fwe.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/Library_fwe.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/framework/Library_fwe.mk Sun
Mar 13 18:28:29 2016
@@ -32,8 +32,7 @@ $(eval $(call gb_Library_set_include,fwe
-I$(OUTDIR)/inc/framework \
))
-$(eval $(call gb_Library_set_defs,fwe,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,fwe,\
-DFWE_DLLIMPLEMENTATION\
))
Modified: openoffice/branches/gbuild-reintegration/main/framework/Library_fwi.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/Library_fwi.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/Library_fwi.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/framework/Library_fwi.mk Sun
Mar 13 18:28:29 2016
@@ -25,8 +25,7 @@ $(eval $(call gb_Library_Library,fwi))
$(eval $(call gb_Library_add_package_headers,fwi,framework_inc))
-$(eval $(call gb_Library_set_defs,fwi,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,fwi,\
-DFWI_DLLIMPLEMENTATION \
))
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=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/linguistic/Library_lng.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/linguistic/Library_lng.mk Sun
Mar 13 18:28:29 2016
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
-
+
$(eval $(call gb_Library_Library,lng))
$(eval $(call gb_Library_add_package_headers,lng,linguistic_inc))
@@ -43,9 +43,8 @@ $(eval $(call gb_Library_set_include,lng
-I$(SRCDIR)/linguistic/inc \
-I$(SRCDIR)/linguistic/inc/pch \
))
-
-$(eval $(call gb_Library_set_defs,lng,\
- $$(DEFS) \
+
+$(eval $(call gb_Library_add_defs,lng,\
-DLNG_DLLIMPLEMENTATION \
))
Modified: openoffice/branches/gbuild-reintegration/main/oox/Library_oox.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/oox/Library_oox.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/oox/Library_oox.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/oox/Library_oox.mk Sun Mar 13
18:28:29 2016
@@ -45,8 +45,7 @@ $(eval $(call gb_Library_set_include,oox
$$(INCLUDE) \
))
-$(eval $(call gb_Library_set_defs,oox,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,oox,\
-DOOX_DLLIMPLEMENTATION \
))
Modified: openoffice/branches/gbuild-reintegration/main/padmin/Library_spa.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/padmin/Library_spa.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/padmin/Library_spa.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/padmin/Library_spa.mk Sun Mar
13 18:28:29 2016
@@ -28,8 +28,7 @@ $(eval $(call gb_Library_set_include,spa
-I$(OUTDIR)/inc/stl \
))
-$(eval $(call gb_Library_set_defs,spa,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,spa,\
-DSPA_DLLIMPLEMENTATION \
))
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=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sax/Library_expwrap.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/sax/Library_expwrap.mk Sun
Mar 13 18:28:29 2016
@@ -39,10 +39,6 @@ $(eval $(call gb_Library_set_include,exp
-I$(SRCDIR)/sax/inc \
))
-$(eval $(call gb_Library_set_defs,expwrap,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,expwrap,\
sal \
cppu \
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=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sax/Library_fastsax.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/sax/Library_fastsax.mk Sun
Mar 13 18:28:29 2016
@@ -39,10 +39,6 @@ $(eval $(call gb_Library_set_include,fas
-I$(SRCDIR)/sax/inc \
))
-$(eval $(call gb_Library_set_defs,fastsax,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,fastsax,\
sal \
cppu \
@@ -53,8 +49,7 @@ $(eval $(call gb_Library_add_linked_libs
))
ifeq ($(SYSTEM_ZLIB),YES)
-$(eval $(call gb_Library_set_defs,fastsax,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,fastsax,\
-DSYSTEM_ZLIB \
))
endif
Modified: openoffice/branches/gbuild-reintegration/main/sax/Library_sax.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sax/Library_sax.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sax/Library_sax.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sax/Library_sax.mk Sun Mar 13
18:28:29 2016
@@ -41,8 +41,7 @@ $(eval $(call gb_Library_set_include,sax
-I$(SRCDIR)/sax/inc \
))
-$(eval $(call gb_Library_set_defs,sax,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sax,\
-DSAX_DLLIMPLEMENTATION \
))
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=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sfx2/Library_qstart.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/sfx2/Library_qstart.mk Sun
Mar 13 18:28:29 2016
@@ -38,8 +38,7 @@ $(eval $(call gb_Library_add_api,qstart_
offapi \
))
-$(eval $(call gb_Library_set_defs,qstart_gtk,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,qstart_gtk,\
-DDLL_NAME=$(notdir $(call gb_Library_get_target,sfx2)) \
-DENABLE_QUICKSTART_APPLET \
))
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=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sfx2/Library_sfx.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sfx2/Library_sfx.mk Sun Mar
13 18:28:29 2016
@@ -50,8 +50,7 @@ $(eval $(call gb_Library_set_include,sfx
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_defs,sfx,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sfx,\
-DSFX2_DLLIMPLEMENTATION \
))
@@ -299,23 +298,13 @@ $(eval $(call gb_SdiTarget_set_include,s
))
ifeq ($(OS),$(filter WNT MACOSX,$(OS)))
-$(eval $(call gb_Library_set_defs,sfx,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sfx,\
-DENABLE_QUICKSTART_APPLET \
))
endif
ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
-$(eval $(call gb_Library_set_defs,sfx,\
- $$(DEFS) \
- -DENABLE_QUICKSTART_APPLET \
- -DENABLE_SYSTRAY_GTK \
-))
-endif
-
-ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
-$(eval $(call gb_Library_set_defs,sfx,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sfx,\
-DENABLE_QUICKSTART_APPLET \
-DENABLE_SYSTRAY_GTK \
))
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=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Helper.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Helper.mk Sun
Mar 13 18:28:29 2016
@@ -139,6 +139,12 @@ define gb_Helper_register_executables
ifeq ($$(filter $(1),$$(gb_Executable_VALIDGROUPS)),)
$$(eval $$(call gb_Output_error,$(1) is not a valid group for executables.
Valid groups are: $$(gb_Executable_VALIDGROUPS)))
endif
+$(foreach group,$(gb_Executable_VALIDGROUPS),\
+ $(foreach target,$(2),\
+ $(if $(filter $(target),$(gb_Executable_$(group))),\
+ $(call gb_Output_error,gb_Helper_register_executables: already registered:
$(target)))))
+$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\
+ $(call gb_Output_error,gb_Helper_register_executables: contains duplicates:
$(2)))
gb_Executable_$(1) += $(2)
@@ -148,6 +154,12 @@ define gb_Helper_register_libraries
ifeq ($$(filter $(1),$$(gb_Library_VALIDGROUPS)),)
$$(eval $$(call gb_Output_error,$(1) is not a valid group for libraries. Valid
groups are: $$(gb_Library_VALIDGROUPS)))
endif
+$(foreach group,$(gb_Library_VALIDGROUPS),\
+ $(foreach target,$(2),\
+ $(if $(filter $(target),$(gb_Library_$(group))),\
+ $(call gb_Output_error,gb_Helper_register_libraries: already registered:
$(target)))))
+$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\
+ $(call gb_Output_error,gb_Helper_register_libraries: contains duplicates:
$(2)))
gb_Library_$(1) += $(2)
@@ -157,6 +169,12 @@ define gb_Helper_register_static_librari
ifeq ($$(filter $(1),$$(gb_StaticLibrary_VALIDGROUPS)),)
$$(eval $$(call gb_Output_error,$(1) is not a valid group for static
libraries. Valid groups are: $$(gb_StaticLibrary_VALIDGROUPS)))
endif
+$(foreach group,$(gb_StaticLibrary_VALIDGROUPS),\
+ $(foreach target,$(2),\
+ $(if $(filter $(target),$(gb_StaticLibrary_$(group))),\
+ $(call gb_Output_error,gb_Helper_register_static_libraries: already
registered: $(target)))))
+$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\
+ $(call gb_Output_error,gb_Helper_register_static_libraries: contains
duplicates: $(2)))
gb_StaticLibrary_$(1) += $(2)
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JavaClassSet.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JavaClassSet.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JavaClassSet.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JavaClassSet.mk
Sun Mar 13 18:28:29 2016
@@ -74,13 +74,13 @@ endef
# build order dependency is a hack to get these prerequisites out of the way
in the build command
define gb_JavaClassSet_add_jar
$(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2))
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH :=
$$(CLASSPATH)$(gb_CLASSPATHSEP)$(2))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH :=
$$(CLASSPATH)$$(gb_CLASSPATHSEP)$(strip $(2)))
$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
endef
# this does not generate dependency on the jar
define gb_JavaClassSet_add_system_jar
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH :=
$$(CLASSPATH)$(gb_CLASSPATHSEP)$(2))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH :=
$$(CLASSPATH)$$(gb_CLASSPATHSEP)$(strip $(2)))
$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
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=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Library.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Library.mk Sun
Mar 13 18:28:29 2016
@@ -64,8 +64,7 @@ endef
define gb_Library__Library_impl
$(call gb_LinkTarget_LinkTarget,$(2))
$(call gb_LinkTarget_set_targettype,$(2),Library)
-$(call gb_LinkTarget_set_defs,$(2),\
- $$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(2),\
$(gb_Library_DEFS) \
)
$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
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=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/LinkTarget.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/LinkTarget.mk
Sun Mar 13 18:28:29 2016
@@ -420,6 +420,10 @@ endif
endef
define gb_LinkTarget_set_defs
+ifeq (,)
+$$(call gb_Output_error,\
+ gb_LinkTarget_set_defs: use gb_LinkTarget_add_defs instead.)
+else
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : DEFS := $(2)
$(call gb_LinkTarget_get_headers_target,$(1)) \
@@ -429,6 +433,7 @@ ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $(2)
endif
+endif
endef
@@ -441,10 +446,15 @@ endif
endef
define gb_LinkTarget_set_cflags
+ifeq (,)
+$$(call gb_Output_error,\
+ gb_LinkTarget_set_cflags: use gb_LinkTarget_add_cflags instead.)
+else
$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $(2)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS := $(2)
endif
+endif
endef
@@ -459,8 +469,11 @@ $(call gb_LinkTarget_get_dep_target,$(1)
endif
endef
-# maybe should deprecate this...
define gb_LinkTarget_set_cxxflags
+ifeq (,)
+$$(call gb_Output_error,\
+ gb_LinkTarget_set_cxxflags: use gb_LinkTarget_add_cxxflags instead.)
+else
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := $(2)
$(call gb_LinkTarget_get_headers_target,$(1)) \
@@ -469,6 +482,7 @@ ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS := $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $(2)
endif
+endif
endef
@@ -480,10 +494,15 @@ endif
endef
define gb_LinkTarget_set_objcxxflags
+ifeq (,)
+$$(call gb_Output_error,\
+ gb_LinkTarget_set_objcxxflags: use gb_LinkTarget_add_objcxxflags instead.)
+else
$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $(2)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS := $(2)
endif
+endif
endef
@@ -509,6 +528,7 @@ define gb_LinkTarget_add_ldflags
$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS += $(2)
endef
+# real use in RepositoryExternal.mk
define gb_LinkTarget_set_ldflags
$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $(2)
endef
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Output.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Output.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Output.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Output.mk Sun
Mar 13 18:28:29 2016
@@ -56,7 +56,7 @@ gb_Output_BELL := $(shell echo|awk 'BEGI
# - gb_COLOR is set
# - we have a known term
ifneq ($(strip $(gb_COLOR)),)
-ifneq ($(filter $(TERM),Eterm aterm gnome kterm linux rxvt rxvt-unicode screen
xterm xterm-color),)
+ifneq ($(filter $(TERM),Eterm aterm gnome kterm linux rxvt rxvt-unicode screen
xterm xterm-color xtermc),)
gb_Output_COLOR_RESET := $(gb_Output_ESCAPE)[0m
gb_Output_COLOR_RESETANDESCAPE := $(gb_Output_COLOR_RESET)$(gb_Output_ESCAPE)
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/StaticLibrary.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/StaticLibrary.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/StaticLibrary.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/StaticLibrary.mk
Sun Mar 13 18:28:29 2016
@@ -59,8 +59,7 @@ endef
define gb_StaticLibrary__StaticLibrary_impl
$(call gb_LinkTarget_LinkTarget,$(2))
$(call gb_LinkTarget_set_targettype,$(2),StaticLibrary)
-$(call gb_LinkTarget_set_defs,$(2),\
- $$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(2),\
$(gb_StaticLibrary_DEFS) \
)
$(call gb_StaticLibrary_get_target,$(1)) : $(call
gb_LinkTarget_get_target,$(2))
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/templates/Library.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/templates/Library.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/templates/Library.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/templates/Library.mk
Sun Mar 13 18:28:29 2016
@@ -45,9 +45,8 @@ $(eval $(call gb_Library_set_include,LIB
# add any additional definitions to be set for compilation here
# (e.g. -DLIB_DLLIMPLEMENTATION)
-$(eval $(call gb_Library_set_defs,LIB,\
- $$(DEFS) \
-))
+#$(eval $(call gb_Library_add_defs,LIB,\
+#))
# add libraries to be linked to LIB; again these names need to be given as
# specified in Repository.mk
Modified: openoffice/branches/gbuild-reintegration/main/sot/Library_sot.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sot/Library_sot.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sot/Library_sot.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sot/Library_sot.mk Sun Mar 13
18:28:29 2016
@@ -39,8 +39,7 @@ $(eval $(call gb_Library_add_api,sot,\
offapi \
))
-$(eval $(call gb_Library_set_defs,sot,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sot,\
-DSOT_DLLIMPLEMENTATION \
))
Modified: openoffice/branches/gbuild-reintegration/main/starmath/Library_sm.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/starmath/Library_sm.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/starmath/Library_sm.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/starmath/Library_sm.mk Sun
Mar 13 18:28:29 2016
@@ -46,10 +46,6 @@ $(eval $(call gb_Library_set_include,sm,
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_defs,sm,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,sm,\
comphelper \
cppu \
Modified: openoffice/branches/gbuild-reintegration/main/starmath/Library_smd.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/starmath/Library_smd.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/starmath/Library_smd.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/starmath/Library_smd.mk Sun
Mar 13 18:28:29 2016
@@ -42,10 +42,6 @@ $(eval $(call gb_Library_set_include,smd
-I$(SRCDIR)/starmath/inc/pch \
))
-$(eval $(call gb_Library_set_defs,smd,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,smd,\
cppu \
cppuhelper \
Modified: openoffice/branches/gbuild-reintegration/main/svgio/Library_svgio.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/svgio/Library_svgio.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/svgio/Library_svgio.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/svgio/Library_svgio.mk Sun
Mar 13 18:28:29 2016
@@ -39,8 +39,7 @@ $(eval $(call gb_Library_add_api,svgio,\
offapi \
))
-$(eval $(call gb_Library_set_defs,svgio,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,svgio,\
-DSVGIO_DLLIMPLEMENTATION \
))
Modified: openoffice/branches/gbuild-reintegration/main/svl/Library_svl.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/svl/Library_svl.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/svl/Library_svl.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/svl/Library_svl.mk Sun Mar 13
18:28:29 2016
@@ -40,8 +40,7 @@ $(eval $(call gb_Library_add_api,svl,\
offapi \
))
-$(eval $(call gb_Library_set_defs,svl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,svl,\
-DSVL_DLLIMPLEMENTATION \
))
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=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/svtools/Library_svt.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/svtools/Library_svt.mk Sun
Mar 13 18:28:29 2016
@@ -46,8 +46,7 @@ $(eval $(call gb_Library_set_include,svt
-I$(SRCDIR)/svtools/inc/pch \
))
-$(eval $(call gb_Library_set_defs,svt,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,svt,\
-DSVT_DLLIMPLEMENTATION \
))
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=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/svx/Library_svx.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/svx/Library_svx.mk Sun Mar 13
18:28:29 2016
@@ -37,8 +37,7 @@ $(eval $(call gb_Library_add_api,svx,\
offapi \
))
-$(eval $(call gb_Library_set_defs,svx,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,svx,\
-DSVX_DLLIMPLEMENTATION \
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
))
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=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/svx/Library_svxcore.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/svx/Library_svxcore.mk Sun
Mar 13 18:28:29 2016
@@ -51,8 +51,7 @@ $(eval $(call gb_Library_set_include,svx
#CFLAGS+= -DUNICODE -D_UNICODE
#.ENDIF
-$(eval $(call gb_Library_set_defs,svxcore,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,svxcore,\
-DSVX_DLLIMPLEMENTATION \
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
))
Modified:
openoffice/branches/gbuild-reintegration/main/svx/Library_textconversiondlgs.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/svx/Library_textconversiondlgs.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/svx/Library_textconversiondlgs.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/svx/Library_textconversiondlgs.mk
Sun Mar 13 18:28:29 2016
@@ -36,10 +36,6 @@ $(eval $(call gb_Library_add_api,textcon
offapi \
))
-$(eval $(call gb_Library_set_defs,textconversiondlgs,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
comphelper \
cppuhelper \
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=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sw/Library_msword.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/sw/Library_msword.mk Sun Mar
13 18:28:29 2016
@@ -42,10 +42,6 @@ $(eval $(call gb_Library_add_api,msword,
offapi \
))
-$(eval $(call gb_Library_set_defs,msword,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,msword,\
basegfx \
comphelper \
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=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sw/Library_sw.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sw/Library_sw.mk Sun Mar 13
18:28:29 2016
@@ -46,8 +46,7 @@ $(eval $(call gb_Library_add_api,sw,\
offapi \
))
-$(eval $(call gb_Library_set_defs,sw,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sw,\
-DSW_DLLIMPLEMENTATION \
))
Modified: openoffice/branches/gbuild-reintegration/main/sw/Library_swd.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sw/Library_swd.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sw/Library_swd.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sw/Library_swd.mk Sun Mar 13
18:28:29 2016
@@ -41,10 +41,6 @@ $(eval $(call gb_Library_add_api,swd,\
offapi \
))
-$(eval $(call gb_Library_set_defs,swd,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,swd,\
comphelper \
cppu \
Modified: openoffice/branches/gbuild-reintegration/main/sw/Library_swui.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sw/Library_swui.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sw/Library_swui.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sw/Library_swui.mk Sun Mar 13
18:28:29 2016
@@ -34,10 +34,6 @@ $(eval $(call gb_Library_set_include,swu
$$(INCLUDE) \
))
-$(eval $(call gb_Library_set_defs,swui,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_api,swui,\
udkapi \
offapi \
Modified: openoffice/branches/gbuild-reintegration/main/toolkit/Library_tk.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/toolkit/Library_tk.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/toolkit/Library_tk.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/toolkit/Library_tk.mk Sun Mar
13 18:28:29 2016
@@ -36,8 +36,7 @@ $(eval $(call gb_Library_set_include,oot
-I$(SRCDIR)/toolkit/source \
))
-$(eval $(call gb_Library_set_defs,ootk,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,ootk,\
-DTOOLKIT_DLLIMPLEMENTATION \
))
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=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/tools/Library_tl.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/tools/Library_tl.mk Sun Mar
13 18:28:29 2016
@@ -36,8 +36,7 @@ $(eval $(call gb_Library_set_include,tl,
-I$(OUTDIR)/inc/stl \
))
-$(eval $(call gb_Library_set_defs,tl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,tl,\
-DTOOLS_DLLIMPLEMENTATION \
-DVCL \
))
Modified:
openoffice/branches/gbuild-reintegration/main/ucbhelper/Library_ucbhelper.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/ucbhelper/Library_ucbhelper.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/ucbhelper/Library_ucbhelper.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/ucbhelper/Library_ucbhelper.mk
Sun Mar 13 18:28:29 2016
@@ -42,8 +42,7 @@ $(eval $(call gb_Library_set_include,ucb
-I$(SRCDIR)/ucbhelper/inc/pch \
))
-$(eval $(call gb_Library_set_defs,ucbhelper,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,ucbhelper,\
-DUCBHELPER_DLLIMPLEMENTATION \
))
Modified: openoffice/branches/gbuild-reintegration/main/unotools/Library_utl.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/unotools/Library_utl.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/unotools/Library_utl.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/unotools/Library_utl.mk Sun
Mar 13 18:28:29 2016
@@ -56,8 +56,7 @@ $(eval $(call gb_Library_set_include,utl
# add any additional definitions to be set for compilation here
# (e.g. -DLIB_DLLIMPLEMENTATION)
-$(eval $(call gb_Library_set_defs,utl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,utl,\
-DUNOTOOLS_DLLIMPLEMENTATION \
))
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=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/unoxml/Library_unordf.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/unoxml/Library_unordf.mk Sun
Mar 13 18:28:29 2016
@@ -29,10 +29,6 @@ $(eval $(call gb_Library_set_include,uno
$$(INCLUDE) \
))
-$(eval $(call gb_Library_set_defs,unordf,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_api,unordf,\
udkapi \
offapi \
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=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/unoxml/Library_unoxml.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/unoxml/Library_unoxml.mk Sun
Mar 13 18:28:29 2016
@@ -29,10 +29,6 @@ $(eval $(call gb_Library_set_include,uno
$$(INCLUDE) \
))
-$(eval $(call gb_Library_set_defs,unoxml,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_api,unoxml,\
udkapi \
offapi \
Modified:
openoffice/branches/gbuild-reintegration/main/vbahelper/Library_vbahelper.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vbahelper/Library_vbahelper.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/vbahelper/Library_vbahelper.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/vbahelper/Library_vbahelper.mk
Sun Mar 13 18:28:29 2016
@@ -37,8 +37,7 @@ $(eval $(call gb_Library_set_include,vba
$$(INCLUDE) \
))
-$(eval $(call gb_Library_set_defs,vbahelper,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vbahelper,\
-DVBAHELPER_DLLIMPLEMENTATION \
))
Modified:
openoffice/branches/gbuild-reintegration/main/vcl/Library_desktop_detector.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vcl/Library_desktop_detector.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/vcl/Library_desktop_detector.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/vcl/Library_desktop_detector.mk
Sun Mar 13 18:28:29 2016
@@ -41,8 +41,7 @@ $(eval $(call gb_Library_set_include,des
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_defs,desktop_detector,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,desktop_detector,\
-DDESKTOP_DETECTOR_IMPLEMENTATION \
))
Modified: openoffice/branches/gbuild-reintegration/main/vcl/Library_vcl.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vcl/Library_vcl.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/vcl/Library_vcl.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/vcl/Library_vcl.mk Sun Mar 13
18:28:29 2016
@@ -61,8 +61,7 @@ $(eval $(call gb_Library_set_include,vcl
))
endif
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
-DVCL_DLLIMPLEMENTATION \
-DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,cui)\" \
-DDLLPOSTFIX=$(subst $(or
$(gb_Library_DLLEXT),$(gb_Library_PLAINEXT)),,$(gb_Library_OOOEXT)) \
@@ -111,8 +110,7 @@ $(eval $(call gb_Library_add_cxxflags,vc
$(gb_OBJCXXFLAGS) \
))
ifeq ($(ENABLE_CAIRO),TRUE)
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
-DCAIRO \
))
endif
@@ -186,22 +184,19 @@ $(eval $(call gb_Library_add_exception_o
endif
ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
-DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
-DSAL_DLLPOSTFIX=\"\" \
-D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
))
## handle fontconfig
ifeq ($(ENABLE_FONTCONFIG),TRUE)
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
-DENABLE_FONTCONFIG \
))
## handle CUPS
ifeq ($(ENABLE_CUPS),TRUE)
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
-DENABLE_CUPS \
))
endif
@@ -456,8 +451,7 @@ $(eval $(call gb_Library_add_exception_o
## handle Graphite
ifeq ($(ENABLE_GRAPHITE),TRUE)
# add defines, graphite sources for all platforms
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
-DENABLE_GRAPHITE \
))
$(eval $(call gb_Library_add_exception_objects,vcl,\
Modified:
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gen.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gen.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gen.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gen.mk
Sun Mar 13 18:28:29 2016
@@ -115,8 +115,7 @@ $(eval $(call gb_Library_add_exception_o
vcl/unx/generic/window/salobj \
))
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
-D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
-DVCLPLUG_GEN_IMPLEMENTATION \
))
@@ -124,8 +123,7 @@ $(eval $(call gb_Library_set_defs,vclplu
## handle RandR
ifeq ($(ENABLE_RANDR),TRUE)
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
-DUSE_RANDR \
))
ifeq ($(XRANDR_DLOPEN),FALSE)
@@ -136,8 +134,7 @@ $(eval $(call gb_Library_add_libs,vclplu
$(XRANDR_LIBS) \
))
else
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
-DXRANDR_DLOPEN \
))
endif
@@ -147,8 +144,7 @@ endif
ifneq ($(USE_XINERAMA),NO)
ifneq ($(OS),SOLARIS)
# not Solaris
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
-DUSE_XINERAMA \
-DUSE_XINERAMA_XORG \
))
@@ -163,8 +159,7 @@ $(eval $(call gb_Library_add_libs,vclplu
endif
else
# Solaris
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
-DUSE_XINERAMA \
-DUSE_XINERAMA_XSUN \
))
@@ -185,8 +180,7 @@ endif
## handle Render linking
ifeq ($(XRENDER_LINK),YES)
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
-DXRENDER_LINK \
))
$(eval $(call gb_Library_add_libs,vclplug_gen,\
Modified:
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gtk.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gtk.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gtk.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_gtk.mk
Sun Mar 13 18:28:29 2016
@@ -42,8 +42,7 @@ $(eval $(call gb_Library_set_include,vcl
$$(GTK_CFLAGS) \
))
-$(eval $(call gb_Library_set_defs,vclplug_gtk,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gtk,\
-DVCLPLUG_GTK_IMPLEMENTATION \
-DVERSION=\"$(UPD)$(LAST_MINOR)\" \
))
@@ -53,8 +52,7 @@ $(eval $(call gb_Library_set_include,vcl
$$(INCLUDE) \
$(shell pkg-config --cflags-only-I dbus-glib-1) \
))
-$(eval $(call gb_Library_set_defs,vclplug_gtk,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gtk,\
-DENABLE_DBUS \
))
$(eval $(call gb_Library_add_libs,vclplug_gtk,\
Modified:
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde.mk
Sun Mar 13 18:28:29 2016
@@ -42,8 +42,7 @@ $(eval $(call gb_Library_set_include,vcl
$$(KDE_CFLAGS) \
))
-$(eval $(call gb_Library_set_defs,vclplug_kde,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_kde,\
-DVCLPLUG_KDE_IMPLEMENTATION \
))
Modified:
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde4.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde4.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde4.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_kde4.mk
Sun Mar 13 18:28:29 2016
@@ -42,8 +42,7 @@ $(eval $(call gb_Library_set_include,vcl
$$(KDE4_CFLAGS) \
))
-$(eval $(call gb_Library_set_defs,vclplug_kde4,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_kde4,\
-DVCLPLUG_KDE4_IMPLEMENTATION \
))
Modified:
openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_svp.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_svp.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_svp.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_svp.mk
Sun Mar 13 18:28:29 2016
@@ -37,8 +37,7 @@ $(eval $(call gb_Library_set_include,vcl
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_defs,vclplug_svp,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_svp,\
-DVCLPLUG_SVP_IMPLEMENTATION \
))
Modified:
openoffice/branches/gbuild-reintegration/main/vcl/StaticLibrary_vclmain.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vcl/StaticLibrary_vclmain.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/vcl/StaticLibrary_vclmain.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/vcl/StaticLibrary_vclmain.mk
Sun Mar 13 18:28:29 2016
@@ -54,6 +54,7 @@ $(OUTDIR)/lib/$(1) : $(call gb_CxxObject
endef
ifeq ($(OS),WNT)
+$(eval $(call gb_StaticLibrary_add_defs,vclmain,-D_DLL))
$(eval $(call StaticLibrary_salmain_hack,salmain.obj))
else
$(eval $(call StaticLibrary_salmain_hack,salmain.o))
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/Library_writerfilter.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/Library_writerfilter.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/Library_writerfilter.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/Library_writerfilter.mk
Sun Mar 13 18:28:29 2016
@@ -51,8 +51,7 @@ $(eval $(call gb_Library_set_include,wri
-I$(SRCDIR)/writerfilter/source/ooxml \
))
-$(eval $(call gb_Library_set_defs,writerfilter,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,writerfilter,\
-DWRITERFILTER_DLLIMPLEMENTATION \
))
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/Library_writerfilter_debug.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/Library_writerfilter_debug.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/Library_writerfilter_debug.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/Library_writerfilter_debug.mk
Sun Mar 13 18:28:29 2016
@@ -37,10 +37,6 @@ $(eval $(call gb_Library_set_include,wri
-I$(SRCDIR)/writerfilter/inc \
))
-$(eval $(call gb_Library_set_defs,writerfilter_debug,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,writerfilter_debug,\
writerfilter \
comphelper \
Modified: openoffice/branches/gbuild-reintegration/main/xmloff/Library_xo.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmloff/Library_xo.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/xmloff/Library_xo.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/xmloff/Library_xo.mk Sun Mar
13 18:28:29 2016
@@ -37,8 +37,7 @@ $(eval $(call gb_Library_set_include,xo,
-I$(SRCDIR)/xmloff/inc/pch \
))
-$(eval $(call gb_Library_set_defs,xo,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,xo,\
-DXMLOFF_DLLIMPLEMENTATION \
))
Modified:
openoffice/branches/gbuild-reintegration/main/xmlreader/Library_xmlreader.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlreader/Library_xmlreader.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/xmlreader/Library_xmlreader.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/xmlreader/Library_xmlreader.mk
Sun Mar 13 18:28:29 2016
@@ -33,8 +33,7 @@ $(eval $(call gb_Library_add_api,xmlread
udkapi \
))
-$(eval $(call gb_Library_set_defs,xmlreader,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,xmlreader,\
-DOOO_DLLIMPLEMENTATION_XMLREADER \
))
Modified: openoffice/branches/gbuild-reintegration/main/xmlscript/Library_xcr.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlscript/Library_xcr.mk?rev=1734836&r1=1734835&r2=1734836&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/xmlscript/Library_xcr.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/xmlscript/Library_xcr.mk Sun
Mar 13 18:28:29 2016
@@ -43,8 +43,7 @@ $(eval $(call gb_Library_set_include,xcr
$$(INCLUDE) \
))
-$(eval $(call gb_Library_set_defs,xcr,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,xcr,\
-DXCR_DLLIMPLEMENTATION \
))
