From 38e6c9ba5c584dfbf20f98eace464595405e1c88 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Thu, 4 Dec 2008 12:38:23 +0000 Subject: make ignore now configures the sv:ignore property. --- Makefile | 1 - man/Makefile | 2 +- mk/gitignore.mk | 15 --------------- mk/lib.mk | 2 +- mk/prog.mk | 2 +- mk/scripts.mk | 2 +- mk/subdir.mk | 2 +- mk/svnignore.mk | 12 ++++++++++++ runlevels/Makefile | 2 +- src/test/Makefile | 2 +- 10 files changed, 19 insertions(+), 23 deletions(-) delete mode 100644 mk/gitignore.mk create mode 100644 mk/svnignore.mk diff --git a/Makefile b/Makefile index 1694b86e..11915d49 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,6 @@ include ${MK}/sys.mk include ${MK}/os.mk include ${MK}/subdir.mk include ${MK}/dist.mk -include ${MK}/gitignore.mk _installafter: ${INSTALL} -d ${DESTDIR}/${PREFIX}/${RC_LIB}/init.d diff --git a/man/Makefile b/man/Makefile index 5a63da82..7ec0df20 100644 --- a/man/Makefile +++ b/man/Makefile @@ -18,7 +18,7 @@ MAKE_LINKS= suffix=$${man\#*.}; \ MK= ../mk include ${MK}/sys.mk -include ${MK}/gitignore.mk +include ${MK}/svnignore.mk all: diff --git a/mk/gitignore.mk b/mk/gitignore.mk deleted file mode 100644 index 50af3e55..00000000 --- a/mk/gitignore.mk +++ /dev/null @@ -1,15 +0,0 @@ -# rules to make .gitignore files -# Copyright 2008 Roy Marples -# All rights reserved. Released under the 2-clause BSD license. - -IGNOREFILES+= ${CLEANFILES} - -.PHONY: .gitignore - -.gitignore: - @if test -n "${IGNOREFILES}"; then \ - echo "Ignoring ${IGNOREFILES}"; \ - echo ${IGNOREFILES} | tr ' ' '\n' > .gitignore; \ - fi - -gitignore: .gitignore diff --git a/mk/lib.mk b/mk/lib.mk index e8b2eb7d..c5262383 100644 --- a/mk/lib.mk +++ b/mk/lib.mk @@ -64,4 +64,4 @@ extra_depend: include ${MK}/sys.mk include ${MK}/os.mk include ${MK}/depend.mk -include ${MK}/gitignore.mk +include ${MK}/svnignore.mk diff --git a/mk/prog.mk b/mk/prog.mk index c44b380e..3064e6e0 100644 --- a/mk/prog.mk +++ b/mk/prog.mk @@ -38,4 +38,4 @@ extra_depend: include ${MK}/sys.mk include ${MK}/os.mk include ${MK}/depend.mk -include ${MK}/gitignore.mk +include ${MK}/svnignore.mk diff --git a/mk/scripts.mk b/mk/scripts.mk index f65c1422..663731b8 100644 --- a/mk/scripts.mk +++ b/mk/scripts.mk @@ -56,4 +56,4 @@ CLEANFILES+= ${OBJS} clean: @if test -n "${CLEANFILES}"; then echo "rm -f ${CLEANFILES}"; rm -f ${CLEANFILES}; fi -include ${MK}/gitignore.mk +include ${MK}/svnignore.mk diff --git a/mk/subdir.mk b/mk/subdir.mk index 8ebaad4b..cf9628db 100644 --- a/mk/subdir.mk +++ b/mk/subdir.mk @@ -27,5 +27,5 @@ check test:: ${_SUBDIR} depend: ${_SUBDIR} -gitignore: +ignore: ${_SUBDIR} diff --git a/mk/svnignore.mk b/mk/svnignore.mk new file mode 100644 index 00000000..6a979f62 --- /dev/null +++ b/mk/svnignore.mk @@ -0,0 +1,12 @@ +# rules to make svn ignore files +# Copyright 2008 Roy Marples +# All rights reserved. Released under the 2-clause BSD license. + +IGNOREFILES+= ${CLEANFILES} + +ignore: + @if test -n "${IGNOREFILES}"; then \ + echo "Ignoring ${IGNOREFILES}"; \ + files="$$(echo ${IGNOREFILES} | tr ' ' '\n')"; \ + eval svn propset svn:ignore \'"$${files}"\' .; \ + fi diff --git a/runlevels/Makefile b/runlevels/Makefile index b8a830af..fb882d94 100644 --- a/runlevels/Makefile +++ b/runlevels/Makefile @@ -14,7 +14,7 @@ INITDIR= ../init.d MK= ../mk include ${MK}/sys.mk include ${MK}/os.mk -include ${MK}/gitignore.mk +include ${MK}/svnignore.mk include Makefile.${OS} all: diff --git a/src/test/Makefile b/src/test/Makefile index bdc0587b..b57b8903 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -2,7 +2,7 @@ all: install: -gitignore: +ignore: check test:: ./runtests.sh -- cgit v1.2.3