X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fdoc%2FMakefile.am;h=c5da5090a6bfefb950535a16eb64c0fdf5c0f0a8;hb=bbdee57e;hp=420d471fa883dca419652bb8697cc05ad2b7e024;hpb=f157c4665a9c120b40fa6d1ba51c355d14306714;p=lyx.git

diff --git a/lib/doc/Makefile.am b/lib/doc/Makefile.am
index 420d471fa8..c5da5090a6 100644
--- a/lib/doc/Makefile.am
+++ b/lib/doc/Makefile.am
@@ -1,25 +1,21 @@
 include $(top_srcdir)/config/common.am
 
-DISTCLEANFILES += $(tocfiles)
-
-EXTRA_DIST = depend.py doc_toc.py README.Documentation $(DEPENDFILE)
-
 docdir = $(pkgdatadir)/doc
 dist_doc_DATA = \
+	Additional.lyx \
 	Customization.lyx \
-	DocStyle.lyx \
+	Development.lyx \
 	DummyTextDocument.txt \
 	DummyDocument1.lyx \
 	DummyDocument2.lyx \
 	EmbeddedObjects.lyx \
-	Extended.lyx \
-	FAQ.lyx \
 	Formula-numbering.lyx \
 	Intro.lyx \
 	LaTeXConfig.lyx \
 	LFUNs.lyx \
 	Math.lyx \
 	Shortcuts.lyx \
+	SpecialParagraphShape.tex \
 	Tutorial.lyx \
 	UserGuide.lyx
 
@@ -30,34 +26,45 @@ dist_bibliodoc_DATA = \
 
 clipartdocdir = $(docdir)/clipart
 dist_clipartdoc_DATA = \
-	clipart/escher-lsd.eps \
-	clipart/mobius.eps \
-	clipart/platypus.eps \
+	clipart/2D-intensity-plot.pdf \
+	clipart/3D-structure-distort.pdf \
 	clipart/Abstract.pdf \
-	clipart/BoxInsetDefaultQt4.png \
+	clipart/BoxInsetDefault.png \
 	clipart/ChangesToolbar.png \
-	clipart/ChildDocumentQt4.png \
-	clipart/CommentNoteImageQt4.png \
+	clipart/ChildDocument.png \
+	clipart/CommentNoteImage.png \
 	clipart/endnotes.pdf \
 	clipart/ERT.png \
-	clipart/ExternalMaterialQt4.png \
+	clipart/escher-lsd.eps \
+	clipart/ExternalMaterial.png \
 	clipart/ExtraToolbar.png \
-	clipart/floatQt4.png \
-	clipart/footnoteQt4.png \
-	clipart/GreyedOutNoteImageQt4.png \
-	clipart/labelQt4.png \
-	clipart/LaTeX.png \
-	clipart/LyXNoteImageQt4.png \
+	clipart/float.png \
+	clipart/footnote.png \
+	clipart/GreyedOutNoteImage.png \
+	clipart/label.png \
+	clipart/LyXNoteImage.png \
 	clipart/macrobox.png \
+	clipart/MacroToolbar.png \
 	clipart/macrouse.png \
-	clipart/mbox.png \
-	clipart/referenceQt4.png \
+	clipart/mobius.eps \
+	clipart/platypus.eps \
+	clipart/reference.png \
 	clipart/SpaceMarker.png \
 	clipart/StandardToolbar.png \
+	clipart/Star-structure.pdf \
+	clipart/SVG-Drawing.svg \
 	clipart/ToolbarEnvBox.png \
 	clipart/ViewToolbar.png \
 	clipart/without_fntright.pdf \
-	clipart/with_fntright.pdf
+	clipart/with_fntright.pdf \
+	clipart/workaround.png
+
+ardocdir = $(docdir)/ar
+dist_ardoc_DATA = \
+	ar/Intro.lyx \
+	ar/Shortcuts.lyx \
+	ar/Tutorial.lyx \
+	ar/UserGuide.lyx
 
 cadocdir = $(docdir)/ca
 dist_cadoc_DATA = \
@@ -73,13 +80,12 @@ dist_dadoc_DATA = \
 
 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 \
@@ -90,81 +96,85 @@ dist_dedoc_DATA = \
 declipartdocdir = $(dedocdir)/clipart
 dist_declipartdoc_DATA = \
 	de/clipart/ERT.png \
-	de/clipart/ExternesMaterialQt4.png \
-	de/clipart/FussnoteQt4.png \
-	de/clipart/GleitobjektQt4.png \
-	de/clipart/GrauschriftNotizQt4.png \
-	de/clipart/KommentarQt4.png \
-	de/clipart/LyXNotizQt4.png \
+	de/clipart/ExternesMaterial.png \
+	de/clipart/Fussnote.png \
+	de/clipart/Gleitobjekt.png \
+	de/clipart/GrauschriftNotiz.png \
+	de/clipart/Kommentar.png \
+	de/clipart/LyXNotiz.png \
 	de/clipart/Marke.png \
 	de/clipart/Querverweis.png \
-	de/clipart/StandardBoxQt4.png \
-	de/clipart/UnterdokumentQt4.png
+	de/clipart/StandardBox.png \
+	de/clipart/Zusammenfassung.pdf
+
+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 = $(esdocdir)/clipart
 dist_esclipartdoc_DATA = \
-	es/clipart/ComentNotaImagenQt4.png \
-	es/clipart/CuadroMinipagQt4.png \
-	es/clipart/DocumentoHijoQt4.png \
+	es/clipart/ComentNotaImagen.png \
+	es/clipart/CuadroMinipagina.png \
+	es/clipart/DocumentoHijo.png \
 	es/clipart/es_ERT.png \
-	es/clipart/es_ToolbarEnvBox.png
-	es/clipart/etiquetaQt4.png \
-	es/clipart/flotanteQt4.png \
-	es/clipart/GrisNotaImagenQt4.png \
-	es/clipart/MaterialExternoQt4.png \
-	es/clipart/NotaLyXImagenQt4.png \
-	es/clipart/notapieQt4.png \
-	es/clipart/referenciaQt4.png \
+	es/clipart/es_StandardToolbar.png \
+	es/clipart/es_ToolbarEnvBox.png \
+	es/clipart/etiqueta.png \
+	es/clipart/flotante.png \
+	es/clipart/GrisNotaImagen.png \
+	es/clipart/MaterialExterno.png \
+	es/clipart/NotaLyXImagen.png \
+	es/clipart/notapie.png \
+	es/clipart/referencia.png \
 	es/clipart/Resumen.pdf
 
 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 = $(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 = $(frdocdir)/clipart
 dist_frclipartdoc_DATA = \
-	fr/clipart/BoxInsetDefaultQt4.png \
-	fr/clipart/ChildDocumentQt4.png \
-	fr/clipart/CommentNoteImageQt4.png \
-	fr/clipart/GreyedOutNoteImageQt4.png \
-	fr/clipart/LyXNoteImageQt4.png \
-	fr/clipart/floatQt4.png \
-	fr/clipart/footnoteQt4.png \
-	fr/clipart/labelQt4.png
+	fr/clipart/BoxInsetDefault.png \
+	fr/clipart/CommentNoteImage.png \
+	fr/clipart/ERT.png \
+	fr/clipart/float.png \
+	fr/clipart/footnote.png \
+	fr/clipart/GreyedOutNoteImage.png \
+	fr/clipart/label.png \
+	fr/clipart/LyXNoteImage.png \
+	fr/clipart/reference.png \
+	fr/clipart/SousDocument.png
 
 gldocdir = $(docdir)/gl
 dist_gldoc_DATA = \
@@ -181,47 +191,79 @@ dist_hudoc_DATA = \
 	hu/Intro.lyx \
 	hu/Tutorial.lyx
 
+iddocdir = $(docdir)/id
+dist_iddoc_DATA = \
+	id/Intro.lyx \
+	id/Shortcuts.lyx \
+	id/Tutorial.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 = $(itdocdir)/clipart
 dist_itclipartdoc_DATA = \
-	it/clipart/it_footnoteQt4.png \
-	it/clipart/it_referenceQt4.png
+	it/clipart/it_footnote.png \
+	it/clipart/it_reference.png
 
 jadocdir = $(docdir)/ja
 dist_jadoc_DATA = \
-	ja/FAQ.lyx \
+	ja/Additional.lyx \
+	ja/Customization.lyx \
+	ja/DummyDocument1.lyx \
+	ja/DummyDocument2.lyx \
+	ja/DummyTextDocument.txt \
+	ja/EmbeddedObjects.lyx \
+	ja/Formula-numbering.lyx \
 	ja/Intro.lyx \
 	ja/LaTeXConfig.lyx \
+	ja/Math.lyx \
 	ja/Shortcuts.lyx \
 	ja/Tutorial.lyx \
 	ja/UserGuide.lyx
 
 jaclipartdocdir = $(jadocdir)/clipart
 dist_jaclipartdoc_DATA = \
+	ja/clipart/BoxInsetDefault.png \
+	ja/clipart/ChildDocument.png \
+	ja/clipart/CommentNoteImage.png \
 	ja/clipart/ERT.png \
-	ja/clipart/floatQt4.png \
-	ja/clipart/footnoteQt4.png \
-	ja/clipart/referenceQt4.png \
+	ja/clipart/ExternalMaterial.png \
+	ja/clipart/float.png \
+	ja/clipart/footnote.png \
+	ja/clipart/GreyedOutNoteImage.png \
+	ja/clipart/label.png \
+	ja/clipart/LyXNoteImage.png \
+	ja/clipart/macrobox.png \
+	ja/clipart/reference.png \
+	ja/clipart/StandardToolbar.png \
 	ja/clipart/ToolbarEnvBox.png
 
 nldocdir = $(docdir)/nl
 dist_nldoc_DATA = \
 	nl/Intro.lyx \
+	nl/Shortcuts.lyx \
 	nl/Tutorial.lyx
 
+nlclipartdocdir = $(nldocdir)/clipart
+dist_nlclipartdoc_DATA = \
+	nl/clipart/verwijzing.png \
+	nl/clipart/voetnoot.png
+
 nbdocdir = $(docdir)/nb
 dist_nbdoc_DATA = \
-	nb/Intro.lyx
+	nb/Intro.lyx \
+	nb/Tutorial.lyx
 
 pldocdir = $(docdir)/pl
 dist_pldoc_DATA = \
-	pl/Extended.lyx \
 	pl/Intro.lyx \
 	pl/Tutorial.lyx
 
@@ -236,14 +278,17 @@ dist_rodoc_DATA = \
 
 rudocdir = $(docdir)/ru
 dist_rudoc_DATA = \
-	ru/FAQ.lyx \
 	ru/Intro.lyx \
 	ru/Tutorial.lyx
 
+ruclipartdocdir = $(rudocdir)/clipart
+dist_ruclipartdoc_DATA = \
+	ru/clipart/ToolbarEnvBox.png
+
 skdocdir = $(docdir)/sk
 dist_skdoc_DATA = \
-	sk/Tutorial.lyx \
-	sk/UserGuide.lyx
+	sk/Intro.lyx \
+	sk/Tutorial.lyx
 
 sldocdir = $(docdir)/sl
 dist_sldoc_DATA = \
@@ -253,6 +298,7 @@ dist_sldoc_DATA = \
 svdocdir = $(docdir)/sv
 dist_svdoc_DATA = \
 	sv/Intro.lyx \
+	sv/Shortcuts.lyx \
 	sv/Tutorial.lyx
 
 ukdocdir = $(docdir)/uk
@@ -261,7 +307,12 @@ dist_ukdoc_DATA = \
 
 ukclipartdocdir = $(ukdocdir)/clipart
 dist_ukclipartdoc_DATA = \
-	uk/clipart/FootnoteQT4.png
+	uk/clipart/footnote.png
+
+zhCNdocdir = $(docdir)/zh_CN
+dist_zhCNdoc_DATA = \
+	zh_CN/Intro.lyx \
+	zh_CN/Tutorial.lyx
 
 doc_files = \
 	    $(dist_doc_DATA) \
@@ -286,54 +337,19 @@ doc_files = \
 	    $(dist_skdoc_DATA) \
 	    $(dist_sldoc_DATA) \
 	    $(dist_svdoc_DATA) \
-	    $(dist_ukdoc_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_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 \
+		if $(EGREP) -q "LYX_DIR_VER|LYX_USERDIR_VER|^\\\\origin " "$(DESTDIR)$(docdir)/$$i"; then \
+			origin=`dirname "/systemlyxdir/doc/$$i"`/; \
 			sed -e "s/LYX_DIR_VER/$(LYX_DIR_VER)/g" \
 			    -e "s/LYX_USERDIR_VER/$(LYX_USERDIR_VER)/g" \
+			    -e "s|^\\\\origin .*|\\\\origin $$origin|" \
 				"$(DESTDIR)$(docdir)/$$i" > "$(DESTDIR)$(docdir)/$$i.tmp"; \
 			mv -f "$(DESTDIR)$(docdir)/$$i.tmp" "$(DESTDIR)$(docdir)/$$i"; \
 			chmod 644 "$(DESTDIR)$(docdir)/$$i"; \
 		fi; \
 	done
-
-uninstall-local:
-	for i in $(tocfiles); \
-	do \
-		$(RM) "$(DESTDIR)$(docdir)/$$i" ; \
-	done
-
-.PHONY: TOCs