Changeset 1900
- Timestamp:
- 03/31/08 08:02:15 (9 months ago)
- Location:
- branches/c08_branch
- Files:
-
- 6 removed
- 1 modified
-
library (deleted)
-
source/compiler_tests (deleted)
-
source/Makefile (modified) (6 diffs)
-
source/TestAutoVec.cpp (deleted)
-
source/TestFlexArr.cpp (deleted)
-
source/TestMain.cpp (deleted)
-
source/TestMultiArr.cpp (deleted)
Legend:
- Unmodified
- Added
- Removed
-
branches/c08_branch/source/Makefile
r1898 r1900 12 12 13 13 main := maincl.cpp 14 fullsource := ${notdir ${wildcard ${SRCDIR}/*.cpp}} 15 source := ${filter-out Test%,${fullsource}} 16 testsource := ${filter Test%,${fullsource}} 14 source := ${notdir ${wildcard ${SRCDIR}/*.cpp}} 17 15 libsource := ${filter-out ${main},${source}} 18 16 includes := ${notdir ${wildcard ${SRCDIR}/*.h}} 19 17 objects := ${source:.cpp=.o} 20 18 libobjects := ${libsource:.cpp=.o} 21 testobjects := ${testsource:.cpp=.o}22 19 23 20 # include a configuration file if one exists (or carry on without … … 33 30 CXXDEPEND = g++ 34 31 35 .PHONY: clean distclean depend test valgrind-test32 .PHONY: clean distclean depend 36 33 37 34 # DEP_GOALS will be an empty string for targets that don't need Makefile.dep … … 98 95 rm -f libcloudy.a 99 96 rm -f cloudy.exe 100 rm -f runtests.exe101 97 102 98 distclean : … … 106 102 rm -f libcloudy.a 107 103 rm -f cloudy.exe 108 rm -f runtests.exe109 104 rm -f Makefile.dep 110 105 rm -f ${SRCDIR}/Makefile.conf 111 rm -rf lib112 rm -rf include113 cd ${SRCDIR}/../library/UnitTest++ && $(MAKE) clean114 106 115 107 # ${source} ${includes} … … 118 110 @cd ${SRCDIR}; \ 119 111 ${CXXDEPEND} -MM -DMM ${CXXDEFINES} ${source} | sed "s/${presource}/${substname}/" > $(PWD)/Makefile.dep; \ 120 ${CXXDEPEND} -MM -DMM ${CXXDEFINES} ${testsource} | sed "s/${presource}/${substname}/" >> $(PWD)/Makefile.dep; \121 112 ${CXXDEPEND} -MM -DMM ${CXXDEFINES} ${presource} | sed 's/\.o:/.h.gch:/' >> $(PWD)/Makefile.dep; 122 113 … … 131 122 ${CXX} ${CXXFLAGS} -o $@ $< 132 123 133 test: runtests.exe134 ./runtests.exe135 136 valgrind-test: runtests.exe137 valgrind --leak-check=full --track-fds=yes ./runtests.exe138 139 runtests.exe: ${testobjects} libcloudy.a140 ${CXX} ${CXXFLAGS} -o $@ ${filter-out %.a, $^} \141 ${LDFLAGS} -L. -lcloudy -Llib -lUnitTest++ ${LDLIBS}142 143 ${testobjects}: CXXFLAGS += -I${SRCDIR}/include/UnitTest++144 145 ${testobjects}: lib/libUnitTest++.a146 147 lib/libUnitTest++.a:148 cd ${SRCDIR}/../library/UnitTest++; \149 $(MAKE) clean; $(MAKE) CC=${CXX} CCFLAGS="${CXXFLAGS}"; \150 mkdir -p ${PWD}/lib ${PWD}/include ${PWD}/include/UnitTest++ \151 ${PWD}/include/UnitTest++/Posix ${PWD}/include/UnitTest++/Win32; \152 cp src/*.h ${PWD}/include/UnitTest++; \153 cp src/Win32/*.h ${PWD}/include/UnitTest++/Win32; \154 cp src/Posix/*.h ${PWD}/include/UnitTest++/Posix; \155 cp libUnitTest++.a ${PWD}/lib/156 157 124 # only include Makefile.dep when we really need it, this prevents unnecessary builds of Makefile.dep 158 125 ifneq (${DEP_GOALS},)
