Improve bootstrape for unix

1 files changed, 65 insertions, 44 deletions

diff --git a/Source/bootstrap/Makefile.in b/Source/bootstrap/Makefile.in
index a7d4737..01c7523 100644
--- a/Source/bootstrap/Makefile.in
+++ b/Source/bootstrap/Makefile.in
@@ -1,57 +1,78 @@
 srcdir        = @srcdir@/..
-VPATH         = @srcdir@/..
+#VPATH         = @srcdir@
 
 CMAKE_CONFIG_DIR = @CMAKE_CONFIG_DIR@
-CXX           = @CXX@
-CXXFLAGS      =  @CMAKE_ANSI_CXXFLAGS@ -DCMAKE_ROOT_DIR='"@CMAKE_ROOT_DIR@"' @CXXFLAGS@ -DCMAKE_HAS_AUTOCONF -I${CMAKE_CONFIG_DIR}/Source
+CXX              = @CXX@
+CXXFLAGS         = @CMAKE_ANSI_CXXFLAGS@ -DCMAKE_ROOT_DIR='"@CMAKE_ROOT_DIR@"' @CXXFLAGS@ \
+                   -DCMAKE_HAS_AUTOCONF -I${CMAKE_CONFIG_DIR}/Source
 
 .SUFFIXES: .cxx .java .class
 
 all: cmake
 
-.cxx.o:
-	${CXX} ${CXXFLAGS} -c $< -o $@
-
-
-OBJS = \
-cmake.o  \
-cmakewizard.o  \
-cmakemain.o \
-cmMakeDepend.o \
-cmMakefile.o \
-cmMakefileGenerator.o \
-cmRegularExpression.o \
-cmSourceFile.o \
-cmSystemTools.o \
-cmDirectory.o \
-cmUnixMakefileGenerator.o \
-cmCommands.o \
-cmTarget.o \
-cmCustomCommand.o \
-cmCacheManager.o \
-cmListFileCache.o \
-cmSourceGroup.o
-
-DEPENDS = ${CMAKE_CONFIG_DIR}/Source/cmConfigure.h
-
-cmCollectFlags.o : $(DEPENDS)
-cmake.o  : $(DEPENDS)
-cmakemain.o  : $(DEPENDS)
-cmMakeDepend.o : $(DEPENDS)
-cmMakefile.o : $(DEPENDS)
-cmMakefileGenerator.o : $(DEPENDS)
-cmAuxSourceDirectoryCommand.o : $(DEPENDS)
-cmRegularExpression.o : $(DEPENDS)
-cmSourceFile.o : $(DEPENDS)
-cmDirectory.o : $(DEPENDS)
-cmCustomCommand.o : $(DEPENDS)
-cmUnixMakefileGenerator.o : $(DEPENDS)
-cmCommands.o : $(DEPENDS) $(srcdir)/*Command*.cxx
-cmTarget.o : $(DEPENDS)
-cmCacheManager.o : $(DEPENDS)
-cmSourceGroup.o : $(DEPENDS)
+OBJS =						\
+cmCacheManager.o				\
+cmCommands.o					\
+cmCustomCommand.o				\
+cmDirectory.o					\
+cmListFileCache.o				\
+cmMakeDepend.o					\
+cmMakefile.o					\
+cmMakefileGenerator.o				\
+cmRegularExpression.o				\
+cmSourceFile.o					\
+cmSourceGroup.o					\
+cmSystemTools.o					\
+cmTarget.o					\
+cmUnixMakefileGenerator.o			\
+cmake.o						\
+cmakemain.o					\
+cmakewizard.o
 
+DEPENDS = ${CMAKE_CONFIG_DIR}/Source/cmConfigure.h Makefile
+
+cmCacheManager.o : ${srcdir}/cmCacheManager.cxx $(DEPENDS)
+	${CXX} ${CXXFLAGS} -c ${srcdir}/cmCacheManager.cxx -o cmCacheManager.o
+cmCommands.o : ${srcdir}/cmCommands.cxx $(DEPENDS) $(srcdir)/*Command*.cxx
+	${CXX} ${CXXFLAGS} -c ${srcdir}/cmCommands.cxx -o cmCommands.o
+cmCustomCommand.o : ${srcdir}/cmCustomCommand.cxx $(DEPENDS)
+	${CXX} ${CXXFLAGS} -c ${srcdir}/cmCustomCommand.cxx -o cmCustomCommand.o
+cmDirectory.o : ${srcdir}/cmDirectory.cxx $(DEPENDS)
+	${CXX} ${CXXFLAGS} -c ${srcdir}/cmDirectory.cxx -o cmDirectory.o
+cmListFileCache.o : ${srcdir}/cmListFileCache.cxx $(DEPENDS)
+	${CXX} ${CXXFLAGS} -c ${srcdir}/cmListFileCache.cxx -o cmListFileCache.o
+cmMakeDepend.o : ${srcdir}/cmMakeDepend.cxx $(DEPENDS)
+	${CXX} ${CXXFLAGS} -c ${srcdir}/cmMakeDepend.cxx -o cmMakeDepend.o
+cmMakefile.o : ${srcdir}/cmMakefile.cxx $(DEPENDS)
+	${CXX} ${CXXFLAGS} -c ${srcdir}/cmMakefile.cxx -o cmMakefile.o
+cmMakefileGenerator.o : ${srcdir}/cmMakefileGenerator.cxx $(DEPENDS)
+	${CXX} ${CXXFLAGS} -c ${srcdir}/cmMakefileGenerator.cxx -o cmMakefileGenerator.o
+cmRegularExpression.o : ${srcdir}/cmRegularExpression.cxx $(DEPENDS)
+	${CXX} ${CXXFLAGS} -c ${srcdir}/cmRegularExpression.cxx -o cmRegularExpression.o
+cmSourceFile.o : ${srcdir}/cmSourceFile.cxx $(DEPENDS)
+	${CXX} ${CXXFLAGS} -c ${srcdir}/cmSourceFile.cxx -o cmSourceFile.o
+cmSourceGroup.o : ${srcdir}/cmSourceGroup.cxx $(DEPENDS)
+	${CXX} ${CXXFLAGS} -c ${srcdir}/cmSourceGroup.cxx -o cmSourceGroup.o
+cmSystemTools.o : ${srcdir}/cmSystemTools.cxx $(DEPENDS)
+	${CXX} ${CXXFLAGS} -c ${srcdir}/cmSystemTools.cxx -o cmSystemTools.o
+cmTarget.o : ${srcdir}/cmTarget.cxx $(DEPENDS)
+	${CXX} ${CXXFLAGS} -c ${srcdir}/cmTarget.cxx -o cmTarget.o
+cmUnixMakefileGenerator.o : ${srcdir}/cmUnixMakefileGenerator.cxx $(DEPENDS)
+	${CXX} ${CXXFLAGS} -c ${srcdir}/cmUnixMakefileGenerator.cxx -o cmUnixMakefileGenerator.o
+cmake.o : ${srcdir}/cmake.cxx $(DEPENDS)
+	${CXX} ${CXXFLAGS} -c ${srcdir}/cmake.cxx -o cmake.o
+cmakemain.o : ${srcdir}/cmakemain.cxx $(DEPENDS)
+	${CXX} ${CXXFLAGS} -c ${srcdir}/cmakemain.cxx -o cmakemain.o
+cmakewizard.o : ${srcdir}/cmakewizard.cxx $(DEPENDS)
+	${CXX} ${CXXFLAGS} -c ${srcdir}/cmakewizard.cxx -o cmakewizard.o
 
 cmake: ${OBJS}
 	${CXX} ${OBJS} ${CXXFLAGS}  -o cmake
 
+.PHONY: clean
+
+clean: 
+	-rm -f *.o cmake
+
+distclean: clean
+	-rm -f Makefile