From 00dbbdfaeae1af7d7457329641bb0cf6e726ba3c Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Wed, 10 Sep 2014 17:36:20 +0200
Subject: Fixed (ICE-3792) - dependencies in the repository are very crappy

---
 cpp/src/Slice/Preprocessor.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'cpp/src/Slice/Preprocessor.cpp')

diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index 07519ca2c34..c8ce5c7ac47 100644
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -279,7 +279,7 @@ Slice::Preprocessor::preprocess(bool keepComments, const string& extraArgs)
 }
 
 bool
-Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<string>& includePaths,
+Slice::Preprocessor::printMakefileDependencies(Language lang, const string& outputDir, const vector<string>& includePaths,
                                                const std::string& extraArgs, const string& cppSourceExt,
                                                const string& optValue)
 {
@@ -378,7 +378,17 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
     string result;
     if(lang != JavaXML)
     {
-        result = unprocessed.substr(0, pos);
+        if(!outputDir.empty())
+        {
+            result += outputDir + IceUtilInternal::separator;
+        }
+
+        if(lang == Python && !pyPrefix.empty())
+        {
+            result += pyPrefix;
+        }
+
+        result += unprocessed.substr(0, pos);
     }
 
     vector<string> fullIncludePaths;
@@ -579,10 +589,6 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
             //
             // Change .o[bj] suffix to .py suffix.
             //
-            if(pyPrefix.size() != 0)
-            {
-                result = pyPrefix + result;
-            }
             string::size_type pos;
             if((pos = result.find(suffix)) != string::npos)
             {
-- 
cgit v1.2.3