X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fdoc%2FMakefile.am;h=f628e01f911aac6a128c19a42bb9c96b34966ad2;hb=039d674b2baf76e91d9977a2d6d2fa795420ee59;hp=aee204ee929abdfd1f37d35b4550fc10745d3925;hpb=d418c61c050a646a9c33549770e3d66285151ff6;p=lyx.git

diff --git a/lib/doc/Makefile.am b/lib/doc/Makefile.am
index aee204ee92..f628e01f91 100644
--- a/lib/doc/Makefile.am
+++ b/lib/doc/Makefile.am
@@ -1,15 +1,32 @@
 include $(top_srcdir)/config/common.am
 
-DISTCLEANFILES += $(tocfiles)
+EXTRA_DIST = README.Documentation
 
-EXTRA_DIST = depend.py doc_toc.py README.Documentation $(DEPENDFILE)
+docdir = $(pkgdatadir)/doc
+dist_doc_DATA = \
+	Additional.lyx \
+	Customization.lyx \
+	Development.lyx \
+	DummyTextDocument.txt \
+	DummyDocument1.lyx \
+	DummyDocument2.lyx \
+	EmbeddedObjects.lyx \
+	Formula-numbering.lyx \
+	Intro.lyx \
+	LaTeXConfig.lyx \
+	LFUNs.lyx \
+	Math.lyx \
+	Shortcuts.lyx \
+	SpecialParagraphShape.tex \
+	Tutorial.lyx \
+	UserGuide.lyx
 
-bibliodocdir = $(pkgdatadir)/doc/biblio
+bibliodocdir = $(docdir)/biblio
 dist_bibliodoc_DATA = \
 	biblio/alphadin.bst \
 	biblio/LyXDocs.bib
 
-clipartdocdir = $(pkgdatadir)/doc/clipart
+clipartdocdir = $(docdir)/clipart
 dist_clipartdoc_DATA = \
 	clipart/escher-lsd.eps \
 	clipart/mobius.eps \
@@ -30,8 +47,8 @@ dist_clipartdoc_DATA = \
 	clipart/LaTeX.png \
 	clipart/LyXNoteImageQt4.png \
 	clipart/macrobox.png \
+	clipart/MacroToolbar.png \
 	clipart/macrouse.png \
-	clipart/mbox.png \
 	clipart/referenceQt4.png \
 	clipart/SpaceMarker.png \
 	clipart/StandardToolbar.png \
@@ -40,27 +57,26 @@ dist_clipartdoc_DATA = \
 	clipart/without_fntright.pdf \
 	clipart/with_fntright.pdf
 
-cadocdir = $(pkgdatadir)/doc/ca
+cadocdir = $(docdir)/ca
 dist_cadoc_DATA = \
 	ca/Intro.lyx
 
-csdocdir = $(pkgdatadir)/doc/cs
+csdocdir = $(docdir)/cs
 dist_csdoc_DATA = \
 	cs/Tutorial.lyx
 
-dadocdir = $(pkgdatadir)/doc/da
+dadocdir = $(docdir)/da
 dist_dadoc_DATA = \
 	da/Intro.lyx
 
-dedocdir = $(pkgdatadir)/doc/de
+dedocdir = $(docdir)/de
 dist_dedoc_DATA = \
+	de/Additional.lyx \
 	de/Customization.lyx \
 	de/DummyDocument1.lyx \
 	de/DummyDocument2.lyx \
 	de/DummyTextDocument.txt \
 	de/EmbeddedObjects.lyx \
-	de/Extended.lyx \
-	de/FAQ.lyx \
 	de/Formelnummerierung.lyx \
 	de/Intro.lyx \
 	de/Math.lyx \
@@ -68,7 +84,7 @@ dist_dedoc_DATA = \
 	de/Tutorial.lyx \
 	de/UserGuide.lyx
 
-declipartdocdir = $(pkgdatadir)/doc/de/clipart
+declipartdocdir = $(dedocdir)/clipart
 dist_declipartdoc_DATA = \
 	de/clipart/ERT.png \
 	de/clipart/ExternesMaterialQt4.png \
@@ -80,28 +96,35 @@ dist_declipartdoc_DATA = \
 	de/clipart/Marke.png \
 	de/clipart/Querverweis.png \
 	de/clipart/StandardBoxQt4.png \
-	de/clipart/UnterdokumentQt4.png
+	de/clipart/UnterdokumentQt4.png \
+	de/clipart/Zusammenfassung.pdf
 
-esdocdir = $(pkgdatadir)/doc/es
+eldocdir = $(docdir)/el
+dist_eldoc_DATA = \
+	el/Intro.lyx
+
+esdocdir = $(docdir)/es
 dist_esdoc_DATA = \
+	es/Additional.lyx \
+	es/Customization.lyx \
 	es/DocumentoPostizo1.lyx \
 	es/DocumentoPostizo2.lyx \
 	es/DocumentoTextoPostizo.txt \
 	es/EmbeddedObjects.lyx \
-	es/Extended.lyx \
-	es/FAQ.lyx \
 	es/Formula-numbering.lyx \
 	es/Intro.lyx \
 	es/Math.lyx \
+	es/Shortcuts.lyx \
 	es/Tutorial.lyx \
 	es/UserGuide.lyx
 
-esclipartdocdir = $(pkgdatadir)/doc/es/clipart
+esclipartdocdir = $(esdocdir)/clipart
 dist_esclipartdoc_DATA = \
 	es/clipart/ComentNotaImagenQt4.png \
 	es/clipart/CuadroMinipagQt4.png \
 	es/clipart/DocumentoHijoQt4.png \
 	es/clipart/es_ERT.png \
+	es/clipart/es_ToolbarEnvBox.png \
 	es/clipart/etiquetaQt4.png \
 	es/clipart/flotanteQt4.png \
 	es/clipart/GrisNotaImagenQt4.png \
@@ -111,153 +134,164 @@ dist_esclipartdoc_DATA = \
 	es/clipart/referenciaQt4.png \
 	es/clipart/Resumen.pdf
 
-eudocdir = $(pkgdatadir)/doc/eu
+eudocdir = $(docdir)/eu
 dist_eudoc_DATA = \
-	eu/Customization.lyx \
-	eu/Extended.lyx \
-	eu/FAQ.lyx \
 	eu/Intro.lyx \
-	eu/Tutorial.lyx \
-	eu/UserGuide.lyx
+	eu/Tutorial.lyx
 
-frdocdir = $(pkgdatadir)/doc/fr
+frdocdir = $(docdir)/fr
 dist_frdoc_DATA = \
+	fr/Additional.lyx \
 	fr/Customization.lyx \
 	fr/DocumentBidon1.lyx \
 	fr/DocumentBidon2.lyx \
 	fr/DocumentTexteBidon.txt \
 	fr/EmbeddedObjects.lyx \
-	fr/Extended.lyx \
-	fr/FAQ.lyx \
 	fr/Formula-numbering.lyx \
 	fr/Intro.lyx \
 	fr/Math.lyx \
+	fr/Shortcuts.lyx \
 	fr/Tutorial.lyx \
 	fr/UserGuide.lyx
 
-frclipartdocdir = $(pkgdatadir)/doc/fr/clipart
+frclipartdocdir = $(frdocdir)/clipart
 dist_frclipartdoc_DATA = \
 	fr/clipart/BoxInsetDefaultQt4.png \
 	fr/clipart/ChildDocumentQt4.png \
 	fr/clipart/CommentNoteImageQt4.png \
+	fr/clipart/ERT.png \
 	fr/clipart/GreyedOutNoteImageQt4.png \
 	fr/clipart/LyXNoteImageQt4.png \
 	fr/clipart/floatQt4.png \
 	fr/clipart/footnoteQt4.png \
 	fr/clipart/labelQt4.png
 
-gldocdir = $(pkgdatadir)/doc/gl
+gldocdir = $(docdir)/gl
 dist_gldoc_DATA = \
 	gl/Intro.lyx \
 	gl/Tutorial.lyx
 
-hedocdir = $(pkgdatadir)/doc/he
+hedocdir = $(docdir)/he
 dist_hedoc_DATA = \
 	he/Intro.lyx \
 	he/Tutorial.lyx
 
-hudocdir = $(pkgdatadir)/doc/hu
+hudocdir = $(docdir)/hu
 dist_hudoc_DATA = \
 	hu/Intro.lyx \
 	hu/Tutorial.lyx
 
-itdocdir = $(pkgdatadir)/doc/it
+iddocdir = $(docdir)/id
+dist_iddoc_DATA = \
+	id/Intro.lyx \
+	id/Shortcuts.lyx \
+	id/Tutorial.lyx \
+	id/UserGuide.lyx
+
+idclipartdocdir = $(iddocdir)/clipart
+dist_idclipartdoc_DATA = \
+	id/clipart/id-contrib.png \
+	id/clipart/id-footnote.png \
+	id/clipart/id-lingkungan.png
+
+itdocdir = $(docdir)/it
 dist_itdoc_DATA = \
-	it/Customization.lyx \
 	it/Intro.lyx \
-	it/Tutorial.lyx \
-	it/UserGuide.lyx
+	it/Tutorial.lyx
 
-itclipartdocdir = $(pkgdatadir)/doc/it/clipart
+itclipartdocdir = $(itdocdir)/clipart
 dist_itclipartdoc_DATA = \
 	it/clipart/it_footnoteQt4.png \
 	it/clipart/it_referenceQt4.png
 
-jadocdir = $(pkgdatadir)/doc/ja
+jadocdir = $(docdir)/ja
 dist_jadoc_DATA = \
-	ja/FAQ.lyx \
+	ja/Additional.lyx \
+	ja/Customization.lyx \
+	ja/DummyDocument1.lyx \
+	ja/DummyDocument2.lyx \
+	ja/EmbeddedObjects.lyx \
+	ja/Formula-numbering.lyx \
 	ja/Intro.lyx \
 	ja/LaTeXConfig.lyx \
+	ja/Math.lyx \
 	ja/Shortcuts.lyx \
-	ja/Tutorial.lyx
+	ja/Tutorial.lyx \
+	ja/UserGuide.lyx
 
-jaclipartdocdir = $(pkgdatadir)/doc/ja/clipart
+jaclipartdocdir = $(jadocdir)/clipart
 dist_jaclipartdoc_DATA = \
+	ja/clipart/BoxInsetDefaultQt4.png \
+	ja/clipart/ChildDocumentQt4.png \
+	ja/clipart/CommentNoteImageQt4.png \
+	ja/clipart/ERT.png \
+	ja/clipart/ExternalMaterialQt4.png \
+	ja/clipart/floatQt4.png \
 	ja/clipart/footnoteQt4.png \
-	ja/clipart/referenceQt4.png
-
-nldocdir = $(pkgdatadir)/doc/nl
+	ja/clipart/GreyedOutNoteImageQt4.png \
+	ja/clipart/labelQt4.png \
+	ja/clipart/LyXNoteImageQt4.png \
+	ja/clipart/macrobox.png \
+	ja/clipart/referenceQt4.png \
+	ja/clipart/StandardToolbar.png \
+	ja/clipart/ToolbarEnvBox.png
+
+nldocdir = $(docdir)/nl
 dist_nldoc_DATA = \
 	nl/Intro.lyx \
 	nl/Tutorial.lyx
 
-nbdocdir = $(pkgdatadir)/doc/nb
+nbdocdir = $(docdir)/nb
 dist_nbdoc_DATA = \
 	nb/Intro.lyx
 
-pldocdir = $(pkgdatadir)/doc/pl
+pldocdir = $(docdir)/pl
 dist_pldoc_DATA = \
-	pl/Extended.lyx \
 	pl/Intro.lyx \
 	pl/Tutorial.lyx
 
-ptdocdir = $(pkgdatadir)/doc/pt
+ptdocdir = $(docdir)/pt
 dist_ptdoc_DATA = \
 	pt/Intro.lyx \
 	pt/Tutorial.lyx
 
-rodocdir = $(pkgdatadir)/doc/ro
+rodocdir = $(docdir)/ro
 dist_rodoc_DATA = \
 	ro/Intro.lyx
 
-rudocdir = $(pkgdatadir)/doc/ru
+rudocdir = $(docdir)/ru
 dist_rudoc_DATA = \
-	ru/FAQ.lyx \
 	ru/Intro.lyx \
 	ru/Tutorial.lyx
 
-skdocdir = $(pkgdatadir)/doc/sk
+skdocdir = $(docdir)/sk
 dist_skdoc_DATA = \
-	sk/Tutorial.lyx \
-	sk/UserGuide.lyx
+	sk/Intro.lyx \
+	sk/Tutorial.lyx
 
-sldocdir = $(pkgdatadir)/doc/sl
+sldocdir = $(docdir)/sl
 dist_sldoc_DATA = \
 	sl/Intro.lyx \
 	sl/Tutorial.lyx
 
-svdocdir = $(pkgdatadir)/doc/sv
+svdocdir = $(docdir)/sv
 dist_svdoc_DATA = \
 	sv/Intro.lyx \
+	sv/Shortcuts.lyx \
 	sv/Tutorial.lyx
 
-ukdocdir = $(pkgdatadir)/doc/uk
+ukdocdir = $(docdir)/uk
 dist_ukdoc_DATA = \
 	uk/Intro.lyx
 
-ukclipartdocdir = $(pkgdatadir)/doc/uk/clipart
+ukclipartdocdir = $(ukdocdir)/clipart
 dist_ukclipartdoc_DATA = \
 	uk/clipart/FootnoteQT4.png
 
-docdir = $(pkgdatadir)/doc
-dist_doc_DATA = \
-	Customization.lyx \
-	DocStyle.lyx \
-	DummyTextDocument.txt \
-	DummyDocument1.lyx \
-	DummyDocument2.lyx \
-	EmbeddedObjects.lyx \
-	Extended.lyx \
-	FAQ.lyx \
-	Formula-numbering.lyx \
-	Intro.lyx \
-	LaTeXConfig.lyx \
-	LFUNs.lyx \
-	Math.lyx \
-	Reference.lyx \
-	Shortcuts.lyx \
-	Tutorial.lyx \
-	UserGuide.lyx
+zhCNdocdir = $(docdir)/zh_CN
+dist_zhCNdoc_DATA = \
+	zh_CN/Intro.lyx \
+	zh_CN/Tutorial.lyx
 
 doc_files = \
 	    $(dist_doc_DATA) \
@@ -273,47 +307,19 @@ doc_files = \
 	    $(dist_hudoc_DATA) \
 	    $(dist_itdoc_DATA) \
 	    $(dist_jadoc_DATA) \
-	    $(dist_nldoc_DATA) \
 	    $(dist_nbdoc_DATA) \
+	    $(dist_nldoc_DATA) \
 	    $(dist_pldoc_DATA) \
 	    $(dist_ptdoc_DATA) \
 	    $(dist_rodoc_DATA) \
 	    $(dist_rudoc_DATA) \
 	    $(dist_skdoc_DATA) \
 	    $(dist_sldoc_DATA) \
-	    $(dist_svdoc_DATA)
-
-DEPENDFILE = $(srcdir)/Makefile.depend
-# include $(DEPENDFILE) does not work because automake is too limited.
-include $(srcdir)/Makefile.depend
-
-TOCs : $(DEPENDFILE) $(tocfiles)
-	@echo Made TOCs succesfully.
-
-# Force regeneration of $(DEPENDFILE) when Makefile.am changes because
-# new doc files might have been added
-$(DEPENDFILE): $(srcdir)/Makefile.am $(srcdir)/depend.py
-	python $(srcdir)/depend.py > $(DEPENDFILE)
-
-# The TOCs are not built for the install and dist targets if they don't exist
-# for some weird reason.
-# Make complains although we have rules for them in $(DEPENDFILE), so we
-# must not include the TOCs in $(docfiles) and have to use the install and
-# dist hooks below.
-dist-hook: $(tocfiles)
-	for i in $(tocfiles); \
-	do \
-		if test -f "$(srcdir)/$$i"; then file="$(srcdir)/$$i"; \
-		else file="$$i"; fi; \
-		cp -p "$$file" "$(distdir)"; \
-	done
-install-data-hook: $(tocfiles)
-	for i in $(tocfiles); \
-	do \
-		if test -f "$(srcdir)/$$i"; then file="$(srcdir)/$$i"; \
-		else file="$$i"; fi; \
-		$(INSTALL_DATA) "$$file" "$(DESTDIR)$(docdir)/$$i"; \
-	done
+	    $(dist_svdoc_DATA) \
+	    $(dist_ukdoc_DATA) \
+	    $(dist_zhCNdoc_DATA)
+
+install-data-hook:
 	for i in $(doc_files); \
 	do \
 		if $(EGREP) -q "LYX_DIR_VER|LYX_USERDIR_VER" "$(DESTDIR)$(docdir)/$$i"; then \
@@ -324,11 +330,3 @@ install-data-hook: $(tocfiles)
 			chmod 644 "$(DESTDIR)$(docdir)/$$i"; \
 		fi; \
 	done
-
-uninstall-local:
-	for i in $(tocfiles); \
-	do \
-		$(RM) "$(DESTDIR)$(docdir)/$$i" ; \
-	done
-
-.PHONY: TOCs