diff options
| author | Amitha Perera <perera@cs.rpi.edu> | 2001-06-12 10:45:41 -0400 |
|---|---|---|
| committer | Amitha Perera <perera@cs.rpi.edu> | 2001-06-12 10:45:41 -0400 |
| commit | 46aa1cb9c4e85564435ae78ff1b0c239301a717a (patch) | |
| tree | a8c601ac8e55f29d86e7c8edcf095e86bd5e2ce4 | |
| parent | ff529aa8611ca8c4f65aa837685c7d18a9d5cfd7 (diff) | |
| download | cmake-46aa1cb9c4e85564435ae78ff1b0c239301a717a.tar.gz | |
BUG: There was no dependency for library targets on their required libraries.
(Hopefully there aren't any cyclic dependencies for libraries.)
CMAKE_SHLIB_LINK is now used for executable targets.
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index 333da6380b..939eef9098 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -440,9 +440,9 @@ void cmUnixMakefileGenerator::OutputTargets(std::ostream& fout) fout << std::endl; fout << "lib" << l->first << "$(SHLIB_SUFFIX): ${" << - l->first << "_SRC_OBJS} \n"; + l->first << "_SRC_OBJS} ${CMAKE_DEPEND_LIBS}\n"; fout << "\trm -f lib" << l->first << "$(SHLIB_SUFFIX)\n"; - fout << "\t$(CMAKE_CXX_COMPILER) ${CMAKE_SHLIB_LINK_FLAGS} ${CMAKE_CXX_FLAGS} ${CMAKE_SHLIB_BUILD_FLAGS} -o \\\n"; + fout << "\t$(CMAKE_CXX_COMPILER) ${CMAKE_SHLIB_LINK_FLAGS} ${CMAKE_SHLIB_BUILD_FLAGS} ${CMAKE_CXX_FLAGS} -o \\\n"; fout << "\t lib" << l->first << "$(SHLIB_SUFFIX) \\\n"; fout << "\t ${" << l->first << "_SRC_OBJS} "; @@ -454,7 +454,7 @@ void cmUnixMakefileGenerator::OutputTargets(std::ostream& fout) { fout << l->first << ": ${" << l->first << "_SRC_OBJS} ${CMAKE_DEPEND_LIBS}\n"; - fout << "\t${CMAKE_CXX_COMPILER} ${CMAKE_CXXFLAGS} ${" << + fout << "\t${CMAKE_CXX_COMPILER} ${CMAKE_SHLIB_LINK_FLAGS} ${CMAKE_CXXFLAGS} ${" << l->first << "_SRC_OBJS} "; this->OutputLinkLibraries(fout, NULL,l->second); fout << " -o " << l->first << "\n\n"; |