X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?p=physics.git;a=blobdiff_plain;f=Makefile;h=6049377445a08dacd877ed8fe3e26d239a4aa949;hp=fe38d97c32c574823b2913412528b4e1f7108922;hb=07af3cf884625a9a86a79949bb6177a353680abf;hpb=3d1f081343dc603a3292538eeb9bd794b255deb6 diff --git a/Makefile b/Makefile index fe38d97..6049377 100644 --- a/Makefile +++ b/Makefile @@ -14,14 +14,6 @@ CXXFLAGS := ${MYFLAGS} ${DBGFLAGS} CXX := g++ DIRS := # := start -DIRS += ./ -DIRS += Entities/ -DIRS += GameStates/ -DIRS += Effects/ -DIRS += config/ -DIRS += input/ -DIRS += graphics/ -DIRS += locks/ SRCSDIR := src/ SRCS := # := start @@ -33,7 +25,8 @@ DEPSDIR := deps/ DEPS := # := start # include all of the dir.mk -include $(addprefix ${SRCSDIR},$(addsuffix dir.mk,${DIRS})) +DIRMK := dir.mk +include ${SRCSDIR}${DIRMK} WORKINGDIR := bind/ @@ -49,8 +42,8 @@ TARGETNAME := run_physics 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} @@ -61,12 +54,12 @@ PRNTFMT := printf "%-5s: %s\n" 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 - # 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 :=