[Libreoffice-commits] .: 2 commits - solenv/gbuild svl/AllLangResTarget_svl.mk svl/Library_fsstorage.mk svl/Library_passwordcontainer.mk

[Matus Kukan]

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |    3 +++
 solenv/gbuild/platform/windows.mk       |    3 ---
 svl/AllLangResTarget_svl.mk             |    1 +
 svl/Library_fsstorage.mk                |    4 ++--
 svl/Library_passwordcontainer.mk        |    4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit c59beae71273d6c8894f7d6eaff25131d6c124a4
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sun Mar 25 12:18:32 2012 +0200

    svl: add include path and more add_package_headers

diff --git a/svl/AllLangResTarget_svl.mk b/svl/AllLangResTarget_svl.mk
index d47b973..40bb46f 100644
--- a/svl/AllLangResTarget_svl.mk
+++ b/svl/AllLangResTarget_svl.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,svl/res))
 
 $(eval $(call gb_SrsTarget_set_include,svl/res,\
     $$(INCLUDE) \
+    -I$(SRCDIR)/svl/inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,svl/res,\
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 4e88d31..77d826c 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -28,11 +28,11 @@
 
 $(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$(SRCDIR)/svl/inc \
-    -I$(SRCDIR)/svl/inc/svl \
     -I$(SRCDIR)/svl/source/inc \
     $$(INCLUDE) \
 ))
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index bb54153..6ece5a3 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -28,11 +28,11 @@
 
 $(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$(SRCDIR)/svl/inc \
-    -I$(SRCDIR)/svl/inc/svl \
     -I$(SRCDIR)/svl/source/inc \
     $$(INCLUDE) \
 ))
commit bee6510c0884a939ebb3f167b0c29f911403cd2f
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sun Mar 25 11:33:03 2012 +0200

    fix mingw build, properly set LO_LIB_DIR

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 5f4751c..4ec9a80 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -242,6 +242,9 @@ endif
 
 # Helper class
 
+gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
+gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin
+
 gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
 gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
 gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index b09e4be..7cfe7d8 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -27,9 +27,6 @@
 
 GUI := WNT
 
-gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
-gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin
-
 gb_Helper_get_rcfile = $(1).ini
 
 gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX