[Libreoffice-commits] core.git: 2 commits - fpicker/Library_fps_office.mk solenv/gbuild

[David Tardon]

 fpicker/Library_fps_office.mk |    5 -----
 solenv/gbuild/LinkTarget.mk   |    8 ++++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 1a02fb9e70fca278be1dbef03e6b73394ffe8397
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Apr 20 15:30:04 2013 +0200

    drop -I of nonexistent dir
    
    Change-Id: Ife9d8f758fa5a46e2ab29d43eec0a5112495ed5f

diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk
index f94453e..d01870f 100644
--- a/fpicker/Library_fps_office.mk
+++ b/fpicker/Library_fps_office.mk
@@ -33,11 +33,6 @@ $(eval $(call gb_Library_use_external,fps_office,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,fps_office))
 
-$(eval $(call gb_Library_set_include,fps_office,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/fpicker/inc \
-))
-
 $(eval $(call gb_Library_use_libraries,fps_office,\
 	comphelper \
 	cppu \
commit cd0d9485972bdb27a993ef44444d9d612b61ba71
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Apr 20 15:24:30 2013 +0200

    warn if using nonexist. dirs in include path
    
    Change-Id: If3c44175a20b7c1720c7200c9bb06372740f95fe

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 44e41f2..720a23d 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -718,7 +718,15 @@ endif
 
 endef
 
+define gb_LinkTarget__check_srcdir_paths
+$(if $(filter-out $(wildcard $(2)),$(2)),\
+    $(call gb_Output_warn,gb_LinkTarget_set_include: include paths $(filter-out $(wildcard $(2)),$(2)) do not exist) \
+)
+endef
+
 define gb_LinkTarget_set_include
+$(call gb_LinkTarget__check_srcdir_paths,$(1),\
+    $(patsubst -I%,%,$(filter -I$(SRCDIR)/%,$(filter-out -I$(OUTDIR)/% -I$(WORKDIR)/%,$(2)))))
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $(2)
 ifeq ($(gb_FULLDEPS),$(true))