projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
off loaded including of subdirectories to dir.mk files (fixes dependencies problems)
[physics.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
fe38d97
..
6049377
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-14,14
+14,6
@@
CXXFLAGS := ${MYFLAGS} ${DBGFLAGS}
CXX := g++
DIRS := # := start
CXX := g++
DIRS := # := start
-DIRS += ./
-DIRS += Entities/
-DIRS += GameStates/
-DIRS += Effects/
-DIRS += config/
-DIRS += input/
-DIRS += graphics/
-DIRS += locks/
SRCSDIR := src/
SRCS := # := start
SRCSDIR := src/
SRCS := # := start
@@
-33,7
+25,8
@@
DEPSDIR := deps/
DEPS := # := start
# include all of the dir.mk
DEPS := # := start
# include all of the dir.mk
-include $(addprefix ${SRCSDIR},$(addsuffix dir.mk,${DIRS}))
+DIRMK := dir.mk
+include ${SRCSDIR}${DIRMK}
WORKINGDIR := bind/
WORKINGDIR := bind/
@@
-49,8
+42,8
@@
TARGETNAME := run_physics
TARGETTMP := ${OBJSDIR}${TARGETNAME}
TARGET := ${WORKINGDIR}${TARGETNAME}
TARGETTMP := ${OBJSDIR}${TARGETNAME}
TARGET := ${WORKINGDIR}${TARGETNAME}
-DEPSBLDDIRS := $(addprefix ${DEPSDIR},${DIRS})
-OBJSBLDDIRS := $(addprefix ${OBJSDIR},${DIRS})
+DEPSBLDDIRS := $
{DEPSDIR} $
(addprefix ${DEPSDIR},${DIRS})
+OBJSBLDDIRS := $
{OBJSDIR} $
(addprefix ${OBJSDIR},${DIRS})
BLDDIRS := ${OBJSBLDDIRS} ${DEPSBLDDIRS} ${WORKINGDIR} ${DSTCFGDIR}
INCDIRS := ${SRCSDIR}
BLDDIRS := ${OBJSBLDDIRS} ${DEPSBLDDIRS} ${WORKINGDIR} ${DSTCFGDIR}
INCDIRS := ${SRCSDIR}
@@
-61,12
+54,12
@@
PRNTFMT := printf "%-5s: %s\n"
VERBOSE := 0
ifeq (${VERBOSE},0)
VERBOSE := 0
ifeq (${VERBOSE},0)
- # quiet the
echo
command
+ # quiet the
printf
command
Q1 := @
# quiet the command that is `replaced' by an echo
Q2 := @
else
Q1 := @
# quiet the command that is `replaced' by an echo
Q2 := @
else
- # EAT the
echo
command as if it was not there
+ # EAT the
printf
command as if it was not there
Q1 := @true # NOTE: the space between @true and the # is VERY important!!
# do not quiet the command output
Q2 :=
Q1 := @true # NOTE: the space between @true and the # is VERY important!!
# do not quiet the command output
Q2 :=