projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prof update and cleaning
[physics.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
e1b2afd
..
cad83c9
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-26,18
+26,16
@@
DIRS += locks/
SRCSDIR := src/
SRCS := # := start
SRCSDIR := src/
SRCS := # := start
-# include all of the files.mk
-include $(addprefix ${SRCSDIR},$(addsuffix files.mk,${DIRS}))
-
-WORKINGDIR := bind/
-
OBJSDIR := objsd/
OBJSDIR := objsd/
-OBJS := ${SRCS:.cpp=.o}
-OBJS := $(addprefix ${OBJSDIR},${OBJS})
+OBJS := # := start
DEPSDIR := deps/
DEPSDIR := deps/
-DEPS := ${SRCS:.cpp=.d}
-DEPS := $(addprefix ${DEPSDIR},${DEPS})
+DEPS := # := start
+
+# include all of the dir.mk
+include $(addprefix ${SRCSDIR},$(addsuffix dir.mk,${DIRS}))
+
+WORKINGDIR := bind/
CFGDIRNAME := configs/
SRCCFGDIR := ${CFGDIRNAME}
CFGDIRNAME := configs/
SRCCFGDIR := ${CFGDIRNAME}
@@
-56,6
+54,8
@@
OBJSBLDDIRS := $(addprefix ${OBJSDIR},${DIRS})
BLDDIRS := ${OBJSBLDDIRS} ${DEPSBLDDIRS} ${WORKINGDIR} ${DSTCFGDIR}
BLDDIRS := ${OBJSBLDDIRS} ${DEPSBLDDIRS} ${WORKINGDIR} ${DSTCFGDIR}
+PRNTFMT := printf "%-5s: %s\n"
+
VERBOSE := 0
ifeq (${VERBOSE},0)
VERBOSE := 0
ifeq (${VERBOSE},0)
@@
-70,8
+70,6
@@
else
Q2 :=
endif
Q2 :=
endif
-PRNTFMT := printf "%-5s: %s\n"
-
.PHONY: all
all: ${TARGET} ${CFGS}
.PHONY: all
all: ${TARGET} ${CFGS}
@@
-115,16
+113,16
@@
tags: ${SRCS}
.PHONY: clean
clean:
.PHONY: clean
clean:
- ${Q1}${PRNTFMT} "
CLEAN" "OBJS
"
- ${Q2}rm -
f ${OBJS
}
- ${Q1}${PRNTFMT} "
CLEAN" "TARGET
"
+ ${Q1}${PRNTFMT} "
rm" "${OBJSDIR}
"
+ ${Q2}rm -
rf ${OBJSDIR
}
+ ${Q1}${PRNTFMT} "
rm" "${TARGET} ${TARGETTMP}
"
${Q2}rm -f ${TARGET}
.PHONY: distclean
distclean: clean
${Q2}rm -f ${TARGET}
.PHONY: distclean
distclean: clean
- ${Q1}${PRNTFMT} "
CLEAN" "DEPS
"
- ${Q2}rm -
f ${DEPS
}
- ${Q1}${PRNTFMT} "
CLEAN
" "tags prof gmon.out"
+ ${Q1}${PRNTFMT} "
rm" "${DEPSDIR}
"
+ ${Q2}rm -
rf ${DEPSDIR
}
+ ${Q1}${PRNTFMT} "
rm
" "tags prof gmon.out"
${Q2}rm -f tags prof gmon.out
.PHONY: gitclean
${Q2}rm -f tags prof gmon.out
.PHONY: gitclean
@@
-164,8
+162,8
@@
val: all
.PHONY: prof
prof: run
.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" \
MINGMAKEARGS := "LIBGL := -lopengl32 -lglu32" \
@@
-190,4
+188,5
@@
final:
${Q1}${PRNTFMT} "make" "final"
${Q2}${MAKE} ${FINALMAKEARGS} clean all
${Q1}${PRNTFMT} "make" "final"
${Q2}${MAKE} ${FINALMAKEARGS} clean all
+
-include ${DEPS}
-include ${DEPS}