Commit e06a538a authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: fix for SGI make

parent e644c825
# set up make suffixes
.SUFFIXES: .cxx .java .class
#------------------------------------------------------------------------------
# rules for building .o files from source files
.c.o:
${CC} ${CC_FLAGS} -c $< -o $@
.cxx.o:
${CXX} ${CXX_FLAGS} -c $< -o $@
# include simple rules for building .o files
@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_OBJ_DIR@/CMake/CMakeSimpleRules.make@MAKEQUOTE@
#
# Makefile for Visualization Toolkit sources.
# Makefile for
#
#------------------------------------------------------------------------------
#
all: ${OBJ_SUB_DIRS} ${EXECUTABLES} ${SUBDIR_BUILD} ${BUILD_LIB_FILE} ${LOCAL_BUILD_TARGETS}
all: CMakeTargets.make ${OBJ_SUB_DIRS} ${EXECUTABLES} ${SUBDIR_BUILD} ${BUILD_LIB_FILE} ${LOCAL_BUILD_TARGETS} ${CMAKE}
#------------------------------------------------------------------------------
......@@ -27,7 +18,7 @@ depend: ${CMAKE}
clean: ${SUBDIR_CLEAN}
rm -f ${SRC_OBJ} ${ITK_EXECUTABLES}
rm -f ${SRC_OBJ} ${EXECUTABLES}
CMakeTargets.make: ${CMAKE} ${srcdir}/CMakeLists.txt
${CMAKE} ${srcdir}/CMakeLists.txt -S${srcdir} -I${srcdir} ${INCLUDE_FLAGS}
......
......@@ -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 \
......
......@@ -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";
......@@ -152,6 +157,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";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment