Kaydet (Commit) a53586f4 authored tarafından Michael Stahl's avatar Michael Stahl

gbuild: do not copy boost headers around

- do not use gb_UnpackedTarball_copy_header_files for boost
- adapt the optimization in concat-deps.c for new path
- use boost_headers in all LinkTargets that require it
- add explicit include paths to mysqlc, mysqlcppconn, libvisio, liborcus

Change-Id: I0c43e73ed43cc9d2e6bce8faf55e992d655a0bb9
üst 20773c2b
......@@ -476,6 +476,10 @@ endef
define gb_LinkTarget__use_boost_headers
$(call gb_LinkTarget_use_unpacked,$(1),boost)
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,boost) \
$$(INCLUDE) \
)
endef
......
......@@ -33,6 +33,8 @@ $(eval $(call gb_Library_set_include,acc,\
-I$(SRCDIR)/accessibility/source/inc \
))
$(eval $(call gb_Library_use_external,acc,boost_headers))
$(eval $(call gb_Library_use_sdk_api,acc))
$(eval $(call gb_Library_use_libraries,acc,\
......
......@@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,java_uno_accessbridge))
$(eval $(call gb_Library_use_custom_headers,java_uno_accessbridge,accessibility/bridge/inc))
$(eval $(call gb_Library_use_external,java_uno_accessbridge,boost_headers))
$(eval $(call gb_Library_use_sdk_api,java_uno_accessbridge,))
$(eval $(call gb_Library_use_libraries,java_uno_accessbridge,\
......
......@@ -28,6 +28,8 @@
$(eval $(call gb_Library_Library,animcore))
$(eval $(call gb_Library_use_external,animcore,boost_headers))
$(eval $(call gb_Library_use_packages,animcore,\
animations_inc \
comphelper_inc \
......
......@@ -44,6 +44,8 @@ $(eval $(call gb_Library_add_defs,avmedia,\
-DAVMEDIA_DLLIMPLEMENTATION \
))
$(eval $(call gb_Library_use_external,avmedia,boost_headers))
$(eval $(call gb_Library_use_libraries,avmedia,\
comphelper \
ucbhelper \
......
......@@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,avmediaQuickTime,\
-I$(SRCDIR)/avmedia/source/inc \
))
$(eval $(call gb_Library_use_external,avmediaQuickTime,boost_headers))
$(eval $(call gb_Library_use_sdk_api,avmediaQuickTime));
$(eval $(call gb_Library_use_libraries,avmediaQuickTime,\
......
......@@ -37,6 +37,8 @@ $(eval $(call gb_Library_set_include,avmediagst,\
))
$(eval $(call gb_Library_add_libs,avmediagst,$(GSTREAMER_LIBS)))
$(eval $(call gb_Library_use_external,avmediagst,boost_headers))
$(eval $(call gb_Library_use_sdk_api,avmediagst))
ifeq ($(OS),WNT)
......
......@@ -36,6 +36,8 @@ $(eval $(call gb_Library_set_include,avmediagst_0_10,\
$(GSTREAMER_0_10_CFLAGS) \
))
$(eval $(call gb_Library_use_external,avmediagst_0_10,boost_headers))
$(eval $(call gb_Library_use_sdk_api,avmediagst_0_10))
ifeq ($(OS),WNT)
......
......@@ -30,6 +30,8 @@ $(eval $(call gb_Library_Library,avmediawin))
$(eval $(call gb_Library_set_componentfile,avmediawin,avmedia/source/win/avmediawin))
$(eval $(call gb_Library_use_external,avmediawin,boost_headers))
$(eval $(call gb_Library_set_include,avmediawin,\
$$(INCLUDE) \
-I$(SRCDIR)/avmedia/source/inc \
......
......@@ -38,6 +38,8 @@ $(eval $(call gb_Library_set_include,basctl,\
-I$(WORKDIR)/SdiTarget/basctl/sdi \
))
$(eval $(call gb_Library_use_external,basctl,boost_headers))
$(eval $(call gb_Library_use_sdk_api,basctl))
$(eval $(call gb_Library_use_libraries,basctl,\
......
......@@ -14,6 +14,8 @@ $(eval $(call gb_CppunitTest_set_include,basebmp_cpputest,\
$$(INCLUDE) \
))
$(eval $(call gb_CppunitTest_use_external,basebmp_cpputest,boost_headers))
ifeq ($(OS),ANDROID)
$(eval $(call gb_CppunitTest_use_static_libraries,basebmp_cpputest,\
basebmp \
......
......@@ -13,7 +13,10 @@ $(eval $(call gb_Library_use_package,basebmp,basebmp_inc))
$(eval $(call gb_Library_use_sdk_api,basebmp))
$(eval $(call gb_Library_use_external,basebmp,vigra_headers))
$(eval $(call gb_Library_use_externals,basebmp,\
boost_headers \
vigra_headers \
))
$(eval $(call gb_Library_use_libraries,basebmp,\
basegfx \
......
......@@ -9,6 +9,8 @@
$(eval $(call gb_CppunitTest_CppunitTest,basegfx_cpputest))
$(eval $(call gb_CppunitTest_use_external,basegfx_cpputest,boost_headers))
$(eval $(call gb_CppunitTest_use_api,basegfx_cpputest,\
offapi \
udkapi \
......
......@@ -9,6 +9,8 @@
$(eval $(call gb_Library_Library,basegfx))
$(eval $(call gb_Library_use_external,basegfx,boost_headers))
$(eval $(call gb_Library_use_packages,basegfx,\
basegfx_inc \
comphelper_inc \
......
......@@ -8,6 +8,8 @@
$(eval $(call gb_CppunitTest_CppunitTest,basic_coverage))
$(eval $(call gb_CppunitTest_use_external,basic_coverage,boost_headers))
$(eval $(call gb_CppunitTest_add_exception_objects,basic_coverage, \
basic/qa/cppunit/basic_coverage \
))
......
......@@ -8,6 +8,8 @@
$(eval $(call gb_CppunitTest_CppunitTest,basic_enable))
$(eval $(call gb_CppunitTest_use_external,basic_enable,boost_headers))
$(eval $(call gb_CppunitTest_add_exception_objects,basic_enable, \
basic/qa/cppunit/test_append \
))
......
......@@ -9,6 +9,8 @@
$(eval $(call gb_CppunitTest_CppunitTest,basic_nested_struct))
$(eval $(call gb_CppunitTest_use_external,basic_nested_struct,boost_headers))
$(eval $(call gb_CppunitTest_add_exception_objects,basic_nested_struct, \
basic/qa/cppunit/test_nested_struct \
))
......
......@@ -29,6 +29,8 @@ $(eval $(call gb_Library_set_include,sb,\
-I$(SRCDIR)/basic/source/inc \
))
$(eval $(call gb_Library_use_external,sb,boost_headers))
$(eval $(call gb_Library_use_sdk_api,sb))
$(eval $(call gb_Library_use_api,sb,oovbaapi))
......
......@@ -28,6 +28,8 @@
$(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-cache))
$(eval $(call gb_CppunitTest_use_external,binaryurp_test-cache,boost_headers))
$(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\
sal \
$(gb_UWINAPI) \
......
......@@ -28,6 +28,8 @@
$(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-unmarshal))
$(eval $(call gb_CppunitTest_use_external,binaryurp_test-unmarshal,boost_headers))
$(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\
cppu \
cppuhelper \
......
......@@ -32,6 +32,8 @@ $(eval $(call gb_Library_set_componentfile,binaryurp,binaryurp/source/binaryurp)
$(eval $(call gb_Library_use_sdk_api,binaryurp))
$(eval $(call gb_Library_use_external,binaryurp,boost_headers))
$(eval $(call gb_Library_use_libraries,binaryurp,\
cppu \
cppuhelper \
......
......@@ -16,7 +16,7 @@ $(eval $(call gb_StaticLibrary_add_defs,boostdatetime,\
-DBOOST_ALL_NO_LIB \
))
$(eval $(call gb_StaticLibrary_use_unpacked,boostdatetime,boost))
$(eval $(call gb_StaticLibrary_use_external,boostdatetime,boost_headers))
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostdatetime,cpp))
......
......@@ -16,7 +16,7 @@ $(eval $(call gb_StaticLibrary_add_defs,boostthread,\
-DBOOST_ALL_NO_LIB \
))
$(eval $(call gb_StaticLibrary_use_unpacked,boostthread,boost))
$(eval $(call gb_StaticLibrary_use_external,boostthread,boost_headers))
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostthread,cpp))
......
......@@ -62,8 +62,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,boost,\
$(foreach patch,$(boost_patches),boost/$(patch)) \
))
$(eval $(call gb_UnpackedTarball_copy_header_files,boost,\
boost \
))
# vim: set noet sw=4 ts=4:
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := cc50_solaris_intel
$(eval $(call gb_Library_Library,sunpro5_uno))
$(eval $(call gb_Library_use_external,sunpro5_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,sunpro5_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := cc50_solaris_sparc
$(eval $(call gb_Library_Library,sunpro5_uno))
$(eval $(call gb_Library_use_external,sunpro5_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,sunpro5_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := cc5_solaris_sparc64
$(eval $(call gb_Library_Library,sunpro5_uno))
$(eval $(call gb_Library_use_external,sunpro5_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,sunpro5_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_aix_powerpc
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_ios_arm
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_custom_headers,gcc3_uno,\
bridges/source/cpp_uno/gcc3_ios_arm \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_alpha
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_arm
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_hppa
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_ia64
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_intel
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_m68k
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_mips
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_powerpc
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_powerpc64
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_s390
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_s390x
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_sparc
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_x86-64
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_macosx_intel
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_macosx_powerpc
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_macosx_x86-64
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_solaris_intel
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_solaris_sparc
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -9,6 +9,8 @@
$(eval $(call gb_Library_Library,java_uno))
$(eval $(call gb_Library_use_external,java_uno,boost_headers))
ifeq ($(OS)$(COM),WNTGCC)
ifeq ($(EXCEPTIONS),sjlj)
$(eval $(call gb_Library_add_defs,java_uno,\
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := mingw_intel
$(eval $(call gb_Library_Library,gcc3_uno))
$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := msvc_win32_intel
$(eval $(call gb_Library_Library,msci_uno))
$(eval $(call gb_Library_use_external,msci_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,msci_uno,\
udkapi \
))
......
......@@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := msvc_win32_x86-64
$(eval $(call gb_Library_Library,mscx_uno))
$(eval $(call gb_Library_use_external,mscx_uno,boost_headers))
$(eval $(call gb_Library_use_internal_comprehensive_api,mscx_uno,\
udkapi \
))
......
......@@ -90,6 +90,7 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
))
$(eval $(call gb_Library_use_externals,cairocanvas,\
boost_headers \
cairo \
))
......
......@@ -39,6 +39,8 @@ $(eval $(call gb_Library_set_include,canvasfactory,\
-I$(SRCDIR)/canvas/inc \
))
$(eval $(call gb_Library_use_external,canvasfactory,boost_headers))
$(eval $(call gb_Library_use_sdk_api,canvasfactory))
$(eval $(call gb_Library_use_libraries,canvasfactory,\
......
......@@ -41,6 +41,8 @@ $(eval $(call gb_Library_add_defs,canvastools,\
-DCANVASTOOLS_DLLIMPLEMENTATION \
))
$(eval $(call gb_Library_use_external,canvastools,boost_headers))
$(eval $(call gb_Library_use_libraries,canvastools,\
basegfx \
comphelper \
......
......@@ -49,6 +49,8 @@ $(eval $(call gb_Library_add_defs,directx9canvas,\
))
endif
$(eval $(call gb_Library_use_external,directx9canvas,boost_headers))
$(eval $(call gb_Library_use_libraries,directx9canvas,\
cppu \
tk \
......
......@@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,gdipluscanvas,\
-I$(SRCDIR)/canvas/inc \
))
$(eval $(call gb_Library_use_external,gdipluscanvas,boost_headers))
$(eval $(call gb_Library_use_sdk_api,gdipluscanvas))
# clear NOMINMAX because GdiplusTypes.h uses those macros :(
......
......@@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,nullcanvas,\
-I$(SRCDIR)/canvas/inc \
))
$(eval $(call gb_Library_use_external,nullcanvas,boost_headers))
$(eval $(call gb_Library_use_sdk_api,nullcanvas))
$(eval $(call gb_Library_use_libraries,nullcanvas,\
......
......@@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,simplecanvas,\
-I$(SRCDIR)/canvas/inc \
))
$(eval $(call gb_Library_use_external,simplecanvas,boost_headers))
$(eval $(call gb_Library_use_sdk_api,simplecanvas))
$(eval $(call gb_Library_use_libraries,simplecanvas,\
......
......@@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,vclcanvas,\
-I$(SRCDIR)/canvas/inc \
))
$(eval $(call gb_Library_use_external,vclcanvas,boost_headers))
$(eval $(call gb_Library_use_sdk_api,vclcanvas))
$(eval $(call gb_Library_use_libraries,vclcanvas,\
......
......@@ -32,6 +32,8 @@ $(eval $(call gb_StaticLibrary_set_include,directxcanvas,\
-I$(SRCDIR)/canvas/inc \
))
$(eval $(call gb_StaticLibrary_use_external,directxcanvas,boost_headers))