diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-11-03 16:41:53 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-11-03 23:44:11 +0100 |
| commit | f218f8f6c8c587d2d78679f935093329f145fede (patch) | |
| tree | 90b9a7142a3c80d2a4dc9cd8c844cd2d55ad19c2 | |
| parent | 12f09377b91b6d70efb3448d098f4dbd677a67d1 (diff) | |
-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>
| -rw-r--r-- | external/libstaroffice/Library_staroffice.mk | 1 | ||||
| -rw-r--r-- | external/redland/Library_raptor.mk | 5 | ||||
| -rw-r--r-- | external/redland/Library_rdf.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/external/libstaroffice/Library_staroffice.mk b/external/libstaroffice/Library_staroffice.mk index 23d805d3a8e0..afa8a032518f 100644 --- a/external/libstaroffice/Library_staroffice.mk +++ b/external/libstaroffice/Library_staroffice.mk @@ -19,6 +19,7 @@ $(eval $(call gb_Library_set_warnings_not_errors,staroffice)) $(eval $(call gb_Library_set_include,staroffice,\ -I$(call gb_UnpackedTarball_get_dir,libstaroffice)/inc \ + -I$(call gb_UnpackedTarball_get_dir,libstaroffice)/src/lib \ $$(INCLUDE) \ )) 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)) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 3bc5e3235420..b00741184d27 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -55,7 +55,6 @@ $(call gb_Helper_abbreviate_dirs,\ -Fd$(PDBFILE) \ $(PCHFLAGS) \ $(if $(COMPILER_TEST),,$(gb_COMPILERDEPFLAGS)) \ - -I$(dir $(3)) \ $(INCLUDE) \ $(if $(filter YES,$(CXXOBJECT_X64)), -U_X86_ -D_AMD64_,) \ -c $(3) \ @@ -83,7 +82,6 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(EXTERNAL_CODE),$(if $(COM_IS_CLANG),-Wno-undef),$(gb_DEFS_INTERNAL)) \ $(gb_LTOFLAGS) \ $(gb_COMPILERDEPFLAGS) \ - -I$(dir $(3)) \ $(6) \ -c $(3) \ -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_create_deps,$(call gb_PrecompiledHeader_get_dep_target_tmp,$(2)),$(1),$(3)) |