Author: damjan
Date: Sun Mar 13 10:17:08 2016
New Revision: 1734775
URL: http://svn.apache.org/viewvc?rev=1734775&view=rev
Log:
Merge from branches/gbuild:
* r1409556: gnumake4: #i116959#: rename target local variables
{C,CXX,OBJCXX}FLAGS: add a T_ prefix, so we don't need to use override.
* r1409557: gnumake4: #i116959#: user defined LDFLAGS:
rename target local variable LDFLAGS.
* r1409558: gnumake4: #i116959#: user defined CPPFLAGS: put them in target
local DEFS.
* r1409560: gnumake4: Jar.mk: move CLASSPATH stuff to JavaClassSet, and add
system/external
* r1409561: gnumake4: adapt makefiles
* r1409563: gnumake4: vcl: adapt makefiles to gnumake4 changes
Also ported changes to FreeBSD and OS/2, and deleted usage of
gb_GoogleTest_set_ldflags from main/*/GoogleTest_*.mk makefiles
which was necessary to get it to build.
BUILDS
Build updates by: me
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/ext_libraries/serf/win/Library_serf.mk
openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk
openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_string.mk
openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_weakbag.mk
openoffice/branches/gbuild-reintegration/main/framework/Library_fwe.mk
openoffice/branches/gbuild-reintegration/main/idl/Executable_svidl.mk
openoffice/branches/gbuild-reintegration/main/padmin/Executable_spadmin.bin.mk
openoffice/branches/gbuild-reintegration/main/sfx2/GoogleTest_sfx2_metadatable.mk
openoffice/branches/gbuild-reintegration/main/sfx2/Library_qstart.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/Jar.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/StaticLibrary.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/solenv/gbuild/templates/Executable.mk
openoffice/branches/gbuild-reintegration/main/svl/GoogleTest_svl_urihelper.mk
openoffice/branches/gbuild-reintegration/main/sw/GoogleTest_sw_bigpointerarray.mk
openoffice/branches/gbuild-reintegration/main/sw/Library_vbaswobj.mk
openoffice/branches/gbuild-reintegration/main/toolkit/Library_tk.mk
openoffice/branches/gbuild-reintegration/main/tools/Executable_mkunroll.mk
openoffice/branches/gbuild-reintegration/main/tools/Executable_rscdep.mk
openoffice/branches/gbuild-reintegration/main/tools/Executable_so_checksum.mk
openoffice/branches/gbuild-reintegration/main/tools/Executable_sspretty.mk
openoffice/branches/gbuild-reintegration/main/tools/GoogleTest_tools_fractiontest.mk
openoffice/branches/gbuild-reintegration/main/tools/Library_tl.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
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 13 10:17:08 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409555
+/incubator/ooo/branches/gbuild:1409313-1409563
/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/serf/win/Library_serf.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/ext_libraries/serf/win/Library_serf.mk?rev=1734775&r1=1734774&r2=1734775&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 10:17:08 2016
@@ -44,8 +44,7 @@ $(FIXED_DEF_FILE) : $(ORIGINAL_DEF_FILE)
cp $< $@
echo serf_bucket_request_set_CL >> $@
-$(eval $(call gb_Library_set_ldflags,serf,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,serf,\
-DEF:$(FIXED_DEF_FILE) \
))
Modified: openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk?rev=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk Sun Mar
13 10:17:08 2016
@@ -66,12 +66,12 @@ ifeq ($(SYSTEM_JPEG),YES)
define gb_LinkTarget__use_jpeg
$(call gb_LinkTarget_add_libs,$(1),-ljpeg)
$(call gb_LinkTarget_set_ldflags,$(1),\
- $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
+ $$(filter-out -L/usr/lib/jvm%,$$(T_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)) \
+ $$(filter-out -L$$(JAVA_HOME)/jre/lib/%,$$(T_LDFLAGS)) \
)
endif
endef
Modified:
openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_string.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_string.mk?rev=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_string.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_string.mk
Sun Mar 13 10:17:08 2016
@@ -47,8 +47,4 @@ $(eval $(call gb_GoogleTest_add_api,comp
udkapi \
))
-$(eval $(call gb_GoogleTest_set_ldflags,comphelper_string,\
- $$(LDFLAGS) \
-))
-
# vim: set noet sw=4 ts=4:
Modified:
openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_weakbag.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_weakbag.mk?rev=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_weakbag.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_weakbag.mk
Sun Mar 13 10:17:08 2016
@@ -46,8 +46,4 @@ $(eval $(call gb_GoogleTest_add_api,comp
udkapi \
))
-$(eval $(call gb_GoogleTest_set_ldflags,comphelper_weakbag,\
- $$(LDFLAGS) \
-))
-
# vim: set noet sw=4 ts=4:
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=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/Library_fwe.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/framework/Library_fwe.mk Sun
Mar 13 10:17:08 2016
@@ -93,12 +93,4 @@ $(eval $(call gb_Library_add_exception_o
framework/source/fwe/xml/xmlnamespaces \
))
-#todo: ImageListDescriptor can't be exported completely without exporting
everything
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out
-fvisibility=hidden,$$(CXXFLAGS))))
-endif
-ifeq ($(OS),FREEBSD)
-$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out
-fvisibility=hidden,$$(CXXFLAGS))))
-endif
-
# vim: set noet sw=4 ts=4:
Modified: openoffice/branches/gbuild-reintegration/main/idl/Executable_svidl.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/idl/Executable_svidl.mk?rev=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/idl/Executable_svidl.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/idl/Executable_svidl.mk Sun
Mar 13 10:17:08 2016
@@ -39,8 +39,7 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/idl/inc \
))
-$(eval $(call gb_Executable_set_cxxflags,svidl,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,svidl,\
-DIDL_COMPILER \
))
Modified:
openoffice/branches/gbuild-reintegration/main/padmin/Executable_spadmin.bin.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/padmin/Executable_spadmin.bin.mk?rev=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/padmin/Executable_spadmin.bin.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/padmin/Executable_spadmin.bin.mk
Sun Mar 13 10:17:08 2016
@@ -28,10 +28,6 @@ $(eval $(call gb_Executable_set_include,
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Executable_set_cxxflags,spadmin.bin,\
- $$(CXXFLAGS) \
-))
-
$(eval $(call gb_Executable_add_linked_static_libs,spadmin.bin,\
vclmain \
))
Modified:
openoffice/branches/gbuild-reintegration/main/sfx2/GoogleTest_sfx2_metadatable.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sfx2/GoogleTest_sfx2_metadatable.mk?rev=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/sfx2/GoogleTest_sfx2_metadatable.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/sfx2/GoogleTest_sfx2_metadatable.mk
Sun Mar 13 10:17:08 2016
@@ -39,8 +39,4 @@ $(eval $(call gb_GoogleTest_add_linked_l
$(gb_STDLIBS) \
))
-$(eval $(call gb_GoogleTest_set_ldflags,sfx2_metadatable,\
- $$(LDFLAGS) \
-))
-
# vim: set noet sw=4 ts=4:
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=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sfx2/Library_qstart.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/sfx2/Library_qstart.mk Sun
Mar 13 10:17:08 2016
@@ -44,17 +44,15 @@ $(eval $(call gb_Library_set_defs,qstart
-DENABLE_QUICKSTART_APPLET \
))
-$(eval $(call gb_Library_set_cflags,qstart_gtk,\
- $$(CFLAGS) \
+$(eval $(call gb_Library_add_cflags,qstart_gtk,\
$(filter-out -I%,$(GTK_CFLAGS)) \
))
-$(eval $(call gb_Library_set_ldflags,qstart_gtk,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,qstart_gtk,\
))
-$(eval $(call gb_Library_add_external_libs,qstart_gtk, \
- $(patsubst -l%,%, $(filter -l%, $(GTK_LIBS))) \
+$(eval $(call gb_Library_add_libs,qstart_gtk,\
+ $(GTK_LIBS) \
))
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=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Executable.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Executable.mk
Sun Mar 13 10:17:08 2016
@@ -68,12 +68,18 @@ $(eval $(foreach method,\
add_exception_objects \
add_noexception_objects \
add_generated_exception_objects \
+ add_cflags \
set_cflags \
+ add_cxxflags \
set_cxxflags \
+ add_objcxxflags \
set_objcxxflags \
+ add_defs \
set_defs \
set_include \
+ add_ldflags \
set_ldflags \
+ add_libs \
set_library_path_flags \
add_api \
add_linked_libs \
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=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/GoogleTest.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/GoogleTest.mk
Sun Mar 13 10:17:08 2016
@@ -77,12 +77,18 @@ $(eval $(foreach method,\
add_objcxxobjects \
add_exception_objects \
add_noexception_objects \
+ add_cflags \
set_cflags \
+ add_cxxflags \
set_cxxflags \
+ add_objcxxflags \
set_objcxxflags \
+ add_defs \
set_defs \
set_include \
+ add_ldflags \
set_ldflags \
+ add_libs \
set_library_path_flags \
add_api \
add_linked_libs \
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Jar.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Jar.mk?rev=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Jar.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Jar.mk Sun Mar
13 10:17:08 2016
@@ -71,11 +71,11 @@ $(call gb_Jar_get_target,%) : $(call gb_
# adds jar files to DeliverLogTarget
# adds dependency for outdir target to workdir target (pattern rule for
delivery is in Package.mk)
define gb_Jar_Jar
-$(call gb_Jar_get_target,$(1)) : CLASSPATH := $(value XCLASSPATH)
$(call gb_Jar_get_target,$(1)) : MANIFEST :=
$(call gb_Jar_get_target,$(1)) : JARCLASSPATH :=
$(call gb_Jar_get_target,$(1)) : PACKAGEROOTS :=
$(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)),$(2))
+$(call gb_JavaClassSet_set_classpath,$(call
gb_Jar_get_classsetname,$(1)),$(value XCLASSPATH))
$(eval $(call gb_Module_register_target,$(call
gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_clean_target,$(1))))
$(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call
gb_Jar_get_target,$(1)),$(1))
$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1))
@@ -96,9 +96,8 @@ define gb_Jar_add_sourcefiles
$(foreach sourcefile,$(2),$(call gb_Jar_add_sourcefile,$(1),$(sourcefile)))
endef
-# don't forward it to ClassSet; the ClassSet "inherits" the classpath from the
Jar
define gb_JarTest_set_classpath
-$(call gb_Jar_get_target,$(1)) : CLASSPATH := $(2)
+$(call gb_JavaClassSet_set_classpath,$(call gb_Jar_get_classsetname,$(1)),$(2))
endef
# JARCLASSPATH is the class path that is written to the manifest of the jar
@@ -118,14 +117,28 @@ endef
# remember: classpath is "inherited" to ClassSet
define gb_Jar_add_jar
-$(call gb_Jar_get_target,$(1)) : CLASSPATH :=
$$(CLASSPATH)$(gb_CLASSPATHSEP)$(2)
$(call gb_JavaClassSet_add_jar,$(call gb_Jar_get_classsetname,$(1)),$(2))
+endef
+define gb_Jar_add_system_jar
+$(call gb_JavaClassSet_add_system_jar,$(call
gb_Jar_get_classsetname,$(1)),$(2))
endef
# specify jars with imported modules
define gb_Jar_add_jars
-$(foreach jar,$(2),$(call gb_Jar_add_jar,$(1),$(jar)))
+$(call gb_JavaClassSet_add_jars,$(call gb_Jar_get_classsetname,$(1)),$(2))
+endef
+
+define gb_Jar_add_system_jars
+$(call gb_JavaClassSet_add_system_jars,$(call
gb_Jar_get_classsetname,$(1)),$(2))
+endef
+
+define gb_Jar_use_external
+$(call gb_JavaClassSet_use_external,$(call gb_Jar_get_classsetname,$(1)),$(2))
+endef
+
+define gb_Jar_use_externals
+$(call gb_JavaClassSet_use_externals,$(call gb_Jar_get_classsetname,$(1)),$(2))
endef
# possible directories for jar files containing UNO services
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=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JavaClassSet.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JavaClassSet.mk
Sun Mar 13 10:17:08 2016
@@ -67,15 +67,41 @@ $(foreach sourcefile,$(2),$(call gb_Java
endef
define gb_JavaClassSet_set_classpath
-$(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $(2)
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $(2))
endef
# problem: currently we can't get these dependencies to work
# 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)) : 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)) : JARDEPS += $(2))
+endef
+
+define gb_JavaClassSet_add_jars
+$(foreach jar,$(2),$(call gb_JavaClassSet_add_jar,$(1),$(jar)))
+endef
+
+define gb_JavaClassSet_add_system_jars
+$(foreach jar,$(2),$(call gb_JavaClassSet_add_system_jar,$(1),$(jar)))
+endef
+
+# this forwards to functions that must be defined in RepositoryExternal.mk.
+# $(call gb_LinkTarget_use_external,library,external)
+define gb_JavaClassSet_use_external
+$(eval $(if $(value gb_JavaClassSet__use_$(2)),\
+ $(call gb_JavaClassSet__use_$(2),$(1)),\
+ $(error gb_JavaClassSet_use_external: unknown external: $(2))))
+endef
+define gb_JavaClassSet_use_externals
+$(foreach external,$(2),$(call gb_JavaClassSet_use_external,$(1),$(external)))
endef
# vim: set noet sw=4 ts=4:
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=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Library.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Library.mk Sun
Mar 13 10:17:08 2016
@@ -111,12 +111,18 @@ $(eval $(foreach method,\
add_exception_objects \
add_noexception_objects \
add_generated_exception_objects \
+ add_cflags \
set_cflags \
+ add_cxxflags \
set_cxxflags \
+ add_objcxxflags \
set_objcxxflags \
+ add_defs \
set_defs \
set_include \
+ add_ldflags \
set_ldflags \
+ add_libs \
set_library_path_flags \
add_api \
add_linked_libs \
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=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/LinkTarget.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/LinkTarget.mk
Sun Mar 13 10:17:08 2016
@@ -21,6 +21,13 @@
+#the following user-defined variables are supported:
+# CPPFLAGS
+# CFLAGS
+# CXXFLAGS
+# OBJCXXFLAGS
+# LDFLAGS
+
# CFLAGS from environment override debug/optimization flags
ifeq ($(gb_DEBUGLEVEL),2)
CFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
@@ -94,8 +101,8 @@ gb_CxxObject__command_dep =
endif
# Only enable PCH if the PCH_CXXFLAGS and the PCH_DEFS (from the linktarget)
-# are the same as the CXXFLAGS and DEFS we want to use for this object. This
-# should usually be the case. The DEFS/CXXFLAGS would have too be manually
+# are the same as the T_CXXFLAGS and DEFS we want to use for this object. This
+# should usually be the case. The DEFS/T_CXXFLAGS would have too be manually
# overridden for one object file for them to differ. PCH_CXXFLAGS/PCH_DEFS
# should never be overridden on an object -- they should be the same as for the
# whole linktarget. In general it should be cleaner to use a static library
@@ -104,16 +111,16 @@ endif
define gb_CxxObject__set_pchflags
ifeq ($(gb_ENABLE_PCH),$(true))
ifneq ($(strip $$(PCH_NAME)),)
-ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS)
$$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(CXXFLAGS) $$(DEFS)))
+ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS)
$$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS)))
$$@ : PCHFLAGS := $$(call gb_PrecompiledHeader_get_enableflags,$$(PCH_NAME))
else
-ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS)
$$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(CXXFLAGS) $$(DEFS)))
+ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS)
$$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS)))
$$@ : PCHFLAGS := $$(call
gb_NoexPrecompiledHeader_get_enableflags,$$(PCH_NAME))
else
$$(info No precompiled header available for $$*.)
$$(info precompiled header flags ( ex) : $$(sort $$(PCH_CXXFLAGS)
$$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)))
$$(info precompiled header flags (noex) : $$(sort $$(PCH_CXXFLAGS)
$$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)))
-$$(info . object flags : $$(sort $$(CXXFLAGS) $$(DEFS)))
+$$(info . object flags : $$(sort $$(T_CXXFLAGS) $$(DEFS)))
$$@ : PCHFLAGS :=
endif
endif
@@ -221,9 +228,6 @@ gb_ObjCxxObject_ObjCxxObject =
# LinkTarget class
-# need an alias for global CXXFLAGS in gb_LinkTarget_add_exception_object etc.
-gb_CXXFLAGS_TOO := $(CXXFLAGS)
-
gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
# defined by platform
# gb_LinkTarget_CXXFLAGS
@@ -337,12 +341,9 @@ $(call gb_LinkTarget_get_headers_target,
# linktarget. This for example means that you cannot build a single object
# alone, because then you would directly depend on the object.
#
-# A note about flags: here the global variable CFLAGS is overridden by a target
-# local variable of the same name. The $(CFLAGS) on the rhs refers to the
-# global variable. (same thing for OBJCXXFLAGS)
-# CXXFLAGS is slightly different, because it is not set at the link target,
-# but only when using gb_LinkTarget_add_{no,}exception_object etc., to
-# provide a mechanism that disables optimization for a specific file.
+# A note about flags: because the overriding the global variables with a target
+# local variable of the same name is considered obscure, the target local
+# variables have a T_ prefix.
define gb_LinkTarget_LinkTarget
$(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS :=
$(call gb_LinkTarget_get_external_headers_target,$(1)) : SELF := $(1)
@@ -356,21 +357,21 @@ $(call gb_LinkTarget_get_target,$(1)) :
$(call gb_LinkTarget_get_clean_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS :=
$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : override CFLAGS :=
$$(gb_LinkTarget_CFLAGS) $(CFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS)
$(CFLAGS)
$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : override CXXFLAGS :=
$$(gb_LinkTarget_CXXFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS :=
$$(gb_LinkTarget_CXXFLAGS)
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS :=
$$(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
-$(call gb_LinkTarget_get_target,$(1)) : override OBJCXXFLAGS :=
$$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS :=
$$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS)
$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS)
+$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS)
$(CPPFLAGS)
$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS :=
$$(gb_LinkTarget_DEFAULTDEFS)
+$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS :=
$$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS)
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE)
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : INCLUDE_STL :=
$$(gb_LinkTarget_INCLUDE_STL)
-$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $$(gb_LinkTarget_LDFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $$(gb_LinkTarget_LDFLAGS)
$(LDFLAGS)
$(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 :=
@@ -393,12 +394,12 @@ $(call gb_LinkTarget_get_dep_target,$(1)
$(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS :=
$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS :=
$(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS :=
-$(call gb_LinkTarget_get_dep_target,$(1)) : override CFLAGS :=
$$(gb_LinkTarget_CFLAGS) $(CFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : override CXXFLAGS :=
$$(gb_LinkTarget_CXXFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS :=
$$(gb_LinkTarget_CFLAGS) $(CFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS :=
$$(gb_LinkTarget_CXXFLAGS)
$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS :=
$$(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : override OBJCXXFLAGS :=
$$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS :=
$$(gb_LinkTarget_DEFAULTDEFS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS :=
$$(gb_LinkTarget_DEFAULTDEFS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS :=
$$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS :=
$$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS :=
$$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS)
$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE :=
$$(gb_LinkTarget_INCLUDE)
$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL :=
$$(gb_LinkTarget_INCLUDE_STL)
$(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE :=
@@ -407,6 +408,17 @@ endif
endef
+define gb_LinkTarget_add_defs
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : DEFS += $(2)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS += $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS += $(2)
+endif
+endef
+
define gb_LinkTarget_set_defs
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : DEFS := $(2)
@@ -420,30 +432,57 @@ endif
endef
+define gb_LinkTarget_add_cflags
+$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS += $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS += $(2)
+endif
+
+endef
+
define gb_LinkTarget_set_cflags
-$(call gb_LinkTarget_get_target,$(1)) : override CFLAGS := $(2)
+$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $(2)
ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : override CFLAGS := $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS := $(2)
endif
endef
+define gb_LinkTarget_add_cxxflags
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS += $(2)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS += $(2)
+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
+endef
+
+# maybe should deprecate this...
define gb_LinkTarget_set_cxxflags
$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : override CXXFLAGS := $(2)
+$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := $(2)
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $(2)
ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : override CXXFLAGS := $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS := $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $(2)
endif
endef
+define gb_LinkTarget_add_objcxxflags
+$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS += $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS += $(2)
+endif
+endef
+
define gb_LinkTarget_set_objcxxflags
-$(call gb_LinkTarget_get_target,$(1)) : override OBJCXXFLAGS := $(2)
+$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $(2)
ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : override OBJCXXFLAGS := $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS := $(2)
endif
endef
@@ -466,8 +505,12 @@ endif
endef
+define gb_LinkTarget_add_ldflags
+$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS += $(2)
+endef
+
define gb_LinkTarget_set_ldflags
-$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $(2)
+$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $(2)
endef
define gb_LinkTarget_add_api
@@ -553,7 +596,7 @@ $(call gb_LinkTarget_get_clean_target,$(
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_CObject_get_target,$(2))
$(call gb_CObject_get_target,$(2)) : | $(call
gb_LinkTarget_get_headers_target,$(1))
-$(call gb_CObject_get_target,$(2)) : override CFLAGS += $(3)
+$(call gb_CObject_get_target,$(2)) : T_CFLAGS += $(3)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS += $(2)
@@ -568,7 +611,7 @@ $(call gb_LinkTarget_get_clean_target,$(
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_CxxObject_get_target,$(2))
$(call gb_CxxObject_get_target,$(2)) : | $(call
gb_LinkTarget_get_headers_target,$(1))
-$(call gb_CxxObject_get_target,$(2)) : override CXXFLAGS += $(3)
+$(call gb_CxxObject_get_target,$(2)) : T_CXXFLAGS += $(3)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS += $(2)
@@ -583,7 +626,7 @@ $(call gb_LinkTarget_get_clean_target,$(
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_ObjCxxObject_get_target,$(2))
$(call gb_ObjCxxObject_get_target,$(2)) : | $(call
gb_LinkTarget_get_headers_target,$(1))
-$(call gb_ObjCxxObject_get_target,$(2)) : override OBJCXXFLAGS += $(3)
+$(call gb_ObjCxxObject_get_target,$(2)) : T_OBJCXXFLAGS += $(3)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS += $(2)
@@ -598,7 +641,7 @@ $(call gb_LinkTarget_get_clean_target,$(
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCxxObject_get_target,$(2))
$(call gb_GenCxxObject_get_source,$(2)) : | $(call
gb_LinkTarget_get_headers_target,$(1))
-$(call gb_GenCxxObject_get_target,$(2)) : override CXXFLAGS += $(3)
$(gb_CXXFLAGS_TOO)
+$(call gb_GenCxxObject_get_target,$(2)) : T_CXXFLAGS += $(3) $(CXXFLAGS)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS += $(2)
@@ -608,11 +651,11 @@ endif
endef
define gb_LinkTarget_add_noexception_object
-$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_NOEXCEPTIONFLAGS)
$(gb_CXXFLAGS_TOO))
+$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_NOEXCEPTIONFLAGS)
$(CXXFLAGS))
endef
define gb_LinkTarget_add_exception_object
-$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS)
$(gb_CXXFLAGS_TOO))
+$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS)
$(CXXFLAGS))
endef
define gb_LinkTarget_add_cobjects
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=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/StaticLibrary.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/StaticLibrary.mk
Sun Mar 13 10:17:08 2016
@@ -86,12 +86,18 @@ $(eval $(foreach method,\
add_exception_objects \
add_noexception_objects \
add_generated_exception_objects \
+ add_cflags \
set_cflags \
+ add_cxxflags \
set_cxxflags \
+ add_objcxxflags \
set_objcxxflags \
+ add_defs \
set_defs \
set_include \
+ add_ldflags \
set_ldflags \
+ add_libs \
set_library_path_flags \
add_api \
add_linked_libs \
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=1734775&r1=1734774&r2=1734775&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 10:17:08 2016
@@ -171,7 +171,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
$(gb_CC) \
- $(DEFS) $(CFLAGS) \
+ $(DEFS) \
+ $(T_CFLAGS) \
-c $(3) \
-o $(1) \
-MMD -MT $(call gb_CObject_get_target,$(2)) \
@@ -195,7 +196,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
$(gb_CXX) \
- $(DEFS) $(CXXFLAGS) \
+ $(DEFS) \
+ $(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
-MMD -MT $(call gb_CxxObject_get_target,$(2)) \
@@ -242,7 +244,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_CXX) \
$(if $(filter
Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
- $(subst \d,$$,$(RPATH)) $(LDFLAGS) \
+ $(subst \d,$$,$(RPATH)) \
+ $(T_LDFLAGS) \
$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_filename,$(lib)))) \
$(patsubst %,-l%,$(EXTERNAL_LIBS)) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
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=1734775&r1=1734774&r2=1734775&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 10:17:08 2016
@@ -166,7 +166,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
$(gb_CC) \
- $(DEFS) $(CFLAGS) \
+ $(DEFS) \
+ $(T_CFLAGS) \
-c $(3) \
-o $(1) \
-MMD -MT $(call gb_CObject_get_target,$(2)) \
@@ -190,7 +191,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
$(gb_CXX) \
- $(DEFS) $(CXXFLAGS) \
+ $(DEFS) \
+ $(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
-MMD -MT $(call gb_CxxObject_get_target,$(2)) \
@@ -226,7 +228,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_CXX) \
$(if $(filter
Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
- $(subst \d,$$,$(RPATH)) $(LDFLAGS) \
+ $(subst \d,$$,$(RPATH)) \
+ $(T_LDFLAGS) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
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=1734775&r1=1734774&r2=1734775&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 10:17:08 2016
@@ -174,7 +174,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
$(gb_CC) \
- $(DEFS) $(CFLAGS) \
+ $(DEFS) \
+ $(T_CFLAGS) \
-c $(3) \
-o $(1) \
-MMD -MT $(call gb_CObject_get_target,$(2)) \
@@ -193,7 +194,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
$(gb_CXX) \
- $(DEFS) $(CXXFLAGS) \
+ $(DEFS) \
+ $(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
-MMD -MT $(call gb_CxxObject_get_target,$(2)) \
@@ -211,7 +213,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
mkdir -p $(dir $(call gb_ObjCxxObject_get_dep_target,$(2))) && \
$(gb_CXX) \
- $(DEFS) $(OBJCXXFLAGS) \
+ $(DEFS) \
+ $(T_OBJCXXFLAGS) \
-c $(3) \
-o $(1) \
-MMD -MT $(call gb_ObjCxxObject_get_target,$(2)) \
@@ -267,14 +270,16 @@ $(call gb_Helper_abbreviate_dirs,\
$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
$(if $(filter
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(if $(filter
Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
- $(subst \d,$$,$(RPATH)) $(LDFLAGS) \
+ $(subst \d,$$,$(RPATH)) \
+ $(T_LDFLAGS) \
$(patsubst lib%.dylib,-l%,$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_filename,$(lib)))) \
$(patsubst %,-l%,$(EXTERNAL_LIBS)) \
> $${DYLIB_FILE} && \
$(gb_CXX) \
$(if $(filter
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(if $(filter
Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
- $(subst \d,$$,$(RPATH)) $(LDFLAGS) \
+ $(subst \d,$$,$(RPATH)) \
+ $(T_LDFLAGS) \
$(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
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=1734775&r1=1734774&r2=1734775&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 10:17:08 2016
@@ -169,7 +169,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
$(gb_CC) \
- $(DEFS) $(CFLAGS) \
+ $(DEFS) \
+ $(T_CFLAGS) \
-c $(3) \
-o $(1) \
-MMD -MT $(call gb_CObject_get_target,$(2)) \
@@ -187,7 +188,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
$(gb_CXX) \
- $(DEFS) $(CXXFLAGS) \
+ $(DEFS) \
+ $(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
-MMD -MT $(call gb_CxxObject_get_target,$(2)) \
@@ -314,7 +316,7 @@ $(call gb_Helper_abbreviate_dirs_native,
$(if $(filter
Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter
StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
$(if $(filter
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
- $(LDFLAGS) \
+ $(T_LDFLAGS) \
@$${RESPONSEFILE} \
$(if $(DLLTARGET), $(DLLDEF)) \
$(NATIVERES) \
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=1734775&r1=1734774&r2=1734775&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 10:17:08 2016
@@ -155,7 +155,8 @@ $(call gb_Helper_abbreviate_dirs,\
-o $(1) \
-xMMD \
-xMF $(call gb_CObject_get_dep_target,$(2)) \
- $(DEFS) $(CFLAGS) \
+ $(DEFS) \
+ $(T_CFLAGS) \
-I$(dir $(3)) \
$(INCLUDE))
endef
@@ -169,7 +170,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
$(gb_CXX) \
- $(DEFS) $(CXXFLAGS) \
+ $(DEFS) \
+ $(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
-xMMD \
@@ -205,7 +207,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_CXX) \
$(if $(filter
Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
- $(subst \d,$$,$(RPATH)) $(LDFLAGS) \
+ $(subst \d,$$,$(RPATH)) \
+ $(T_LDFLAGS) \
$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_filename,$(lib)))) \
$(patsubst %,-l%,$(EXTERNAL_LIBS)) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
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=1734775&r1=1734774&r2=1734775&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 10:17:08 2016
@@ -274,13 +274,15 @@ $(call gb_Helper_abbreviate_dirs_native,
mkdir -p $(dir $(1)) && \
unset INCLUDE && \
$(gb_CC) \
- $(DEFS) $(CFLAGS) -Fd$(PDBFILE) \
+ $(DEFS) \
+ $(T_CFLAGS) \
+ -Fd$(PDBFILE) \
$(PCHFLAGS) \
-I$(dir $(3)) \
$(INCLUDE) \
-c $(3) \
-Fo$(1))
-$(call
gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
+$(call
gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
endef
@@ -313,7 +315,9 @@ $(call gb_Helper_abbreviate_dirs_native,
mkdir -p $(dir $(1)) && \
unset INCLUDE && \
$(gb_CXX) \
- $(DEFS) $(CXXFLAGS) -Fd$(PDBFILE)\
+ $(DEFS) \
+ $(T_CXXFLAGS) \
+ -Fd$(PDBFILE) \
$(PCHFLAGS) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE) \
@@ -432,7 +436,7 @@ $(call gb_Helper_abbreviate_dirs_native,
$(if $(filter
Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter
StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
$(if $(filter GoogleTest
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
- $(LDFLAGS) \
+ $(T_LDFLAGS) \
@$${RESPONSEFILE} \
$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_filename,$(lib))) \
$(patsubst %,%.lib,$(EXTERNAL_LIBS)) \
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=1734775&r1=1734774&r2=1734775&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 10:17:08 2016
@@ -248,12 +248,13 @@ $(call gb_Output_announce,$(2),$(true),C
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
$(gb_CC) \
- $(DEFS) $(CFLAGS) \
+ $(DEFS) \
+ $(T_CFLAGS) \
-c $(3) \
-o $(1) \
-I$(dir $(3)) \
$(INCLUDE))
-$(call
gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
+$(call
gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
endef
@@ -286,12 +287,13 @@ $(call gb_Output_announce,$(2),$(true),C
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
$(gb_CXX) \
- $(DEFS) $(CXXFLAGS) \
+ $(DEFS) \
+ $(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE))
-$(call
gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CXXFLAGS),$(INCLUDE_STL)
$(INCLUDE))
+$(call
gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(T_CXXFLAGS),$(INCLUDE_STL)
$(INCLUDE))
endef
@@ -405,7 +407,7 @@ $(call gb_Helper_abbreviate_dirs_native,
$(NATIVERES) " > $${RESPONSEFILE} && \
$(gb_LINK) \
$(gb_Executable_TARGETTYPEFLAGS) \
- $(LDFLAGS) \
+ $(T_LDFLAGS) \
$(gb_MINGWLIBDIR)/crt2.o \
$(MINGW_CLIB_DIR)/crtbegin.o \
@$${RESPONSEFILE} \
@@ -429,7 +431,7 @@ $(call gb_Helper_abbreviate_dirs_native,
$(NATIVERES) " > $${RESPONSEFILE} && \
$(gb_LINK) \
$(gb_Library_TARGETTYPEFLAGS) \
- $(LDFLAGS) \
+ $(T_LDFLAGS) \
--enable-auto-image-base \
-e _DllMainCRTStartup@12 \
$(gb_MINGWLIBDIR)/dllcrt2.o \
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/templates/Executable.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/templates/Executable.mk?rev=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/templates/Executable.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/templates/Executable.mk
Sun Mar 13 10:17:08 2016
@@ -27,9 +27,9 @@ $(eval $(call gb_Executable_set_include,
$$(INCLUDE) \
))
-$(eval $(call gb_Executable_set_cxxflags,EXEC,\
- $$(CXXFLAGS) \
-))
+#$(eval $(call gb_Executable_add_defs,EXEC,\
+# -Dfoo \
+#))
$(eval $(call gb_Executable_add_linked_libs,EXEC,\
$(gb_STDLIBS) \
Modified:
openoffice/branches/gbuild-reintegration/main/svl/GoogleTest_svl_urihelper.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/svl/GoogleTest_svl_urihelper.mk?rev=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/svl/GoogleTest_svl_urihelper.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/svl/GoogleTest_svl_urihelper.mk
Sun Mar 13 10:17:08 2016
@@ -50,8 +50,4 @@ $(eval $(call gb_GoogleTest_add_api,svl_
udkapi \
))
-$(eval $(call gb_GoogleTest_set_ldflags,svl_urihelper,\
- $$(LDFLAGS) \
-))
-
# vim: set noet sw=4 ts=4:
Modified:
openoffice/branches/gbuild-reintegration/main/sw/GoogleTest_sw_bigpointerarray.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sw/GoogleTest_sw_bigpointerarray.mk?rev=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/sw/GoogleTest_sw_bigpointerarray.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/sw/GoogleTest_sw_bigpointerarray.mk
Sun Mar 13 10:17:08 2016
@@ -44,8 +44,4 @@ $(eval $(call gb_GoogleTest_set_include,
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_GoogleTest_set_ldflags,sw_bigpointerarray,\
- $$(LDFLAGS) \
-))
-
# vim: set noet sw=4 ts=4:
Modified: openoffice/branches/gbuild-reintegration/main/sw/Library_vbaswobj.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sw/Library_vbaswobj.mk?rev=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sw/Library_vbaswobj.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/sw/Library_vbaswobj.mk Sun
Mar 13 10:17:08 2016
@@ -115,10 +115,8 @@ $(eval $(call gb_Library_add_exception_o
))
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_set_ldflags,vbaswobj,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vbaswobj,\
-Wl$(COMMA)-O1 \
- -Wl$(COMMA)-z$(COMMA)noexecstack \
))
endif
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=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/toolkit/Library_tk.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/toolkit/Library_tk.mk Sun Mar
13 10:17:08 2016
@@ -156,8 +156,9 @@ $(eval $(call gb_Library_add_exception_o
))
ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_cxxflags,ootk,\
- $$(CXXFLAGS) $(gb_OBJCXXFLAGS)))
+$(eval $(call gb_Library_add_cxxflags,ootk,\
+ $(gb_OBJCXXFLAGS) \
+))
endif
ifeq ($(OS),LINUX)
Modified:
openoffice/branches/gbuild-reintegration/main/tools/Executable_mkunroll.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/tools/Executable_mkunroll.mk?rev=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/tools/Executable_mkunroll.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/tools/Executable_mkunroll.mk
Sun Mar 13 10:17:08 2016
@@ -30,8 +30,7 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/tools/bootstrp/ \
))
-$(eval $(call gb_Executable_set_cxxflags,mkunroll,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,mkunroll,\
-D_TOOLS_STRINGLIST \
))
Modified:
openoffice/branches/gbuild-reintegration/main/tools/Executable_rscdep.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/tools/Executable_rscdep.mk?rev=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/tools/Executable_rscdep.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/tools/Executable_rscdep.mk
Sun Mar 13 10:17:08 2016
@@ -30,8 +30,7 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/tools/bootstrp/ \
))
-$(eval $(call gb_Executable_set_cxxflags,rscdep,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,rscdep,\
-D_TOOLS_STRINGLIST \
))
Modified:
openoffice/branches/gbuild-reintegration/main/tools/Executable_so_checksum.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/tools/Executable_so_checksum.mk?rev=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/tools/Executable_so_checksum.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/tools/Executable_so_checksum.mk
Sun Mar 13 10:17:08 2016
@@ -30,8 +30,7 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/tools/bootstrp/ \
))
-$(eval $(call gb_Executable_set_cxxflags,so_checksum,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,so_checksum,\
-D_TOOLS_STRINGLIST \
$(STLPORT_DEBUGFLAG) \
))
Modified:
openoffice/branches/gbuild-reintegration/main/tools/Executable_sspretty.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/tools/Executable_sspretty.mk?rev=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/tools/Executable_sspretty.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/tools/Executable_sspretty.mk
Sun Mar 13 10:17:08 2016
@@ -30,8 +30,7 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/tools/bootstrp/ \
))
-$(eval $(call gb_Executable_set_cxxflags,sspretty,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,sspretty,\
-D_TOOLS_STRINGLIST \
$(STLPORT_DEBUGFLAG) \
))
Modified:
openoffice/branches/gbuild-reintegration/main/tools/GoogleTest_tools_fractiontest.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/tools/GoogleTest_tools_fractiontest.mk?rev=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/tools/GoogleTest_tools_fractiontest.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/tools/GoogleTest_tools_fractiontest.mk
Sun Mar 13 10:17:08 2016
@@ -40,8 +40,4 @@ $(eval $(call gb_GoogleTest_set_include,
-I$(SRCDIR)/tools/inc/pch \
))
-$(eval $(call gb_GoogleTest_set_ldflags,tools_fractiontest,\
- $$(LDFLAGS) \
-))
-
# vim: set noet sw=4 ts=4:
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=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/tools/Library_tl.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/tools/Library_tl.mk Sun Mar
13 10:17:08 2016
@@ -136,8 +136,7 @@ $(call gb_Library_use_external,tl,zlib)
ifeq ($(OS),OS2)
# YD FIXME above is not working... needs ldflags hack...
-$(eval $(call gb_Library_set_ldflags,tl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,tl,\
-lz \
))
endif
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=1734775&r1=1734774&r2=1734775&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/vcl/Library_vcl.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/vcl/Library_vcl.mk Sun Mar 13
10:17:08 2016
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_set_include,vcl
-I$(SRCDIR)/solenv/inc \
-I$(OUTDIR)/inc/stl \
-I$(OUTDIR)/inc \
- $$(FREETYPE_CFLAGS) \
))
ifeq ($(GUIBASE),os2)
$(eval $(call gb_Library_set_include,vcl,\
@@ -56,8 +55,9 @@ $(eval $(call gb_Library_set_include,vcl
))
endif
ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vcl,\
+ $$(INCLUDE) \
+ $$(FREETYPE_CFLAGS) \
))
endif
@@ -97,20 +97,15 @@ endif
ifeq ($(GUIBASE),os2)
# YD FIXME this is not working... needs ldflags hack...
-$(eval $(call gb_Library_add_linked_libs,vcl,\
- ft2lib \
-))
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vcl,\
-lft2lib \
))
endif
ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
- $$(CXXFLAGS) \
- $$(OBJCXXFLAGS) \
+$(eval $(call gb_Library_add_cxxflags,vcl,\
+ $(gb_OBJCXXFLAGS) \
))
ifeq ($(ENABLE_CAIRO),TRUE)
$(eval $(call gb_Library_set_defs,vcl,\
@@ -476,8 +471,7 @@ $(eval $(call gb_Library_add_exception_o
vcl/source/glyphs/graphite_serverfont \
))
ifeq ($(SYSTEM_GRAPHITE),YES)
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vcl,\
$(GRAPHITE_LIBS) \
))
else
@@ -504,13 +498,11 @@ endif
ifeq ($(OS),SOLARIS)
ifeq ($(CPUNAME)$(CPU),SPARCU)
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
-R/usr/sfw/lib/64 \
))
else
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
-R/usr/sfw/lib \
))
endif
@@ -520,8 +512,7 @@ ifeq ($(GUIBASE),aqua)
$(eval $(call gb_Library_add_linked_libs,vcl,\
AppleRemote \
))
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vcl,\
-framework Cocoa \
-framework Carbon \
-framework CoreFoundation \
@@ -534,8 +525,7 @@ endif
ifeq ($(OS),WNT)
ifeq ($(USE_MINGW),)
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
/ENTRY:LibMain@12 \
))
endif
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=1734775&r1=1734774&r2=1734775&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 10:17:08 2016
@@ -126,11 +126,10 @@ $(eval $(call gb_Library_set_defs,vclplu
-DUSE_RANDR \
))
ifeq ($(XRANDR_DLOPEN),FALSE)
-$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_gen,\
+ $$(INCLUDE) \
))
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
$(XRANDR_LIBS) \
))
else
@@ -151,13 +150,11 @@ $(eval $(call gb_Library_set_defs,vclplu
-DUSE_XINERAMA_XORG \
))
ifeq ($(XINERAMA_LINK),dynamic)
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
))
else
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
-Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
))
endif
@@ -171,13 +168,11 @@ $(eval $(call gb_Library_set_defs,vclplu
ifeq ($(USE_XINERAMA_VERSION),Xorg)
# Solaris, Xorg
ifeq ($(XINERAMA_LINK),dynamic)
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
-lXinerama \
))
else
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
-Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
))
endif
@@ -191,8 +186,7 @@ $(eval $(call gb_Library_set_defs,vclplu
$$(DEFS) \
-DXRENDER_LINK \
))
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
$(shell pkg-config --libs xrender) \
))
endif
@@ -203,13 +197,13 @@ $(eval $(call gb_Library_add_linked_libs
m \
pthread \
))
-$(eval $(call gb_Library_add_external_libs,vclplug_gen, \
- Xinerama Xrandr \
+$(eval $(call gb_Library_add_libs,vclplug_gen, \
+ -lXinerama -lXrandr \
))
endif
ifeq ($(OS),FREEBSD)
-$(eval $(call gb_Library_add_external_libs,vclplug_gen, \
- Xinerama Xrandr \
+$(eval $(call gb_Library_add_libs,vclplug_gen, \
+ -lXinerama -lXrandr \
))
endif
# vim: set noet sw=4 ts=4:
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=1734775&r1=1734774&r2=1734775&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 10:17:08 2016
@@ -37,8 +37,8 @@ $(eval $(call gb_Library_set_include,vcl
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_cxxflags,vclplug_gtk,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_gtk,\
+ $$(INCLUDE) \
$$(GTK_CFLAGS) \
))
@@ -57,23 +57,14 @@ $(eval $(call gb_Library_set_defs,vclplu
$$(DEFS) \
-DENABLE_DBUS \
))
-$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\
- $$(LDFLAGS) \
- $(filter-out -l%,$(shell pkg-config --libs dbus-glib-1)) \
-))
-$(eval $(call gb_Library_add_external_libs,vclplug_gtk, \
- $(patsubst -l%,%, $(filter -l%, $(shell pkg-config --libs
dbus-glib-1))) \
+$(eval $(call gb_Library_add_libs,vclplug_gtk,\
+ $(shell pkg-config --libs dbus-glib-1) \
))
endif
-$(eval $(call gb_Library_set_ldflags,vclplug_gtk, \
- $$(LDFLAGS) \
- $(filter-out -l%,$(GTK_LIBS)) \
- $(filter-out -l%,$(GTHREAD_LIBS)) \
-))
-$(eval $(call gb_Library_add_external_libs,vclplug_gtk, \
- $(patsubst -l%,%, $(filter -l%, $(GTK_LIBS))) \
- $(patsubst -l%,%, $(filter -l%, $(GTHREAD_LIBS))) \
+$(eval $(call gb_Library_add_libs,vclplug_gtk,\
+ $(GTK_LIBS) \
+ $(GTHREAD_LIBS) \
))
$(eval $(call gb_Library_add_linked_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=1734775&r1=1734774&r2=1734775&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 10:17:08 2016
@@ -37,8 +37,8 @@ $(eval $(call gb_Library_set_include,vcl
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_cxxflags,vclplug_kde,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_kde,\
+ $$(INCLUDE) \
$$(KDE_CFLAGS) \
))
@@ -47,9 +47,8 @@ $(eval $(call gb_Library_set_defs,vclplu
-DVCLPLUG_KDE_IMPLEMENTATION \
))
-$(eval $(call gb_Library_set_ldflags,vclplug_kde,\
- $$(KDE_LIBS)\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_kde,\
+ $$(KDE_LIBS) \
))
$(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
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=1734775&r1=1734774&r2=1734775&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 10:17:08 2016
@@ -37,8 +37,8 @@ $(eval $(call gb_Library_set_include,vcl
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_cxxflags,vclplug_kde4,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_kde4,\
+ $$(INCLUDE) \
$$(KDE4_CFLAGS) \
))
@@ -47,9 +47,8 @@ $(eval $(call gb_Library_set_defs,vclplu
-DVCLPLUG_KDE4_IMPLEMENTATION \
))
-$(eval $(call gb_Library_set_ldflags,vclplug_kde4,\
- $$(KDE4_LIBS)\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_kde4,\
+ $$(KDE4_LIBS) \
))
$(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
