diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2000-08-31 13:36:52 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2000-08-31 13:36:52 (GMT) |
| commit | e06a538a30cda12672c76775d1dc9d78a9ca0913 (patch) | |
| tree | 17dfe9a3bd7309b621d27a6499bfa5c561a0113f /Source | |
| parent | e644c825fb3b151cdf924a94e27acdf7cb2af11c (diff) | |
| download | CMake-e06a538a30cda12672c76775d1dc9d78a9ca0913.zip CMake-e06a538a30cda12672c76775d1dc9d78a9ca0913.tar.gz CMake-e06a538a30cda12672c76775d1dc9d78a9ca0913.tar.bz2 | |
ENH: fix for SGI make
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Makefile.in | 3 | ||||
| -rw-r--r-- | Source/cmUnixMakefile.cxx | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Source/Makefile.in b/Source/Makefile.in index ecd0171..0a51b1a 100644 --- a/Source/Makefile.in +++ b/Source/Makefile.in @@ -6,9 +6,8 @@ VPATH = @srcdir@ # This will cause an infinite loop as it will add the # rule for changing into this directory -@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_OBJ_DIR@/CMake/CMakeRules.make@MAKEQUOTE@ -CMAKE = @MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_OBJ_DIR@/CMake/CMakeVariables.make@MAKEQUOTE@ +@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_OBJ_DIR@/CMake/CMakeSimpleRules.make@MAKEQUOTE@ OBJS = \ cmClassFile.o \ diff --git a/Source/cmUnixMakefile.cxx b/Source/cmUnixMakefile.cxx index 4628e9e..7feceaf 100644 --- a/Source/cmUnixMakefile.cxx +++ b/Source/cmUnixMakefile.cxx @@ -107,7 +107,12 @@ void cmUnixMakefile::OutputMakefile(const char* file) { if(!m_Classes[i].m_AbstractClass && !m_Classes[i].m_HeaderFileOnly) { - fout << m_Classes[i].m_ClassName << " \\\n"; + fout << m_Classes[i].m_ClassName; + if(i < m_Classes.size()-1) + { + fout << " \\"; + } + fout << "\n"; } } fout << "\n"; @@ -153,6 +158,8 @@ void cmUnixMakefile::OutputMakefile(const char* file) std::string subdir = FixDirectoryName(m_SubDirectories[i].c_str()); fout << "build_" << subdir.c_str() << ":\n"; fout << "\tcd " << m_SubDirectories[i].c_str() + << "; ${MAKE} -${MAKEFLAGS} CMakeTargets.make\n"; + fout << "\tcd " << m_SubDirectories[i].c_str() << "; ${MAKE} -${MAKEFLAGS} all\n\n"; fout << "clean_" << subdir.c_str() << ": \n"; |