Revert "Fixed (ICE-3792) - dependencies in the repository are very crappy"

This reverts commit 201d395c7186e50d195672db7b472989783826cb.

Conflicts:
	cpp/config/Make.rules
	cpp/test/Ice/Makefile.mak

1 files changed, 6 insertions, 12 deletions

diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index c8ce5c7ac47..07519ca2c34 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 string& outputDir, const vector<string>& includePaths,
+Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<string>& includePaths,
                                                const std::string& extraArgs, const string& cppSourceExt,
                                                const string& optValue)
 {
@@ -378,17 +378,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const string& outp
     string result;
     if(lang != JavaXML)
     {
-        if(!outputDir.empty())
-        {
-            result += outputDir + IceUtilInternal::separator;
-        }
-
-        if(lang == Python && !pyPrefix.empty())
-        {
-            result += pyPrefix;
-        }
-
-        result += unprocessed.substr(0, pos);
+        result = unprocessed.substr(0, pos);
     }
 
     vector<string> fullIncludePaths;
@@ -589,6 +579,10 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const string& outp
             //
             // 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)
             {