[Libreoffice-commits] .: 2 commits - soltools/Executable_adjustvisibility.mk soltools/Executable_checkdll.mk soltools/Executable_cpp.mk soltools/Executable_javadep.mk soltools/Executable_makedepend.mk

[Libreoffice Gerrit user]

 soltools/Executable_adjustvisibility.mk |    6 ++++++
 soltools/Executable_checkdll.mk         |    6 ++++++
 soltools/Executable_cpp.mk              |    6 ++++++
 soltools/Executable_javadep.mk          |    6 ++++++
 soltools/Executable_makedepend.mk       |    8 ++++----
 5 files changed, 28 insertions(+), 4 deletions(-)

New commits:
commit e292cb0df0bd4de5804f875a68f9075e7129ebd4
Author: David Tardon <dtar...@redhat.com>
Date:   Wed Oct 3 08:51:34 2012 +0200

    nearly all soltools executables need unistd.h
    
    Change-Id: I0177f624951943d1f241d395a38f13211a3ff9ef

diff --git a/soltools/Executable_adjustvisibility.mk 
b/soltools/Executable_adjustvisibility.mk
index 6a8ce61..0e98c34 100644
--- a/soltools/Executable_adjustvisibility.mk
+++ b/soltools/Executable_adjustvisibility.mk
@@ -9,6 +9,12 @@
 
 $(eval $(call gb_Executable_Executable,adjustvisibility))
 
+ifeq ($(COM),MSC)
+$(eval $(call gb_Executable_use_packages,adjustvisibility,\
+    soltools_inc \
+))
+endif
+
 $(eval $(call gb_Executable_add_exception_objects,adjustvisibility,\
     soltools/adjustvisibility/adjustvisibility \
 ))
diff --git a/soltools/Executable_checkdll.mk b/soltools/Executable_checkdll.mk
index 45e1824..de9ccbb 100644
--- a/soltools/Executable_checkdll.mk
+++ b/soltools/Executable_checkdll.mk
@@ -9,6 +9,12 @@
 
 $(eval $(call gb_Executable_Executable,checkdll))
 
+ifeq ($(COM),MSC)
+$(eval $(call gb_Executable_use_packages,checkdll,\
+    soltools_inc \
+))
+endif
+
 $(eval $(call gb_Executable_add_cobjects,checkdll,\
     soltools/checkdll/checkdll \
 ))
diff --git a/soltools/Executable_cpp.mk b/soltools/Executable_cpp.mk
index 29fb1f8..f0d3d11 100644
--- a/soltools/Executable_cpp.mk
+++ b/soltools/Executable_cpp.mk
@@ -9,6 +9,12 @@
 
 $(eval $(call gb_Executable_Executable,cpp))
 
+ifeq ($(COM),MSC)
+$(eval $(call gb_Executable_use_packages,cpp,\
+    soltools_inc \
+))
+endif
+
 $(eval $(call gb_Executable_add_cobjects,cpp,\
     soltools/cpp/_cpp \
     soltools/cpp/_eval \
diff --git a/soltools/Executable_javadep.mk b/soltools/Executable_javadep.mk
index a0fc036..2a44a87 100644
--- a/soltools/Executable_javadep.mk
+++ b/soltools/Executable_javadep.mk
@@ -9,6 +9,12 @@
 
 $(eval $(call gb_Executable_Executable,javadep))
 
+ifeq ($(COM),MSC)
+$(eval $(call gb_Executable_use_packages,javadep,\
+    soltools_inc \
+))
+endif
+
 $(eval $(call gb_Executable_add_cobjects,javadep,\
     soltools/javadep/javadep \
 ))
commit 0683c2f429f4729db06e68b162eeb0d198ae3cad
Author: David Tardon <dtar...@redhat.com>
Date:   Wed Oct 3 08:48:04 2012 +0200

    dep on soltools_inc is only for windows
    
    Change-Id: I2f8b89573ad91477c76827d2697f0c74a14d4b8b

diff --git a/soltools/Executable_makedepend.mk 
b/soltools/Executable_makedepend.mk
index 96a3682..c3b7d2f 100644
--- a/soltools/Executable_makedepend.mk
+++ b/soltools/Executable_makedepend.mk
@@ -13,10 +13,6 @@ $(eval $(call 
gb_Executable_add_exception_objects,makedepend,\
     soltools/mkdepend/collectdircontent \
 ))
 
-$(eval $(call gb_Executable_use_package,makedepend,\
-    soltools_inc \
-)) 
-
 $(eval $(call gb_Executable_add_defs,makedepend,\
     -DNO_X11 \
     -DXP_PC \
@@ -24,6 +20,10 @@ $(eval $(call gb_Executable_add_defs,makedepend,\
 ))
 
 ifeq ($(COM),MSC)
+$(eval $(call gb_Executable_use_packages,makedepend,\
+    soltools_inc \
+))
+
 $(eval $(call gb_Executable_add_defs,makedepend,\
     -wd4100 \
     -wd4131 \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits