X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?p=physics.git;a=blobdiff_plain;f=Makefile;h=fe38d97c32c574823b2913412528b4e1f7108922;hp=db26a37bdfce069fdb9a1b41be9182c19de36fe5;hb=3d1f081343dc603a3292538eeb9bd794b255deb6;hpb=2688190c40c02fd4f839c4a7d5c671744bbdc2ad diff --git a/Makefile b/Makefile index db26a37..fe38d97 100644 --- 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" @@ -94,14 +96,14 @@ ${BLDDIRS}: # rule to make an object file from a .cpp ${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 | $$(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