GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'fredde' into 1.8.0

Browse source
This commit is contained in:
Paul Beckingham 2009-05-18 09:11:03 -04:00
commit f37d39d4ce
2 changed files with 70 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Makefile.am
View file

@ -1,19 +1,13 @@
SUBDIRS = src SUBDIRS = src
MAN_DIST = doc/man1/task.1 doc/man5/taskrc.5 dist_man1_MANS = doc/man1/task.1
SCRIPTS_DIST = scripts/bash/task_completion.sh scripts/zsh/_task dist_man5_MANS = doc/man5/taskrc.5
EXTRA_DIST = $(MAN_DIST) $(SCRIPTS_DIST)
man1_MANS = doc/man1/task.1
man5_MANS = doc/man5/taskrc.5
docdir = $(datadir)/doc/${PACKAGE}-${VERSION} docdir = $(datadir)/doc/${PACKAGE}-${VERSION}
doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README
scriptsbasedir = $(docdir)/scripts bashscriptsdir = $(docdir)
nobase_dist_bashscripts_DATA = scripts/bash/task_completion.sh
bashscriptsdir = $(scriptsbasedir)/bash zshscriptsdir = $(docdir)
bashscripts_DATA = scripts/bash/task_completion.sh nobase_dist_zshscripts_DATA = scripts/zsh/_task
zshscriptsdir = $(scriptsbasedir)/zsh
zshscripts_DATA = scripts/zsh/_task

122
Makefile.in
View file

@ -31,7 +31,9 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = : PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
subdir = . subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \
$(dist_man5_MANS) $(nobase_dist_bashscripts_DATA) \
$(nobase_dist_zshscripts_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/auto.h.in \ $(srcdir)/Makefile.in $(srcdir)/auto.h.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
depcomp install-sh missing depcomp install-sh missing
@ -55,21 +57,22 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
ps-recursive uninstall-recursive ps-recursive uninstall-recursive
man1dir = $(mandir)/man1 man1dir = $(mandir)/man1
am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \ am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
"$(DESTDIR)$(bashscriptsdir)" "$(DESTDIR)$(docdir)" \ "$(DESTDIR)$(docdir)" "$(DESTDIR)$(bashscriptsdir)" \
"$(DESTDIR)$(zshscriptsdir)" "$(DESTDIR)$(zshscriptsdir)"
man5dir = $(mandir)/man5 man5dir = $(mandir)/man5
NROFF = nroff NROFF = nroff
MANS = $(man1_MANS) $(man5_MANS) MANS = $(dist_man1_MANS) $(dist_man5_MANS)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \ am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \ *) f=$$p;; \
esac; esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
bashscriptsDATA_INSTALL = $(INSTALL_DATA)
docDATA_INSTALL = $(INSTALL_DATA) docDATA_INSTALL = $(INSTALL_DATA)
zshscriptsDATA_INSTALL = $(INSTALL_DATA) nobase_dist_bashscriptsDATA_INSTALL = $(install_sh_DATA)
DATA = $(bashscripts_DATA) $(doc_DATA) $(zshscripts_DATA) nobase_dist_zshscriptsDATA_INSTALL = $(install_sh_DATA)
DATA = $(doc_DATA) $(nobase_dist_bashscripts_DATA) \
$(nobase_dist_zshscripts_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive distclean-recursive maintainer-clean-recursive
ETAGS = etags ETAGS = etags
@ -176,17 +179,13 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
SUBDIRS = src SUBDIRS = src
MAN_DIST = doc/man1/task.1 doc/man5/taskrc.5 dist_man1_MANS = doc/man1/task.1
SCRIPTS_DIST = scripts/bash/task_completion.sh scripts/zsh/_task dist_man5_MANS = doc/man5/taskrc.5
EXTRA_DIST = $(MAN_DIST) $(SCRIPTS_DIST)
man1_MANS = doc/man1/task.1
man5_MANS = doc/man5/taskrc.5
doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README
scriptsbasedir = $(docdir)/scripts bashscriptsdir = $(docdir)
bashscriptsdir = $(scriptsbasedir)/bash nobase_dist_bashscripts_DATA = scripts/bash/task_completion.sh
bashscripts_DATA = scripts/bash/task_completion.sh zshscriptsdir = $(docdir)
zshscriptsdir = $(scriptsbasedir)/zsh nobase_dist_zshscripts_DATA = scripts/zsh/_task
zshscripts_DATA = scripts/zsh/_task
all: auto.h all: auto.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive $(MAKE) $(AM_MAKEFLAGS) all-recursive
@ -331,23 +330,6 @@ uninstall-man5:
echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \ echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
rm -f "$(DESTDIR)$(man5dir)/$$inst"; \ rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
done done
install-bashscriptsDATA: $(bashscripts_DATA)
@$(NORMAL_INSTALL)
test -z "$(bashscriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(bashscriptsdir)"
@list='$(bashscripts_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(bashscriptsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(bashscriptsdir)/$$f'"; \
$(bashscriptsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(bashscriptsdir)/$$f"; \
done
uninstall-bashscriptsDATA:
@$(NORMAL_UNINSTALL)
@list='$(bashscripts_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(bashscriptsdir)/$$f'"; \
rm -f "$(DESTDIR)$(bashscriptsdir)/$$f"; \
done
install-docDATA: $(doc_DATA) install-docDATA: $(doc_DATA)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
@ -365,20 +347,41 @@ uninstall-docDATA:
echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \ echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
rm -f "$(DESTDIR)$(docdir)/$$f"; \ rm -f "$(DESTDIR)$(docdir)/$$f"; \
done done
install-zshscriptsDATA: $(zshscripts_DATA) install-nobase_dist_bashscriptsDATA: $(nobase_dist_bashscripts_DATA)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(zshscriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(zshscriptsdir)" test -z "$(bashscriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(bashscriptsdir)"
@list='$(zshscripts_DATA)'; for p in $$list; do \ @$(am__vpath_adj_setup) \
list='$(nobase_dist_bashscripts_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \ $(am__vpath_adj) \
echo " $(zshscriptsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(zshscriptsdir)/$$f'"; \ echo " $(nobase_dist_bashscriptsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(bashscriptsdir)/$$f'"; \
$(zshscriptsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(zshscriptsdir)/$$f"; \ $(nobase_dist_bashscriptsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(bashscriptsdir)/$$f"; \
done done
uninstall-zshscriptsDATA: uninstall-nobase_dist_bashscriptsDATA:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@list='$(zshscripts_DATA)'; for p in $$list; do \ @$(am__vpath_adj_setup) \
f=$(am__strip_dir) \ list='$(nobase_dist_bashscripts_DATA)'; for p in $$list; do \
$(am__vpath_adj) \
echo " rm -f '$(DESTDIR)$(bashscriptsdir)/$$f'"; \
rm -f "$(DESTDIR)$(bashscriptsdir)/$$f"; \
done
install-nobase_dist_zshscriptsDATA: $(nobase_dist_zshscripts_DATA)
@$(NORMAL_INSTALL)
test -z "$(zshscriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(zshscriptsdir)"
@$(am__vpath_adj_setup) \
list='$(nobase_dist_zshscripts_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
$(am__vpath_adj) \
echo " $(nobase_dist_zshscriptsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(zshscriptsdir)/$$f'"; \
$(nobase_dist_zshscriptsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(zshscriptsdir)/$$f"; \
done
uninstall-nobase_dist_zshscriptsDATA:
@$(NORMAL_UNINSTALL)
@$(am__vpath_adj_setup) \
list='$(nobase_dist_zshscripts_DATA)'; for p in $$list; do \
$(am__vpath_adj) \
echo " rm -f '$(DESTDIR)$(zshscriptsdir)/$$f'"; \ echo " rm -f '$(DESTDIR)$(zshscriptsdir)/$$f'"; \
rm -f "$(DESTDIR)$(zshscriptsdir)/$$f"; \ rm -f "$(DESTDIR)$(zshscriptsdir)/$$f"; \
done done
@ -666,7 +669,7 @@ check: check-recursive
all-am: Makefile $(MANS) $(DATA) auto.h all-am: Makefile $(MANS) $(DATA) auto.h
installdirs: installdirs-recursive installdirs: installdirs-recursive
installdirs-am: installdirs-am:
for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(bashscriptsdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(zshscriptsdir)"; do \ for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(bashscriptsdir)" "$(DESTDIR)$(zshscriptsdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done done
install: install-recursive install: install-recursive
@ -712,8 +715,9 @@ info: info-recursive
info-am: info-am:
install-data-am: install-bashscriptsDATA install-docDATA install-man \ install-data-am: install-docDATA install-man \
install-zshscriptsDATA install-nobase_dist_bashscriptsDATA \
install-nobase_dist_zshscriptsDATA
install-dvi: install-dvi-recursive install-dvi: install-dvi-recursive
@ -749,8 +753,9 @@ ps: ps-recursive
ps-am: ps-am:
uninstall-am: uninstall-bashscriptsDATA uninstall-docDATA \ uninstall-am: uninstall-docDATA uninstall-man \
uninstall-man uninstall-zshscriptsDATA uninstall-nobase_dist_bashscriptsDATA \
uninstall-nobase_dist_zshscriptsDATA
uninstall-man: uninstall-man1 uninstall-man5 uninstall-man: uninstall-man1 uninstall-man5
@ -763,18 +768,19 @@ uninstall-man: uninstall-man1 uninstall-man5
dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-tags distcleancheck \ distclean-generic distclean-hdr distclean-tags distcleancheck \
distdir distuninstallcheck dvi dvi-am html html-am info \ distdir distuninstallcheck dvi dvi-am html html-am info \
info-am install install-am install-bashscriptsDATA \ info-am install install-am install-data install-data-am \
install-data install-data-am install-docDATA install-dvi \ install-docDATA install-dvi install-dvi-am install-exec \
install-dvi-am install-exec install-exec-am install-html \ install-exec-am install-html install-html-am install-info \
install-html-am install-info install-info-am install-man \ install-info-am install-man install-man1 install-man5 \
install-man1 install-man5 install-pdf install-pdf-am \ install-nobase_dist_bashscriptsDATA \
install-ps install-ps-am install-strip install-zshscriptsDATA \ install-nobase_dist_zshscriptsDATA install-pdf install-pdf-am \
installcheck installcheck-am installdirs installdirs-am \ install-ps install-ps-am install-strip installcheck \
maintainer-clean maintainer-clean-generic mostlyclean \ installcheck-am installdirs installdirs-am maintainer-clean \
mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
uninstall uninstall-am uninstall-bashscriptsDATA \ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
uninstall-docDATA uninstall-man uninstall-man1 uninstall-man5 \ uninstall-docDATA uninstall-man uninstall-man1 uninstall-man5 \
uninstall-zshscriptsDATA uninstall-nobase_dist_bashscriptsDATA \
uninstall-nobase_dist_zshscriptsDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.