From bcd46b8f4ee0d9b5ed6d983793f962ff66efa3aa Mon Sep 17 00:00:00 2001 From: Patrik Gornicz Date: Mon, 20 Apr 2009 22:38:43 -0400 Subject: [PATCH] changed cleaning logic again, added copying of COPYING --- Makefile | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index e85d491..1b6a3c6 100644 --- a/Makefile +++ b/Makefile @@ -41,15 +41,22 @@ CFGS := $(addprefix ${DSTCFGDIR},${CFGS}) SRCLIBSDIR := libs/ DSTLIBSDIR := ${WORKINGDIR} -LIBSTXT := # := start -LIBSTXT += COPYING-SDL -LIBSTXT += README-SDL -LIBSTXT += VERSION-SDL -LIBSTXT := $(addprefix ${DSTLIBSDIR},${LIBSTXT}) +LIBSTXT := # := start +LIBSTXT += COPYING-SDL +LIBSTXT += README-SDL +LIBSTXT += VERSION-SDL +LIBSTXT := $(addprefix ${DSTLIBSDIR},${LIBSTXT}) -LIBSCPY := # := start -LIBSCPY += libSDL.so -LIBSCPY := $(addprefix ${DSTLIBSDIR},${LIBSCPY}) +LIBSCPY := # := start +LIBSCPY += libSDL.so +LIBSCPY := $(addprefix ${DSTLIBSDIR},${LIBSCPY}) + +SRCTXTDIR := +DSTTXTDIR := ${WORKINGDIR} + +TXT := # := start +TXT += COPYING +TXT := $(addprefix ${DSTTXTDIR},${TXT}) TARGETNAME := run_physics TARGETTMP := ${OBJSDIR}${TARGETNAME} @@ -79,7 +86,7 @@ else endif .PHONY: all -all: ${TARGET} ${CFGS} ${LIBSTXT} ${LIBSCPY} +all: ${TARGET} ${CFGS} ${LIBSTXT} ${LIBSCPY} ${TXT} # cause the fancy $$ directory rules to work out .SECONDEXPANSION: @@ -95,7 +102,7 @@ ${TARGET}: ${TARGETTMP} | ${WORKINGDIR} ${Q2}cp $< $@ # rule to copy the config files into the working directory -${DSTCFGDIR}%.cfg: ${SRCCFGDIR}%.cfg | $$(dir $$@) +${DSTCFGDIR}%: ${SRCCFGDIR}% | $$(dir $$@) ${Q1}${PRNTFMT} "cp" "$@" ${Q2}cp $< $@ @@ -104,6 +111,11 @@ ${DSTLIBSDIR}%: ${SRCLIBSDIR}% | $$(dir $$@) ${Q1}${PRNTFMT} "cp" "$@" ${Q2}cp $< $@ +# rule to copy the library files into the working directory +${DSTTXTDIR}%: ${SRCTXTDIR}% | $$(dir $$@) + ${Q1}${PRNTFMT} "cp" "$@" + ${Q2}cp $< $@ + # how to make a directory ${BLDDIRS}: ${Q1}${PRNTFMT} "mkdir" "$@" @@ -122,11 +134,6 @@ ${DEPSDIR}%.d: ${SRCSDIR}%.cpp | $$(dir $$@) ${Q2}${CXX} -MM ${CXXFLAGS} $< -I "${INCDIRS}" | \ sed 's/\(^.*\):/$(subst /,\/,${OBJSDIR}\1 $@):/' > $@ -.PHONY: cleantarget -cleantarget: - ${Q1}${PRNTFMT} "rm" "${TARGET}" - ${Q2}rm -f ${TARGET} - .PHONY: cleanbin cleanbin: ${Q1}${PRNTFMT} "rm" "${WORKINGDIR}" @@ -201,7 +208,7 @@ MINGMAKEARGS := "LIBGL := -lopengl32 -lglu32" \ .PHONY: mingw32 mingw32: ${Q1}${PRNTFMT} "make" "mingw32" - ${Q2}${MAKE} ${MINGMAKEARGS} clean + ${Q2}${MAKE} ${MINGMAKEARGS} cleanbin cleanobjs ${Q2}${MAKE} ${MINGMAKEARGS} all FINALMAKEARGS := "CXXFLAGS := ${OPTFLAGS}" \ @@ -211,7 +218,7 @@ FINALMAKEARGS := "CXXFLAGS := ${OPTFLAGS}" \ .PHONY: final final: ${Q1}${PRNTFMT} "make" "final" - ${Q2}${MAKE} ${FINALMAKEARGS} clean + ${Q2}${MAKE} ${FINALMAKEARGS} cleanbin cleanobjs ${Q2}${MAKE} ${FINALMAKEARGS} all -- 2.10.2