summaryrefslogtreecommitdiff
path: root/avmedia
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 /avmedia
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 'avmedia')
-rw-r--r--avmedia/Library_avmedia.mk2
-rw-r--r--avmedia/Library_avmediaQuickTime.mk2
-rw-r--r--avmedia/Library_avmediagst.mk2
-rw-r--r--avmedia/Library_avmediagst_0_10.mk2
-rw-r--r--avmedia/Library_avmediawin.mk2
5 files changed, 10 insertions, 0 deletions
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 2dfd7c6d6c59..f77da34842aa 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -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 \
diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk
index defe843ab900..0e72034f9a2c 100644
--- a/avmedia/Library_avmediaQuickTime.mk
+++ b/avmedia/Library_avmediaQuickTime.mk
@@ -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,\
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index 1e0b5fc5f839..3ea54e88cc4d 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -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)
diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk
index 91ce2fa0e9ba..da3460610d2b 100644
--- a/avmedia/Library_avmediagst_0_10.mk
+++ b/avmedia/Library_avmediagst_0_10.mk
@@ -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)
diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk
index 5d6649c37baa..62b071f32e78 100644
--- a/avmedia/Library_avmediawin.mk
+++ b/avmedia/Library_avmediawin.mk
@@ -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 \