diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-01-26 21:19:13 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-01-26 22:20:06 +0100 |
commit | a53586f4efe26b8875107d04001f4ecec760c343 (patch) | |
tree | 9b19f0ecf5b5a08cc056e3274a2eaba96894dec8 /ucb | |
parent | crashrep: fix conditionals: it used to be built in non-pro too (diff) | |
download | core-a53586f4efe26b8875107d04001f4ecec760c343.tar.gz core-a53586f4efe26b8875107d04001f4ecec760c343.zip |
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 'ucb')
-rw-r--r-- | ucb/Library_ucb1.mk | 2 | ||||
-rw-r--r-- | ucb/Library_ucpcmis1.mk | 3 | ||||
-rw-r--r-- | ucb/Library_ucpdav1.mk | 1 | ||||
-rw-r--r-- | ucb/Library_ucpext.mk | 2 | ||||
-rw-r--r-- | ucb/Library_ucpfile1.mk | 2 | ||||
-rw-r--r-- | ucb/Library_ucphier1.mk | 2 | ||||
-rw-r--r-- | ucb/Library_ucppkg1.mk | 2 |
7 files changed, 13 insertions, 1 deletions
diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk index 5dabe48bbd4a..601c75b7d1ca 100644 --- a/ucb/Library_ucb1.mk +++ b/ucb/Library_ucb1.mk @@ -34,6 +34,8 @@ $(eval $(call gb_Library_set_include,ucb1,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,ucb1,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,ucb1)) $(eval $(call gb_Library_use_libraries,ucb1,\ diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk index a19f10be8853..e90000ab077b 100644 --- a/ucb/Library_ucpcmis1.mk +++ b/ucb/Library_ucpcmis1.mk @@ -43,10 +43,11 @@ $(eval $(call gb_Library_use_libraries,ucpcmis1,\ )) $(eval $(call gb_Library_use_externals,ucpcmis1,\ + boost_headers \ + boostdatetime \ cmis \ curl \ libxml2 \ - boostdatetime \ )) $(eval $(call gb_Library_add_exception_objects,ucpcmis1,\ diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index 2bdb4a66b910..e9094471f214 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\ )) $(eval $(call gb_Library_use_externals,ucpdav1,\ + boost_headers \ libxml2 \ neon \ openssl \ diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk index 889c7351c099..5e1b19523881 100644 --- a/ucb/Library_ucpext.mk +++ b/ucb/Library_ucpext.mk @@ -33,6 +33,8 @@ $(eval $(call gb_Library_use_packages,ucpext,\ $(eval $(call gb_Library_set_componentfile,ucpext,ucb/source/ucp/ext/ucpext)) +$(eval $(call gb_Library_use_external,ucpext,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,ucpext)) $(eval $(call gb_Library_use_libraries,ucpext,\ diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk index 12890b1e70fe..e4f2f8dd26c1 100644 --- a/ucb/Library_ucpfile1.mk +++ b/ucb/Library_ucpfile1.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,ucpfile1)) $(eval $(call gb_Library_set_componentfile,ucpfile1,ucb/source/ucp/file/ucpfile1)) +$(eval $(call gb_Library_use_external,ucpfile1,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,ucpfile1)) $(eval $(call gb_Library_use_libraries,ucpfile1,\ diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk index 83798585807c..3947ebf413ae 100644 --- a/ucb/Library_ucphier1.mk +++ b/ucb/Library_ucphier1.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,ucphier1)) $(eval $(call gb_Library_set_componentfile,ucphier1,ucb/source/ucp/hierarchy/ucphier1)) +$(eval $(call gb_Library_use_external,ucphier1,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,ucphier1)) $(eval $(call gb_Library_use_libraries,ucphier1,\ diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk index c3c3671f082d..cd56609b7e3b 100644 --- a/ucb/Library_ucppkg1.mk +++ b/ucb/Library_ucppkg1.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,ucppkg1)) $(eval $(call gb_Library_set_componentfile,ucppkg1,ucb/source/ucp/package/ucppkg1)) +$(eval $(call gb_Library_use_external,ucppkg1,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,ucppkg1)) $(eval $(call gb_Library_use_libraries,ucppkg1,\ |