From: Patrik Gornicz Date: Tue, 1 Sep 2009 03:30:10 +0000 (-0400) Subject: removed trailing / from directories (given in files.mk) X-Git-Tag: libbear-premerge~4 X-Git-Url: http://gitweb.pgornicz.com/?a=commitdiff_plain;h=0f3e5c8cc14996f0deef8de8f76385ea11c41392;p=libbear.git removed trailing / from directories (given in files.mk) --- diff --git a/Makefile b/Makefile index 5510278..e691c8f 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,6 @@ .PHONY: default default: - G_DIRMK := dir.mk G_VARSMK := vars.mk G_FILESMK := files.mk diff --git a/lib/src/dir.mk b/lib/src/dir.mk index 165ec69..3f7e5ed 100644 --- a/lib/src/dir.mk +++ b/lib/src/dir.mk @@ -8,7 +8,7 @@ T_DIRNAME := include ${CURDIR}${G_FILESMK} -include $(addsuffix ${G_DIRMK},${NEWDIRS}) +include $(addsuffix /${G_DIRMK},${NEWDIRS}) include ${F_STACKPOP} diff --git a/lib/src/files.mk b/lib/src/files.mk index df4ee64..9b5ad63 100644 --- a/lib/src/files.mk +++ b/lib/src/files.mk @@ -7,7 +7,7 @@ NEWSRCS += Timer.cpp NEWSRCS += Ticks.cpp NEWDIRS := # := start; empty -NEWDIRS += locks/ +NEWDIRS += locks ################################################################################ diff --git a/lib/src/locks/dir.mk b/lib/src/locks/dir.mk index d7a1a38..1abbe1c 100644 --- a/lib/src/locks/dir.mk +++ b/lib/src/locks/dir.mk @@ -8,7 +8,7 @@ T_DIRNAME := include ${CURDIR}${G_FILESMK} -include $(addsuffix ${G_DIRMK},${NEWDIRS}) +include $(addsuffix /${G_DIRMK},${NEWDIRS}) include ${F_STACKPOP} diff --git a/tests/src/1/dir.mk b/tests/src/1/dir.mk index 4cc65c6..1a122af 100644 --- a/tests/src/1/dir.mk +++ b/tests/src/1/dir.mk @@ -13,7 +13,7 @@ include ${CURDIR}${G_LISTSMK} include ${CURDIR}${G_FILESMK} -include $(addsuffix ${G_DIRMK},${NEWDIRS}) +include $(addsuffix /${G_DIRMK},${NEWDIRS}) L_SRCS_$P += ${L_SRCS_$D} L_OBJS_$P += ${L_OBJS_$D} diff --git a/tests/src/dir.mk b/tests/src/dir.mk index 165ec69..3f7e5ed 100644 --- a/tests/src/dir.mk +++ b/tests/src/dir.mk @@ -8,7 +8,7 @@ T_DIRNAME := include ${CURDIR}${G_FILESMK} -include $(addsuffix ${G_DIRMK},${NEWDIRS}) +include $(addsuffix /${G_DIRMK},${NEWDIRS}) include ${F_STACKPOP} diff --git a/tests/src/files.mk b/tests/src/files.mk index fd5b78a..036338f 100644 --- a/tests/src/files.mk +++ b/tests/src/files.mk @@ -2,8 +2,8 @@ NEWSRCS := # := start; empty NEWDIRS := # := start; empty -NEWDIRS += 1/ -NEWDIRS += printTrace/ +NEWDIRS += 1 +NEWDIRS += printTrace ################################################################################