projects
/
physics.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5a87de4
)
changed Makefile to copy more file to bin directories
author
Patrik Gornicz
<Gornicz.P@gmail.com>
Tue, 21 Apr 2009 01:53:03 +0000
(21:53 -0400)
committer
Patrik Gornicz
<Gornicz.P@gmail.com>
Tue, 21 Apr 2009 01:53:03 +0000
(21:53 -0400)
Makefile
patch
|
blob
|
blame
|
history
diff --git
a/Makefile
b/Makefile
index
e61452c
..
88dfc85
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-30,14
+30,27
@@
include ${SRCSDIR}${DIRMK}
WORKINGDIR := bind/
WORKINGDIR := bind/
-CFGDIRNAME := configs/
-SRCCFGDIR := ${CFGDIRNAME}
-DSTCFGDIR := ${WORKINGDIR}${CFGDIRNAME}
+CFGDIRNAME
:= configs/
+SRCCFGDIR
:= ${CFGDIRNAME}
+DSTCFGDIR
:= ${WORKINGDIR}${CFGDIRNAME}
CFGS := # := start
CFGS += keys.cfg
CFGS := $(addprefix ${DSTCFGDIR},${CFGS})
CFGS := # := start
CFGS += keys.cfg
CFGS := $(addprefix ${DSTCFGDIR},${CFGS})
+SRCLIBSDIR := libs/
+DSTLIBSDIR := ${WORKINGDIR}
+
+LIBSTXT := # := start
+LIBSTXT += COPYING-SDL
+LIBSTXT += README-SDL
+LIBSTXT += VERSION-SDL
+LIBSTXT := $(addprefix ${DSTLIBSDIR},${LIBSTXT})
+
+LIBSCPY := # := start
+LIBSCPY += libSDL.so
+LIBSCPY := $(addprefix ${DSTLIBSDIR},${LIBSCPY})
+
TARGETNAME := run_physics
TARGETTMP := ${OBJSDIR}${TARGETNAME}
TARGET := ${WORKINGDIR}${TARGETNAME}
TARGETNAME := run_physics
TARGETTMP := ${OBJSDIR}${TARGETNAME}
TARGET := ${WORKINGDIR}${TARGETNAME}
@@
-66,7
+79,10
@@
else
endif
.PHONY: all
endif
.PHONY: all
-all: ${TARGET} ${CFGS}
+all: ${TARGET} ${CFGS} ${LIBSTXT} ${LIBSCPY}
+
+# cause the fancy $$ directory rules to work out
+.SECONDEXPANSION:
# how to link the main target
${TARGETTMP}: ${OBJS}
# how to link the main target
${TARGETTMP}: ${OBJS}
@@
-78,16
+94,21
@@
${TARGET}: ${TARGETTMP} | ${WORKINGDIR}
${Q1}${PRNTFMT} "cp" "$@"
${Q2}cp $< $@
${Q1}${PRNTFMT} "cp" "$@"
${Q2}cp $< $@
+# rule to copy the config files into the working directory
+${DSTCFGDIR}%.cfg: ${SRCCFGDIR}%.cfg | $$(dir $$@)
+ ${Q1}${PRNTFMT} "cp" "$@"
+ ${Q2}cp $< $@
+
+# rule to copy the library files into the working directory
+${DSTLIBSDIR}%: ${SRCLIBSDIR}% | $$(dir $$@)
+ ${Q1}${PRNTFMT} "cp" "$@"
+ ${Q2}cp $< $@
+
# how to make a directory
${BLDDIRS}:
${Q1}${PRNTFMT} "mkdir" "$@"
${Q2}mkdir -p $@
# how to make a directory
${BLDDIRS}:
${Q1}${PRNTFMT} "mkdir" "$@"
${Q2}mkdir -p $@
-#${SRCSDIR}%.cpp: ${SRCSDIR}%.h
-
-# cause the below directory rules to work out
-.SECONDEXPANSION:
-
# rule to make an object file from a .cpp
${OBJSDIR}%.o: ${SRCSDIR}%.cpp | $$(dir $$@)
${Q1}${PRNTFMT} "${CXX}" "$@"
# rule to make an object file from a .cpp
${OBJSDIR}%.o: ${SRCSDIR}%.cpp | $$(dir $$@)
${Q1}${PRNTFMT} "${CXX}" "$@"
@@
-101,16
+122,16
@@
${DEPSDIR}%.d: ${SRCSDIR}%.cpp | $$(dir $$@)
${Q2}${CXX} -MM ${CXXFLAGS} $< -I "${INCDIRS}" | \
sed 's/\(^.*\):/$(subst /,\/,${OBJSDIR}\1 $@):/' > $@
${Q2}${CXX} -MM ${CXXFLAGS} $< -I "${INCDIRS}" | \
sed 's/\(^.*\):/$(subst /,\/,${OBJSDIR}\1 $@):/' > $@
-# rule to copy the config files into the working directory
-${DSTCFGDIR}%.cfg: ${SRCCFGDIR}%.cfg | $$(dir $$@)
- ${Q1}${PRNTFMT} "cp" "$@"
- ${Q2}cp $< $@
-
-.PHONY: cleantargets
-cleantargets:
- ${Q1}${PRNTFMT} "rm" "${TARGET} ${TARGETTMP}"
+.PHONY: cleantarget
+cleantarget:
+ ${Q1}${PRNTFMT} "rm" "${TARGET}"
${Q2}rm -f ${TARGET}
${Q2}rm -f ${TARGET}
+.PHONY: cleanbin
+cleanbin:
+ ${Q1}${PRNTFMT} "rm" "${WORKINGDIR}"
+ ${Q2}rm -rf ${WORKINGDIR}
+
.PHONY: cleanobjs
cleanobjs:
${Q1}${PRNTFMT} "rm" "${OBJSDIR}"
.PHONY: cleanobjs
cleanobjs:
${Q1}${PRNTFMT} "rm" "${OBJSDIR}"
@@
-122,10
+143,10
@@
cleandeps:
${Q2}rm -rf ${DEPSDIR}
.PHONY: clean
${Q2}rm -rf ${DEPSDIR}
.PHONY: clean
-clean: clean
targets clean
objs
+clean: cleanobjs
.PHONY: cleanall
.PHONY: cleanall
-cleanall: clean cleandeps
+cleanall: clean clean
bin clean
deps
.PHONY: gitclean
gitclean:
.PHONY: gitclean
gitclean:
@@
-170,6
+191,7
@@
prof: run
MINGMAKEARGS := "LIBGL := -lopengl32 -lglu32" \
"LIBSDL := `/usr/mingw32/bin/sdl-config --libs`" \
MINGMAKEARGS := "LIBGL := -lopengl32 -lglu32" \
"LIBSDL := `/usr/mingw32/bin/sdl-config --libs`" \
+ "LIBSCPY := $(addprefix ${DSTLIBSDIR},SDL.dll)" \
"CXXFLAGS := ${OPTFLAGS}" \
"CXX := mingw32-g++" \
"OBJSDIR := objs-mingw32/" \
"CXXFLAGS := ${OPTFLAGS}" \
"CXX := mingw32-g++" \
"OBJSDIR := objs-mingw32/" \