X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=9deb3c6abfbcdde9aca42ff3a90a2f66eb589d95;hb=f5380bc68a49710df6c10b089da232afb791344e;hp=e85d49179edd376641dadac0050c343e56f5c10f;hpb=f1324fa6a23bcfc7b777c82bd7b7faec6bedb20e;p=physics.git

diff --git a/Makefile b/Makefile
index e85d491..9deb3c6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 
 LIBGL  := -lGL -lGLU
 LIBSDL := `sdl-config --libs`
-LIBS   := ${LIBSDL} ${LIBGL}
+LIBS   := ${LIBSDL} ${LIBGL} -lpg
 
 OPTFLAGS := -O2
 DBGFLAGS := -ggdb
@@ -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}
@@ -60,6 +67,7 @@ OBJSBLDDIRS := ${OBJSDIR} $(addprefix ${OBJSDIR},${DIRS})
 BLDDIRS     := ${OBJSBLDDIRS} ${DEPSBLDDIRS} ${WORKINGDIR} ${DSTCFGDIR}
 
 INCDIRS     := ${SRCSDIR}
+INCFLAGS    := $(addprefix -I, ${INCDIRS})
 
 
 PRNTFMT := printf "%-5s: %s\n"
@@ -79,7 +87,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 +103,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 +112,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" "$@"
@@ -112,21 +125,16 @@ ${BLDDIRS}:
 # rule to make an object file from a .cpp
 ${OBJSDIR}%.o: ${SRCSDIR}%.cpp | $$(dir $$@)
 	${Q1}${PRNTFMT} "${CXX}" "$@"
-	${Q2}${CXX} ${CXXFLAGS} -c -o $@ $< -I "${INCDIRS}"
+	${Q2}${CXX} ${CXXFLAGS} -c -o $@ $< ${INCFLAGS}
 
 # rule to make a depend file from a .cpp
 #   be clever and escape the / chars in file paths
 #   DON'T simply use another sed delimiter or it can't appear in the file paths
 ${DEPSDIR}%.d: ${SRCSDIR}%.cpp | $$(dir $$@)
 	${Q1}${PRNTFMT} "DEP" "$@"
-	${Q2}${CXX} -MM ${CXXFLAGS} $< -I "${INCDIRS}" | \
+	${Q2}${CXX} -MM ${CXXFLAGS} $< ${INCFLAGS} | \
 		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 +209,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 +219,7 @@ FINALMAKEARGS := "CXXFLAGS   := ${OPTFLAGS}" \
 .PHONY: final
 final:
 	${Q1}${PRNTFMT} "make" "final"
-	${Q2}${MAKE} ${FINALMAKEARGS} clean
+	${Q2}${MAKE} ${FINALMAKEARGS} cleanbin cleanobjs
 	${Q2}${MAKE} ${FINALMAKEARGS} all