From 0283c37c76391bb7d6ff95970358eacc41a0e98a Mon Sep 17 00:00:00 2001 From: Will Schroeder Date: Thu, 18 Jan 2001 11:51:45 -0500 Subject: ERR:Oops, renamed back --- CMakeCommands.make.in | 42 ------------------------------------------ CMakeMaster.make.in | 2 +- CMakeRules.make.in | 42 ++++++++++++++++++++++++++++++++++++++++++ CMakeSimpleCommands.make.in | 15 --------------- CMakeSimpleRules.make.in | 15 +++++++++++++++ 5 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 CMakeCommands.make.in create mode 100644 CMakeRules.make.in delete mode 100644 CMakeSimpleCommands.make.in create mode 100644 CMakeSimpleRules.make.in diff --git a/CMakeCommands.make.in b/CMakeCommands.make.in deleted file mode 100644 index 472121f..0000000 --- a/CMakeCommands.make.in +++ /dev/null @@ -1,42 +0,0 @@ -# rules for building .o files from source files -@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_CONFIG_DIR@/CMake/CMakeSimpleCommands.make@MAKEQUOTE@ - -# -# Makefile for -# -#------------------------------------------------------------------------------ -# -all: CMakeTargets.make ${LOCAL_BUILD_TARGETS} ${BUILD_LIB_FILE} ${EXECUTABLES} ${SUBDIR_BUILD} ${CMAKE} - -#------------------------------------------------------------------------------ - -${CMAKE}: ${topdir}/CMake/Source/*.cxx ${topdir}/CMake/Source/*.h - cd ${CMAKE_CONFIG_DIR}/CMake/Source; ${MAKE} CMakeBuildTargets - -depend: ${CMAKE} ${SUBDIR_DEPEND} - ${MAKE} -${MAKEFLAGS} CMakeTargets.make - - -clean: ${SUBDIR_CLEAN} - rm -f ${SRC_OBJ} ${EXECUTABLES} - -CMakeTargets.make: ${CMAKE} ${srcdir}/CMakeLists.txt - ${CMAKE} ${srcdir}/CMakeLists.txt -S${currentdir} -H${topdir} -B${CMAKE_CONFIG_DIR} - -#------------------------------------------------------------------------------ -# rules for the normal library -# -lib${LIBRARY}.a: ${SRC_OBJ} ${KIT_OBJ} - ${AR} cr lib${LIBRARY}.a ${KIT_OBJ} - ${RANLIB} lib$(LIBRARY).a - - -lib$(LIBRARY)$(SHLIB_SUFFIX): ${KIT_OBJ} - rm -f lib$(LIBRARY)$(SHLIB_SUFFIX) - $(CXX) ${CXX_FLAGS} ${CMAKE_SHLIB_BUILD_FLAGS} -o \ - lib$(LIBRARY)$(SHLIB_SUFFIX) \ - ${KIT_OBJ} ${SHLIB_LD_LIBS} - -install: ${BUILD_LIB_FILE} - @echo "Installing ${BUILD_LIB_FILE}" - ${INSTALL} -m 755 $(BUILD_LIB_FILE) $(LIB_INSTALL_DIR)/$(BUILD_LIB_FILE) diff --git a/CMakeMaster.make.in b/CMakeMaster.make.in index f5dc901..404b73a 100644 --- a/CMakeMaster.make.in +++ b/CMakeMaster.make.in @@ -16,6 +16,6 @@ CMAKE_LIB_EXT = @CMAKE_LIB_EXT@ #------------------------------------------------------------------------------ # Include General Build Rules -@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_CONFIG_DIR@/CMake/CMakeCommands.make@MAKEQUOTE@ +@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_CONFIG_DIR@/CMake/CMakeRules.make@MAKEQUOTE@ diff --git a/CMakeRules.make.in b/CMakeRules.make.in new file mode 100644 index 0000000..bfecbf3 --- /dev/null +++ b/CMakeRules.make.in @@ -0,0 +1,42 @@ +# rules for building .o files from source files +@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_CONFIG_DIR@/CMake/CMakeSimpleRules.make@MAKEQUOTE@ + +# +# Makefile for +# +#------------------------------------------------------------------------------ +# +all: CMakeTargets.make ${LOCAL_BUILD_TARGETS} ${BUILD_LIB_FILE} ${EXECUTABLES} ${SUBDIR_BUILD} ${CMAKE} + +#------------------------------------------------------------------------------ + +${CMAKE}: ${topdir}/CMake/Source/*.cxx ${topdir}/CMake/Source/*.h + cd ${CMAKE_CONFIG_DIR}/CMake/Source; ${MAKE} CMakeBuildTargets + +depend: ${CMAKE} ${SUBDIR_DEPEND} + ${MAKE} -${MAKEFLAGS} CMakeTargets.make + + +clean: ${SUBDIR_CLEAN} + rm -f ${SRC_OBJ} ${EXECUTABLES} + +CMakeTargets.make: ${CMAKE} ${srcdir}/CMakeLists.txt + ${CMAKE} ${srcdir}/CMakeLists.txt -S${currentdir} -H${topdir} -B${CMAKE_CONFIG_DIR} + +#------------------------------------------------------------------------------ +# rules for the normal library +# +lib${LIBRARY}.a: ${SRC_OBJ} ${KIT_OBJ} + ${AR} cr lib${LIBRARY}.a ${KIT_OBJ} + ${RANLIB} lib$(LIBRARY).a + + +lib$(LIBRARY)$(SHLIB_SUFFIX): ${KIT_OBJ} + rm -f lib$(LIBRARY)$(SHLIB_SUFFIX) + $(CXX) ${CXX_FLAGS} ${CMAKE_SHLIB_BUILD_FLAGS} -o \ + lib$(LIBRARY)$(SHLIB_SUFFIX) \ + ${KIT_OBJ} ${SHLIB_LD_LIBS} + +install: ${BUILD_LIB_FILE} + @echo "Installing ${BUILD_LIB_FILE}" + ${INSTALL} -m 755 $(BUILD_LIB_FILE) $(LIB_INSTALL_DIR)/$(BUILD_LIB_FILE) diff --git a/CMakeSimpleCommands.make.in b/CMakeSimpleCommands.make.in deleted file mode 100644 index cb95e29..0000000 --- a/CMakeSimpleCommands.make.in +++ /dev/null @@ -1,15 +0,0 @@ -# this file contains the most basic rules. This is used -# in the CMake/Source/Makefile.in to avoid infinite recursion -# in the rule for all: - -# 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 $@ diff --git a/CMakeSimpleRules.make.in b/CMakeSimpleRules.make.in new file mode 100644 index 0000000..cb95e29 --- /dev/null +++ b/CMakeSimpleRules.make.in @@ -0,0 +1,15 @@ +# this file contains the most basic rules. This is used +# in the CMake/Source/Makefile.in to avoid infinite recursion +# in the rule for all: + +# 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 $@ -- cgit v0.12