X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?p=physics.git;a=blobdiff_plain;f=Makefile;h=85ac1998c75b4121f6289a71cc4aa4ef27f208cb;hp=e1b2afd46182c39df8147dadea7df6174e78e798;hb=70468808f161d45b9ae0eecf5d9d854a805bd855;hpb=bf7e6563c98ce8818ede2d90da56f274887e5f82

diff --git a/Makefile b/Makefile
index e1b2afd..85ac199 100644
--- a/Makefile
+++ b/Makefile
@@ -26,8 +26,8 @@ DIRS += locks/
 SRCSDIR := src/
 SRCS    := # := start
 
-# include all of the files.mk
-include $(addprefix ${SRCSDIR},$(addsuffix files.mk,${DIRS}))
+# include all of the dir.mk
+include $(addprefix ${SRCSDIR},$(addsuffix dir.mk,${DIRS}))
 
 WORKINGDIR  := bind/
 
@@ -56,6 +56,8 @@ OBJSBLDDIRS := $(addprefix ${OBJSDIR},${DIRS})
 BLDDIRS     := ${OBJSBLDDIRS} ${DEPSBLDDIRS} ${WORKINGDIR} ${DSTCFGDIR}
 
 
+PRNTFMT := printf "%-5s: %s\n"
+
 VERBOSE := 0
 
 ifeq (${VERBOSE},0)
@@ -70,8 +72,6 @@ else
     Q2 :=
 endif
 
-PRNTFMT := printf "%-5s: %s\n"
-
 .PHONY: all
 all: ${TARGET} ${CFGS}
 
@@ -115,16 +115,16 @@ tags: ${SRCS}
 
 .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
-	${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