removed all ../ entries and made a basic inc path (dependencies are currently broke)

[physics.git] / Makefile

diff --git a/Makefile b/Makefile
index e50347d..fe38d97 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -53,6 +53,8 @@ DEPSBLDDIRS := $(addprefix ${DEPSDIR},${DIRS})
 OBJSBLDDIRS := $(addprefix ${OBJSDIR},${DIRS})
 BLDDIRS     := ${OBJSBLDDIRS} ${DEPSBLDDIRS} ${WORKINGDIR} ${DSTCFGDIR}
 
+INCDIRS     := ${SRCSDIR}
+
 
 PRNTFMT := printf "%-5s: %s\n"
 
@@ -85,23 +87,27 @@ ${TARGET}: ${TARGETTMP} | ${WORKINGDIR}
 
 # how to make a directory
 ${BLDDIRS}:
+       ${Q1}${PRNTFMT} "mkdir" "$@"
        ${Q2}mkdir -p $@
 
+# cause the below directory rules to work out
+.SECONDEXPANSION:
+
 # rule to make an object file from a .cpp
-${OBJSDIR}%.o: ${SRCSDIR}%.cpp | ${OBJSBLDDIRS}
+${OBJSDIR}%.o: ${SRCSDIR}%.cpp | $$(dir $$@)
        ${Q1}${PRNTFMT} "${CXX}" "$@"
-       ${Q2}${CXX} ${CXXFLAGS} -c -o $@ $<
+       ${Q2}${CXX} ${CXXFLAGS} -c -o $@ $< -I "${INCDIRS}"
 
 # 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 | ${DEPSBLDDIRS}
+${DEPSDIR}%.d: ${SRCSDIR}%.cpp | $$(dir $$@)
        ${Q1}${PRNTFMT} "DEP" "$@"
-       ${Q2}${CXX} -MM ${CXXFLAGS} $< | \
+       ${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 | ${DSTCFGDIR}
+${DSTCFGDIR}%.cfg: ${SRCCFGDIR}%.cfg | $$(dir $$@)
        ${Q1}${PRNTFMT} "cp" "$@"
        ${Q2}cp $< $@
 
@@ -162,8 +168,8 @@ val: all
 
 .PHONY: prof
 prof: run
-       cd ${WORKINGDIR}; gprof -b ${TARGETNAME} > src/prof
-       kprof -f prof
+       cd ${WORKINGDIR}; gprof -b ${TARGETNAME} > prof
+       cd ${WORKINGDIR}; kprof -f prof
 
 
 MINGMAKEARGS := "LIBGL      := -lopengl32 -lglu32" \
@@ -188,4 +194,5 @@ final:
        ${Q1}${PRNTFMT} "make" "final"
        ${Q2}${MAKE} ${FINALMAKEARGS} clean all
 
+
 -include ${DEPS}