mirrors/git - Incest Forge: Beyond sex. We incest.

mirrors/git

mirror of https://github.com/git/git.git synced 2024-11-17 06:25:13 +01:00

113 lines

2.4 KiB

Makefile

Raw Normal View History

Documentation/Makefile: Some `git-*.txt' files aren't manpages. In particular, git-tools.txt isn't a manpage, and my Asciidoc gets upset by it. The simplest fix is to Remove articles from the list of manpages the Makefile. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-03-05 10:36:33 +01:00			`MAN1_TXT= \`
			`$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \`
			`$(wildcard git-*.txt)) \`
			`gitk.txt`
[PATCH] Docs - Makefile update A Makefile that works just fine when the 6 character patch is applied to asciidoc Signed-off-by: David Greaves <david@dgreaves.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 2005-05-22 19:44:15 +02:00			`MAN7_TXT=git.txt`
[PATCH 4/4] split core-git.txt and update Makefile for html and man Signed-off-by: David Greaves <david@dgreaves.com> 2005-05-10 23:32:39 +02:00
Tutorial updates. - Use "working tree", "object name", "repository" as the canonical term consistenly. - Start formatting tutorial with asciidoc. - Mention shared repository style of cooperation. - Update with some usability enhancements recently made, such as the "-m" flag to the "git commit" command. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-08-24 00:28:34 +02:00			`DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT))`
Documentaion updates. Mostly making the formatted html prettier. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 7adf1f15ebe074d4767df941817a6cf86d8e2533 commit) 2005-08-30 22:51:01 +02:00
Add repository-layout document. ... and link to it from both the main index and the tutorial. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-09-02 01:56:13 +02:00			`ARTICLES = tutorial`
tutorial: add discussion of index file, object database Add a sequel to tutorial.txt which discusses the index file and the object database. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-05-22 01:49:34 +02:00			`ARTICLES += tutorial-2`
Documentation: finishing touches to the new tutorial. We forgot to update the primary link from git.html leading to the tutorial, and also forgot to build and install the renamed core-tutorial document. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-01-23 07:43:59 +01:00			`ARTICLES += core-tutorial`
Add repository-layout document. ... and link to it from both the main index and the tutorial. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-09-02 01:56:13 +02:00			`ARTICLES += cvs-migration`
			`ARTICLES += diffcore`
			`ARTICLES += howto-index`
			`ARTICLES += repository-layout`
Document hooks. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-09-03 06:19:26 +02:00			`ARTICLES += hooks`
Everyday GIT with 20 commands Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-12-10 08:07:29 +01:00			`ARTICLES += everyday`
Documentation/Makefile: Some `git-*.txt' files aren't manpages. In particular, git-tools.txt isn't a manpage, and my Asciidoc gets upset by it. The simplest fix is to Remove articles from the list of manpages the Makefile. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-03-05 10:36:33 +01:00			`ARTICLES += git-tools`
Documentaion updates. Mostly making the formatted html prettier. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 7adf1f15ebe074d4767df941817a6cf86d8e2533 commit) 2005-08-30 22:51:01 +02:00			`# with their own formatting rules.`
			`SP_ARTICLES = glossary howto/revert-branch-rebase`

			`DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES))`
Make sure howto/*.html is built as well. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-08-30 08:09:22 +02:00
[PATCH] Docs - Makefile update A Makefile that works just fine when the 6 character patch is applied to asciidoc Signed-off-by: David Greaves <david@dgreaves.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 2005-05-22 19:44:15 +02:00			`DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))`
			`DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))`

make $prefix available for sub-makefiles exports $prefix and makes Documentation/Makefile following it also. Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-10-09 00:54:37 +02:00			`prefix?=$(HOME)`
[PATCH] Add doc and install-doc targets to the Makefile This makes it straightforward for people wanting to build and install the git man pages and the rest of the documentation to do so. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 2005-07-15 03:21:57 +02:00			`bin=$(prefix)/bin`
			`mandir=$(prefix)/man`
			`man1=$(mandir)/man1`
			`man7=$(mandir)/man7`
[PATCH] Use $DESTDIR instead of $dest $DESTDIR is more usual during the build than $dest and is what is usually used in the makefiles, so let's use it too. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-08-05 01:56:38 +02:00			`# DESTDIR=`
[PATCH] Add doc and install-doc targets to the Makefile This makes it straightforward for people wanting to build and install the git man pages and the rest of the documentation to do so. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 2005-07-15 03:21:57 +02:00
make $prefix available for sub-makefiles exports $prefix and makes Documentation/Makefile following it also. Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-10-09 00:54:37 +02:00			`INSTALL?=install`
[PATCH] Add doc and install-doc targets to the Makefile This makes it straightforward for people wanting to build and install the git man pages and the rest of the documentation to do so. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 2005-07-15 03:21:57 +02:00
[PATCH] Docs - Makefile update A Makefile that works just fine when the 6 character patch is applied to asciidoc Signed-off-by: David Greaves <david@dgreaves.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 2005-05-22 19:44:15 +02:00			`#`
			`# Please note that there is a minor bug in asciidoc.`
			`# The version after 6.0.3 _will_ include the patch found here:`
			`# http://marc.theaimsgroup.com/?l=git&m=111558757202243&w=2`
			`#`
			`# Until that version is released you may have to apply the patch`
			`# yourself - yes, all 6 characters of it!`
			`#`

			`all: html man`
[PATCH 4/4] split core-git.txt and update Makefile for html and man Signed-off-by: David Greaves <david@dgreaves.com> 2005-05-10 23:32:39 +02:00
			`html: $(DOC_HTML)`

Documentation/Makefile: product depends on asciidoc.conf Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-07-15 01:32:38 +02:00			`$(DOC_HTML) $(DOC_MAN1) $(DOC_MAN7): asciidoc.conf`
[PATCH] Docs - Makefile update A Makefile that works just fine when the 6 character patch is applied to asciidoc Signed-off-by: David Greaves <david@dgreaves.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 2005-05-22 19:44:15 +02:00
			`man: man1 man7`
			`man1: $(DOC_MAN1)`
			`man7: $(DOC_MAN7)`
[PATCH 4/4] split core-git.txt and update Makefile for html and man Signed-off-by: David Greaves <david@dgreaves.com> 2005-05-10 23:32:39 +02:00
Fix documentation dependency. Randal L. Schwartz noticed that 'make install' does not rebuild what is installed. Make the 'install' rule depend on 'man'. I noticed also 'touch' of the source files were used to express include dependencies, which is a no-no. Rewrite it to do dependencies properly, and add missing include dependencies while we are at it. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-09-21 21:29:59 +02:00			`install: man`
Documentation/Makefile: remove extra / As both DESTDIR and the prefix are supposed to be absolute pathnames they can simply be concatenated without an extra / (like in the main Makefile). The extra slash may even break installation on Windows. [jc: adjusted an earlier workaround for this problem in the dist-doc target in the main Makefile as well. ] Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-05-25 14:37:46 +02:00			`$(INSTALL) -d -m755 $(DESTDIR)$(man1) $(DESTDIR)$(man7)`
			`$(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1)`
			`$(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7)`
[PATCH] Add doc and install-doc targets to the Makefile This makes it straightforward for people wanting to build and install the git man pages and the rest of the documentation to do so. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 2005-07-15 03:21:57 +02:00
Documentation: -merge and -pull: describe merge strategies. ... and give a couple of examples of running 'git pull' against local repository. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-11-04 09:06:20 +01:00
Refactored merge options into separate merge-options.txt. Refactored fetch options into separate fetch-options.txt. Made git-merge use merge-options. Made git-fetch use fetch-options. Made git-pull use merge-options and fetch-options. Added --help option to git-pull and git-format-patch scripts. Rewrote Documentation/Makefile to dynamically determine include dependencies. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-11-07 06:30:56 +01:00			`#`
			`# Determine "include::" file references in asciidoc files.`
			`#`
Documentation: fix dependency generation. The previous rule misses the case where git.txt or tutorial.txt includes new files. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-11-08 07:21:21 +01:00			`doc.dep : $(wildcard *.txt) build-docdep.perl`
Fix documentation dependency generation. Documentation/Makefile spent a lot of time to generate include dependencies, which was quite noticeable especially during "make clean". Rewrite it to generate just a single dependency file. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-11-08 03:21:51 +01:00			`rm -f $@+ $@`
			`perl ./build-docdep.perl >$@+`
			`mv $@+ $@`
Refactored merge options into separate merge-options.txt. Refactored fetch options into separate fetch-options.txt. Made git-merge use merge-options. Made git-fetch use fetch-options. Made git-pull use merge-options and fetch-options. Added --help option to git-pull and git-format-patch scripts. Rewrote Documentation/Makefile to dynamically determine include dependencies. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-11-07 06:30:56 +01:00
Fix documentation dependency generation. Documentation/Makefile spent a lot of time to generate include dependencies, which was quite noticeable especially during "make clean". Rewrite it to generate just a single dependency file. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-11-08 03:21:51 +01:00			`-include doc.dep`
Documentation: -merge and -pull: describe merge strategies. ... and give a couple of examples of running 'git pull' against local repository. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-11-04 09:06:20 +01:00
Don't include ../README in git.txt - make a local copy asciidoc 7.0.4 and newer considers such includes from parent directory unsafe. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-01-25 07:52:22 +01:00			`git.7: README`

			`README: ../README`
			`cp $< $@`
[PATCH 4/4] split core-git.txt and update Makefile for html and man Signed-off-by: David Greaves <david@dgreaves.com> 2005-05-10 23:32:39 +02:00
Refactored merge options into separate merge-options.txt. Refactored fetch options into separate fetch-options.txt. Made git-merge use merge-options. Made git-fetch use fetch-options. Made git-pull use merge-options and fetch-options. Added --help option to git-pull and git-format-patch scripts. Rewrote Documentation/Makefile to dynamically determine include dependencies. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-11-07 06:30:56 +01:00
[PATCH 4/4] split core-git.txt and update Makefile for html and man Signed-off-by: David Greaves <david@dgreaves.com> 2005-05-10 23:32:39 +02:00			`clean:`
Don't include ../README in git.txt - make a local copy asciidoc 7.0.4 and newer considers such includes from parent directory unsafe. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-01-25 07:52:22 +01:00			`rm -f .xml .html .1 .7 howto-index.txt howto/*.html doc.dep README`
[PATCH 4/4] split core-git.txt and update Makefile for html and man Signed-off-by: David Greaves <david@dgreaves.com> 2005-05-10 23:32:39 +02:00
			`%.html : %.txt`
[PATCH] Documentation: Add asciidoc.conf file and gitlink: macro Introduce an asciidoc.conf file with the purpose of adding a gitlink: macro which will improve the manpage output. Original cogito patch by Jonas Fonseca <fonseca@diku.dk>; asciidoc.conf from that patch was further enhanced to use the proper DocBook tag <citerefentry> for references to man pages. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-09-19 12:10:14 +02:00			`asciidoc -b xhtml11 -d manpage -f asciidoc.conf $<`
[PATCH 4/4] split core-git.txt and update Makefile for html and man Signed-off-by: David Greaves <david@dgreaves.com> 2005-05-10 23:32:39 +02:00
[PATCH] manpage name conflict This moves the git manpage to man7, since "git" isn't a direct command per se. It also does two other things: * Sort of works around the asciidoc 6.0.3 bug where the manpages all get called "git.1". It just renames them to what they should have been called. * Fixes a cut-n-paste bug in git-diff-helper.txt that was making asciidoc choke. 2005-05-19 18:24:54 +02:00			`%.1 %.7 : %.xml`
Properly render asciidoc "callouts" in git man pages. Adds an xsl fragment to render docbook callouts when converting to man page format. Update the Makefile to have "xmlto" use it when generating man pages. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> 2006-04-28 15:15:06 +02:00			`xmlto -m callouts.xsl man $<`
[PATCH 4/4] split core-git.txt and update Makefile for html and man Signed-off-by: David Greaves <david@dgreaves.com> 2005-05-10 23:32:39 +02:00
			`%.xml : %.txt`
[PATCH] Documentation: Add asciidoc.conf file and gitlink: macro Introduce an asciidoc.conf file with the purpose of adding a gitlink: macro which will improve the manpage output. Original cogito patch by Jonas Fonseca <fonseca@diku.dk>; asciidoc.conf from that patch was further enhanced to use the proper DocBook tag <citerefentry> for references to man pages. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-09-19 12:10:14 +02:00			`asciidoc -b docbook -d manpage -f asciidoc.conf $<`
Documentation updates. Linus brought up that documentation for many commands have incorrect attribution. I started counting lines again, but ended up adding a handful of missing manual pages. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-08-15 02:24:36 +02:00
Don't include ../README in git.txt - make a local copy asciidoc 7.0.4 and newer considers such includes from parent directory unsafe. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-01-25 07:52:22 +01:00			`git.html: git.txt README`
Documentaion updates. Mostly making the formatted html prettier. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 7adf1f15ebe074d4767df941817a6cf86d8e2533 commit) 2005-08-30 22:51:01 +02:00
[PATCH] Add Makefile target glossary.html This also includes a script which does the sorting, and introduces hyperlinks for every described term. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-08-18 17:28:57 +02:00			`glossary.html : glossary.txt sort_glossary.pl`
			`cat $< \| \`
			`perl sort_glossary.pl \| \`
			`asciidoc -b xhtml11 - > glossary.html`

Link howto documents from the main git.txt documentation. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-08-25 09:28:18 +02:00			`howto-index.txt: howto-index.sh $(wildcard howto/*.txt)`
			`rm -f $@+ $@`
			`sh ./howto-index.sh $(wildcard howto/*.txt) >$@+`
			`mv $@+ $@`

Documentaion updates. Mostly making the formatted html prettier. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 7adf1f15ebe074d4767df941817a6cf86d8e2533 commit) 2005-08-30 22:51:01 +02:00			`$(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt`
			`asciidoc -b xhtml11 $*.txt`
Link howto documents from the main git.txt documentation. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-08-25 09:28:18 +02:00
			`WEBDOC_DEST = /pub/software/scm/git/docs`

Allow asciidoc formatted documentation in howto/ Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-08-30 07:38:12 +02:00			`$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt`
			`rm -f $@+ $@`
			`sed -e '1,/^$$/d' $? \| asciidoc -b xhtml11 - >$@+`
			`mv $@+ $@`

Link howto documents from the main git.txt documentation. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-08-25 09:28:18 +02:00			`install-webdoc : html`
			`sh ./install-webdoc.sh $(WEBDOC_DEST)`