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

mirrors/git

mirror of https://github.com/git/git.git synced 2024-11-19 15:34:51 +01:00

103 lines

2.2 KiB

Makefile

Raw Normal View History

[PATCH] git bugfixes and cleanups, mainly Debian things Generate docs for gitk. Install them in the right deb package. Signed-off-by: Tommi Virtanen <tv@debian.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-08-26 13:00:04 +02:00			`MAN1_TXT=$(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`
			`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`
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)`

[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`
[PATCH] Use '-d' as the first flag to 'install' ... in order to please Solaris 'install'. GNU install is not harmed with this. [jc: Documentation/Makefile also fixed.] Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-09-14 12:41:52 +02:00			`$(INSTALL) -d -m755 $(DESTDIR)/$(man1) $(DESTDIR)/$(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			`$(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.`
			`#`
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			`TEXTFILES = $(wildcard git-*.txt)`
			`doc.dep : $(TEXTFILES) build-docdep.perl`
			`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
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			`git.7: ../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
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:`
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 .xml .html .1 .7 howto-index.txt howto/*.html doc.dep`
[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`
[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			`xmlto man $<`

			`%.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
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			`git.html: git.txt ../README`

[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)`