From 3b0632ae75c18be4ef2457b5016d794a65e9e48d Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Tue, 2 Aug 2005 11:06:16 -0400
Subject: [PATCH] FIX: fix bad depend info and COMPILE_FLAGS problem and remove
 extra cerr calls

---
 Source/cmGlobalUnixMakefileGenerator3.cxx | 14 ++++++++++----
 Source/cmLocalUnixMakefileGenerator3.cxx  |  4 +---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 6684be19c..596ce9725 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -349,10 +349,16 @@ void cmGlobalUnixMakefileGenerator3
     for (cmTargets::iterator l = lg->GetMakefile()->GetTargets().begin();
          l != lg->GetMakefile()->GetTargets().end(); l++)
       {
-      std::string tname = lg->GetRelativeTargetDirectory(l->second);
-      tname += "/DependInfo.cmake";
-      cmSystemTools::ConvertToUnixSlashes(tname);
-      cmakefileStream << "  \"" << tname.c_str() << "\"\n";
+      if((l->second.GetType() == cmTarget::EXECUTABLE) ||
+         (l->second.GetType() == cmTarget::STATIC_LIBRARY) ||
+         (l->second.GetType() == cmTarget::SHARED_LIBRARY) ||
+         (l->second.GetType() == cmTarget::MODULE_LIBRARY) )
+        {
+        std::string tname = lg->GetRelativeTargetDirectory(l->second);
+        tname += "/DependInfo.cmake";
+        cmSystemTools::ConvertToUnixSlashes(tname);
+        cmakefileStream << "  \"" << tname.c_str() << "\"\n";
+        }
       }
     }
   cmakefileStream << "  )\n";
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index e952d3b48..e96ed9b54 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -521,7 +521,7 @@ cmLocalUnixMakefileGenerator3
                  (target.GetType() == cmTarget::MODULE_LIBRARY));
   if(shared)
     {
-    flags += "-D";
+    flags += " -D";
     if(const char* custom_export_name = target.GetProperty("DEFINE_SYMBOL"))
       {
       flags += custom_export_name;
@@ -543,8 +543,6 @@ cmLocalUnixMakefileGenerator3
   // Add include directory flags.
   this->AppendFlags(flags, this->GetIncludeFlags(lang));
   
-  std::cerr << "Have total flags: " << flags << std::endl;
-
   // Get the output paths for source and object files.
   std::string sourceFile = source.GetFullPath();
   if(m_UseRelativePaths)