[Libreoffice-commits] core.git: 2 commits - .gitignore nss/ExternalProject_nss.mk

[Fridrich Å trba]

 .gitignore                 |    2 +-
 nss/ExternalProject_nss.mk |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 2c6794e40d2bf8dd91ca8ca56dbb1663fd695856
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Mar 1 18:27:45 2013 +0100

    nss on windows needs soltool's unistd.h
    
    Change-Id: I8c23fadc550091c834a873b53dbd3eae2ba8286e

diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk
index aa84385..7de780b 100644
--- a/nss/ExternalProject_nss.mk
+++ b/nss/ExternalProject_nss.mk
@@ -11,6 +11,9 @@ $(eval $(call gb_ExternalProject_ExternalProject,nss))
 
 $(eval $(call gb_ExternalProject_use_unpacked,nss,nss))
 
+$(eval $(call gb_ExternalProject_use_package,nss,soltools_inc))
+
+
 $(eval $(call gb_ExternalProject_register_targets,nss,\
 	configure \
 	build \
commit 4f1616a59ea21d19e04f1cbd81e13c72e6bbd518
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Mar 1 18:28:00 2013 +0100

    .gitignore for the whole config_build/ directory

diff --git a/.gitignore b/.gitignore
index a360be6..fc3ecb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,7 +46,7 @@
 /config_host.mk
 /config_host.mk.last
 /config_host.mk.stamp
-/config_build/config_*.h
+/config_build
 /config_build.mk
 /configure
 /lo.xcent