From 3270752330a64428f77bd5a103e7d64486353176 Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Fri, 17 Oct 2014 23:49:00 +0200
Subject: Dependency fixes:   Add quotes to Windows Slice dependencies   Fix
 Cicular dependency issue with Make 3.82 included in rhel7,   C++ dependencies
 now are of type Foo.h: Foo.ice, we don't need   Foo.cpp as that always depend
 on Foo.h

---
 cpp/src/Slice/Preprocessor.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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

diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index a549d224a89..25eb99c26c7 100644
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -491,16 +491,14 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
         case CPlusPlus:
         {
             //
-            // Change .o[bj] suffix to the cpp source extension suffix.
+            // Change .o[bj] suffix to the h header extension suffix.
             //
             string::size_type pos = result.find(suffix);
             if(pos != string::npos)
             {
                 string name = result.substr(0, pos);
-                result.replace(0, pos + suffix.size() - 1, name + "." + cppSourceExt);
+                result.replace(0, pos + suffix.size() - 1, name + "." + cppHeaderExt);
 
-                result += "\n";
-                result += name + "." + cppHeaderExt + ": " + name + "." + cppSourceExt;
             }
             break;
         }
@@ -510,7 +508,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
         {
             //
             // We want to shift the files left one position, so that
-            // "x.cpp: x.ice y.ice" becomes "x.ice: y.ice".
+            // "x.h: x.ice y.ice" becomes "x.ice: y.ice".
             //
 
             //
-- 
cgit v1.2.3