From dc49d6db1227bfbaaaee60a30e64b88db6140682 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <b_michaelsen@openoffice.org>
Date: Wed, 4 Aug 2010 13:47:50 +0200
Subject: [PATCH] gnumake2: gb_CObject__command_dep is not platform dependant
 anymore

---
 solenv/gbuild/LinkTarget.mk       | 11 ++++++++++-
 solenv/gbuild/platform/linux.mk   |  5 -----
 solenv/gbuild/platform/macosx.mk  |  5 -----
 solenv/gbuild/platform/solaris.mk |  5 -----
 solenv/gbuild/platform/windows.mk |  9 ---------
 5 files changed, 10 insertions(+), 25 deletions(-)
 mode change 100644 => 100755 solenv/gbuild/platform/linux.mk
 mode change 100644 => 100755 solenv/gbuild/platform/macosx.mk
 mode change 100644 => 100755 solenv/gbuild/platform/solaris.mk

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 0bc6da76913e..f022d3926067 100755
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -33,7 +33,16 @@ gb_CObject_REPOS := $(gb_REPOS)
 gb_CObject_get_source = $(1)/$(2).c
 # defined by platform
 #  gb_CObject__command
-#  gb_CObject__command_dep
+
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_CObject__command_dep
+mkdir -p $(dir $(1)) && \
+    echo '$(call gb_CObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
+
+endef
+else
+gb_CObject__command_dep =
+endif
 
 define gb_CObject__rules
 $$(call gb_CObject_get_target,%) : $$(call gb_CObject_get_source,$(1),%)
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
old mode 100644
new mode 100755
index 1371ed27ea43..909fa532691d
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -137,11 +137,6 @@ $(call gb_Helper_abbreviate_dirs,\
         $(6))
 endef
 
-define gb_CObject__command_dep
-mkdir -p $(dir $(1)) && \
-    echo '$(call gb_CObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
-endef
-
 
 # CxxObject class
 
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
old mode 100644
new mode 100755
index 029f32cfa6fd..5c78c664ece9
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -152,11 +152,6 @@ $(call gb_Helper_abbreviate_dirs,\
         $(6))
 endef
 
-define gb_CObject__command_dep
-mkdir -p $(dir $(1)) && \
-    echo '$(call gb_CObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
-endef
-
 
 # CxxObject class
 
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
old mode 100644
new mode 100755
index 6fca4deae44f..bb6d79bbdac2
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -135,11 +135,6 @@ $(call gb_Helper_abbreviate_dirs,\
         $(6))
 endef
 
-define gb_CObject__command_dep
-mkdir -p $(dir $(1)) && \
-    echo '$(call gb_CObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
-endef
-
 
 # CxxObject class
 
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 248f9c80cc69..00b94273b64a 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -231,15 +231,6 @@ $(call gb_Helper_abbreviate_dirs_native,\
 $(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
 endef
 
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_CObject__command_dep
-mkdir -p $(dir $(1)) && \
-    echo '$(call gb_CObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
-
-endef
-else
-gb_CObject__command_dep =
-endif
 
 
 # CxxObject class