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 /shell | |
| parent | 20773c2bb04631d9bfd60167ed091752f0deecee (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 'shell')
| -rw-r--r-- | shell/Library_desktopbe.mk | 2 | ||||
| -rw-r--r-- | shell/Library_gconfbe.mk | 1 | ||||
| -rw-r--r-- | shell/Library_kde4be.mk | 1 | ||||
| -rw-r--r-- | shell/Library_kdebe.mk | 1 | ||||
| -rw-r--r-- | shell/Library_losessioninstall.mk | 1 | ||||
| -rw-r--r-- | shell/Library_macbe.mk | 2 | ||||
| -rw-r--r-- | shell/Library_tdebe.mk | 1 |
7 files changed, 9 insertions, 0 deletions
diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk index f52735eeaa64..4d5eb75b8c9f 100644 --- a/shell/Library_desktopbe.mk +++ b/shell/Library_desktopbe.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,desktopbe1)) +$(eval $(call gb_Library_use_external,desktopbe1,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,desktopbe1)) $(eval $(call gb_Library_use_libraries,desktopbe1,\ diff --git a/shell/Library_gconfbe.mk b/shell/Library_gconfbe.mk index 7ec447b38005..53c469eed6f3 100644 --- a/shell/Library_gconfbe.mk +++ b/shell/Library_gconfbe.mk @@ -36,6 +36,7 @@ endif $(eval $(call gb_Library_use_sdk_api,gconfbe1)) $(eval $(call gb_Library_use_externals,gconfbe1,\ + boost_headers \ gconf \ )) diff --git a/shell/Library_kde4be.mk b/shell/Library_kde4be.mk index b7053cb0401d..25f2124ba5af 100644 --- a/shell/Library_kde4be.mk +++ b/shell/Library_kde4be.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,kde4be1)) $(eval $(call gb_Library_use_sdk_api,kde4be1)) $(eval $(call gb_Library_use_externals,kde4be1,\ + boost_headers \ kde4 \ )) diff --git a/shell/Library_kdebe.mk b/shell/Library_kdebe.mk index 13dd3530bfce..863f7e2fd361 100644 --- a/shell/Library_kdebe.mk +++ b/shell/Library_kdebe.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_add_libs,kdebe1,\ $(eval $(call gb_Library_use_sdk_api,kdebe1)) $(eval $(call gb_Library_use_externals,kdebe1,\ + boost_headers \ kde \ )) diff --git a/shell/Library_losessioninstall.mk b/shell/Library_losessioninstall.mk index 65dee35586e6..8874a3a8f949 100644 --- a/shell/Library_losessioninstall.mk +++ b/shell/Library_losessioninstall.mk @@ -24,6 +24,7 @@ $(eval $(call gb_Library_use_libraries,losessioninstall,\ )) $(eval $(call gb_Library_use_externals,losessioninstall,\ + boost_headers \ dbus \ gio \ )) diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk index 3aab6ea02292..46bd895748c5 100644 --- a/shell/Library_macbe.mk +++ b/shell/Library_macbe.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,macbe1)) +$(eval $(call gb_Library_use_external,macbe1,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,macbe1)) $(eval $(call gb_Library_use_system_darwin_frameworks,macbe1,\ diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk index de6d19810532..bf675826d46e 100644 --- a/shell/Library_tdebe.mk +++ b/shell/Library_tdebe.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Library_use_packages,tdebe1,\ $(eval $(call gb_Library_use_sdk_api,tdebe1)) $(eval $(call gb_Library_use_externals,tdebe1,\ + boost_headers \ tde \ )) |