summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-01-26 21:19:13 +0100
committerMichael Stahl <mstahl@redhat.com>2013-01-26 22:20:06 +0100
commita53586f4efe26b8875107d04001f4ecec760c343 (patch)
tree9b19f0ecf5b5a08cc056e3274a2eaba96894dec8 /vcl
parent20773c2bb04631d9bfd60167ed091752f0deecee (diff)
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
Diffstat (limited to 'vcl')
-rw-r--r--vcl/CppunitTest_vcl_filters_test.mk2
-rw-r--r--vcl/Executable_ui-previewer.mk2
-rw-r--r--vcl/Library_desktop_detector.mk1
-rw-r--r--vcl/Library_vcl.mk1
-rw-r--r--vcl/Library_vclplug_gen.mk1
-rw-r--r--vcl/Library_vclplug_gtk.mk1
-rw-r--r--vcl/Library_vclplug_gtk3.mk1
-rw-r--r--vcl/Library_vclplug_kde.mk1
-rw-r--r--vcl/Library_vclplug_kde4.mk1
-rw-r--r--vcl/Library_vclplug_svp.mk1
-rw-r--r--vcl/Library_vclplug_tde.mk1
-rw-r--r--vcl/StaticLibrary_headless.mk2
12 files changed, 15 insertions, 0 deletions
diff --git a/vcl/CppunitTest_vcl_filters_test.mk b/vcl/CppunitTest_vcl_filters_test.mk
index 8cce39f1a436..55cb8c56120d 100644
--- a/vcl/CppunitTest_vcl_filters_test.mk
+++ b/vcl/CppunitTest_vcl_filters_test.mk
@@ -37,6 +37,8 @@ $(eval $(call gb_CppunitTest_add_defs,vcl_filters_test,\
))
endif
+$(eval $(call gb_CppunitTest_use_external,vcl_filters_test,boost_headers))
+
$(eval $(call gb_CppunitTest_use_libraries,vcl_filters_test, \
comphelper \
cppu \
diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk
index 51d12d027827..71ed93c838ea 100644
--- a/vcl/Executable_ui-previewer.mk
+++ b/vcl/Executable_ui-previewer.mk
@@ -31,6 +31,8 @@ $(eval $(call gb_Executable_set_include,ui-previewer,\
$$(INCLUDE) \
))
+$(eval $(call gb_Executable_use_external,ui-previewer,boost_headers))
+
$(eval $(call gb_Executable_use_api,ui-previewer,\
offapi \
udkapi \
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index e4dc320f56f9..88902b4eb940 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,desktop_detector,\
))
$(eval $(call gb_Library_use_externals,desktop_detector,\
+ boost_headers \
icule \
icuuc \
))
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 2454fc3f7b0a..c71543de585b 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -97,6 +97,7 @@ $(eval $(call gb_Library_use_libraries,vcl,\
endif
$(eval $(call gb_Library_use_externals,vcl,\
+ boost_headers \
icule \
icuuc \
icu_headers \
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 007a75a8da0d..d864a32bf54e 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\
))
$(eval $(call gb_Library_use_externals,vclplug_gen,\
+ boost_headers \
cairo \
graphite \
icule \
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 153498c037ee..e0f9b0ac4187 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -57,6 +57,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\
))
$(eval $(call gb_Library_use_externals,vclplug_gtk,\
+ boost_headers \
cairo \
dbus \
gio \
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 1523b90e9f0d..da60f73b5b75 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
))
$(eval $(call gb_Library_use_externals,vclplug_gtk3,\
+ boost_headers \
dbus \
))
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index 70ee7f906da5..249fcb3e01c1 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\
))
$(eval $(call gb_Library_use_externals,vclplug_kde,\
+ boost_headers \
icule \
icuuc \
kde \
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index f32d2b402204..1079d848d049 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\
))
$(eval $(call gb_Library_use_externals,vclplug_kde4,\
+ boost_headers \
icule \
icuuc \
kde4 \
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index e8460d4261e0..c35bddaf0473 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\
))
$(eval $(call gb_Library_use_externals,vclplug_svp,\
+ boost_headers \
icule \
icuuc \
))
diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk
index 600f00a9aa35..4a078ac10aaa 100644
--- a/vcl/Library_vclplug_tde.mk
+++ b/vcl/Library_vclplug_tde.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\
))
$(eval $(call gb_Library_use_externals,vclplug_tde,\
+ boost_headers \
icule \
icuuc \
))
diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk
index a3dc220a83cd..1dc5b0c97a64 100644
--- a/vcl/StaticLibrary_headless.mk
+++ b/vcl/StaticLibrary_headless.mk
@@ -41,6 +41,8 @@ $(eval $(call gb_StaticLibrary_use_packages,headless,\
unotools_inc \
))
+$(eval $(call gb_StaticLibrary_use_external,headless,boost_headers))
+
$(eval $(call gb_StaticLibrary_use_api,headless,\
offapi \
udkapi \