summaryrefslogtreecommitdiffstats
path: root/external/redland
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-11-03 16:41:53 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-11-03 23:44:11 +0100
commitf218f8f6c8c587d2d78679f935093329f145fede (patch)
tree90b9a7142a3c80d2a4dc9cd8c844cd2d55ad19c2 /external/redland
parentSYLK import: set and evaluate col/row overflow to display dialog (diff)
downloadcore-f218f8f6c8c587d2d78679f935093329f145fede.tar.gz
core-f218f8f6c8c587d2d78679f935093329f145fede.zip
-I$(dir $(3)) in gb_CObject__command_pattern is no longer needed
...in com_MSC_class.mk now, similar to ecbaf980625a9e7b06abe91c7c70e78f6ad469a7 for com_GCC_class.mk. Three libraries built from external sources (for Windows only) needed adjustment. Change-Id: Id8976a30b80efff6119afb18ccaf6811fe27d2f8 Reviewed-on: https://gerrit.libreoffice.org/44270 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/redland')
-rw-r--r--external/redland/Library_raptor.mk5
-rw-r--r--external/redland/Library_rdf.mk5
2 files changed, 10 insertions, 0 deletions
diff --git a/external/redland/Library_raptor.mk b/external/redland/Library_raptor.mk
index 333c2947fef0..1f171c1bc752 100644
--- a/external/redland/Library_raptor.mk
+++ b/external/redland/Library_raptor.mk
@@ -9,6 +9,11 @@
$(eval $(call gb_Library_Library,raptor2))
+$(eval $(call gb_Library_set_include,raptor2, \
+ -I$(call gb_UnpackedTarball_get_dir,raptor)/src \
+ $$(INCLUDE) \
+))
+
$(eval $(call gb_Library_use_unpacked,raptor2,raptor))
$(eval $(call gb_Library_use_externals,raptor2,\
diff --git a/external/redland/Library_rdf.mk b/external/redland/Library_rdf.mk
index 6ce13e38d351..9e2f7279fa55 100644
--- a/external/redland/Library_rdf.mk
+++ b/external/redland/Library_rdf.mk
@@ -9,6 +9,11 @@
$(eval $(call gb_Library_Library,rdf))
+$(eval $(call gb_Library_set_include,rdf, \
+ -I$(call gb_UnpackedTarball_get_dir,redland)/src \
+ $$(INCLUDE) \
+))
+
$(eval $(call gb_Library_use_unpacked,rdf,redland))
$(eval $(call gb_Library_set_warnings_not_errors,rdf))