basctl/AllLangResTarget_basctl.mk | 4 ++++ formula/AllLangResTarget_for.mk | 1 + svl/AllLangResTarget_svl.mk | 2 +- svl/Library_fsstorage.mk | 7 ++----- svl/Library_passwordcontainer.mk | 7 ++----- 5 files changed, 10 insertions(+), 11 deletions(-)
New commits: commit 3d07ac27bf35f83587fd5422791adf6670c689a1 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Sun Mar 25 12:18:32 2012 +0200 svl: add include path and more add_package_headers Conflicts: svl/AllLangResTarget_svl.mk svl/Library_fsstorage.mk svl/Library_passwordcontainer.mk Signed-off-by: LuboÅ¡ LuÅák <l.lu...@suse.cz> diff --git a/svl/AllLangResTarget_svl.mk b/svl/AllLangResTarget_svl.mk index 70edac2..90cb015 100644 --- a/svl/AllLangResTarget_svl.mk +++ b/svl/AllLangResTarget_svl.mk @@ -36,7 +36,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,svl/res)) $(eval $(call gb_SrsTarget_set_include,svl/res,\ $$(INCLUDE) \ - -I$(WORKDIR)/inc \ + -I$(realpath $(SRCDIR)/svl/inc) \ )) $(eval $(call gb_SrsTarget_add_files,svl/res,\ diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index 2247c9a..a3bf09f 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -28,15 +28,12 @@ $(eval $(call gb_Library_Library,fsstorage)) +$(eval $(call gb_Library_add_package_headers,fsstorage,svl_inc)) + $(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage)) $(eval $(call gb_Library_set_include,fsstorage,\ - -I$(WORKDIR)/inc/svl \ - -I$(WORKDIR)/inc/ \ - -I$(realpath $(SRCDIR)/svl/inc) \ - -I$(realpath $(SRCDIR)/svl/inc/svl) \ -I$(realpath $(SRCDIR)/svl/source/inc) \ - -I$(OUTDIR)/inc \ $$(INCLUDE) \ )) diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index 6b577b6..e96a11a 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -28,15 +28,12 @@ $(eval $(call gb_Library_Library,passwordcontainer)) +$(eval $(call gb_Library_add_package_headers,passwordcontainer,svl_inc)) + $(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer)) $(eval $(call gb_Library_set_include,passwordcontainer,\ - -I$(WORKDIR)/inc/svl \ - -I$(WORKDIR)/inc/ \ - -I$(realpath $(SRCDIR)/svl/inc) \ - -I$(realpath $(SRCDIR)/svl/inc/svl) \ -I$(realpath $(SRCDIR)/svl/source/inc) \ - -I$(OUTDIR)/inc \ $$(INCLUDE) \ )) commit a0d31721fc2cd7391e7a27a3adcf50ff20370174 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Mon Mar 26 23:01:46 2012 +0200 more dependencies and include paths Conflicts: basctl/AllLangResTarget_basctl.mk formula/AllLangResTarget_for.mk Signed-off-by: LuboÅ¡ LuÅák <l.lu...@suse.cz> diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk index 1611f9a..63575fa 100644 --- a/basctl/AllLangResTarget_basctl.mk +++ b/basctl/AllLangResTarget_basctl.mk @@ -54,4 +54,8 @@ $(eval $(call gb_SrsTarget_add_files,basctl/res,\ basctl/source/dlged/managelang.src \ )) +$(call gb_SrsTemplateTarget_get_target,basctl/res) : \ + $(call gb_Package_get_target,svx_globlmn_hrc) \ + $(call gb_Package_get_target,svx_inc) + # vim: set noet sw=4 ts=4: diff --git a/formula/AllLangResTarget_for.mk b/formula/AllLangResTarget_for.mk index 0830623..fe90dd6 100644 --- a/formula/AllLangResTarget_for.mk +++ b/formula/AllLangResTarget_for.mk @@ -37,6 +37,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,formula/res)) $(eval $(call gb_SrsTarget_set_include,formula/res,\ $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/formula/inc) \ -I$(realpath $(SRCDIR)/formula/source/core/inc) \ -I$(OUTDIR)/inc \ ))
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits