X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=c79596f1489738b1c13bd81280d3333710b672b9;hb=9c06bd09eac71d12325c9b5bc32eec014ae7db2b;hp=e70b5cd0e2bf9a6b5d8054740911729c8f3b2058;hpb=9c55af4a223ce4db29d643251109e245665344bd;p=lyx.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e70b5cd0e2..c79596f148 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,8 +7,8 @@ CHMOD = chmod
 EXTRA_DIST = examples/CMakeLists.txt scripts/CMakeLists.txt
 
 dist_pkgdata_DATA = CREDITS autocorrect chkconfig.ltx external_templates \
-	encodings layouttranslations languages latexfonts symbols syntax.default \
-	unicodesymbols
+	encodings layouttranslations languages latexfonts RELEASE-NOTES \
+	symbols syntax.default unicodesymbols
 
 # We use DATA now instead of PYTHON because automake 1.11.2 complains.
 # Note that we "chmod 755" manually this file in install-data-hook.
@@ -88,9 +88,12 @@ dist_deexamples_DATA = \
 	examples/de/beispiel_roh.lyx \
 	examples/de/Braille.lyx \
 	examples/de/Dezimal.lyx \
+	examples/de/europassCV.lyx \
+	examples/de/FeynmanDiagrams.lyx \
 	examples/de/ItemizeBullets.lyx \
 	examples/de/Lebenslauf.lyx \
 	examples/de/linguistics.lyx \
+	examples/de/MultilingualCaptions.lyx \
 	examples/de/serienbrief1.lyx \
 	examples/de/serienbrief2.lyx \
 	examples/de/serienbrief3.lyx \
@@ -135,6 +138,7 @@ dist_frexamples_DATA = \
 	examples/fr/Foils.lyx \
 	examples/fr/linguistics.lyx \
 	examples/fr/ListesPuces.lyx \
+	examples/fr/MultilingualCaptions.lyx \
 	examples/fr/seminar.lyx \
 	examples/fr/simplecv.lyx \
 	examples/fr/splash.lyx \
@@ -305,6 +309,7 @@ dist_examples_DATA = \
 	examples/chessgame.lyx \
 	examples/docbook_article.lyx \
 	examples/europeCV.lyx \
+	examples/europassCV.lyx \
 	examples/example_lyxified.lyx \
 	examples/example_raw.lyx \
 	examples/FeynmanDiagrams.lyx \
@@ -323,6 +328,7 @@ dist_examples_DATA = \
 	examples/MultilingualCaptions.lyx \
 	examples/noweb2lyx.lyx \
 	examples/PDF-comment.lyx \
+	examples/PDF-form.lyx \
 	examples/powerdot-example.lyx \
 	examples/recipebook.lyx \
 	examples/R-S-statements.lyx \
@@ -364,7 +370,6 @@ imagesdir = $(pkgdatadir)/images
 dist_images_DATA1X = \
 	images/all-changes-accept.png \
 	images/all-changes-reject.png \
-	images/amssymb.png \
 	images/banner.png \
 	images/bookmark-goto.png \
 	images/bookmark-goto_0.png \
@@ -418,7 +423,6 @@ dist_images_DATA1X = \
 	images/tab-group-close.png \
 	images/copy.png \
 	images/cut.png \
-	images/demote.png \
 	images/depth-decrement.png \
 	images/depth-increment.png \
 	images/dialog-preferences.png \
@@ -437,6 +441,7 @@ dist_images_DATA1X = \
 	images/dialog-toggle_toc.png \
 	images/down.png \
 	images/editclear.png \
+	images/emblem-readonly.png \
 	images/ert-insert.png \
 	images/file-open.png \
 	images/float-insert_figure.png \
@@ -484,12 +489,11 @@ dist_images_DATA1X = \
 	images/nomencl-insert.png \
 	images/note-insert.png \
 	images/note-next.png \
+	images/outline-down.png \
+	images/outline-in.png \
+	images/outline-out.png \
+	images/outline-up.png \
 	images/paste.png \
-	images/promote.png \
-	images/psnfss1.png \
-	images/psnfss2.png \
-	images/psnfss3.png \
-	images/psnfss4.png \
 	images/redo.png \
 	images/reload.png \
 	images/script-insert_subscript.png \
@@ -497,7 +501,6 @@ dist_images_DATA1X = \
 	images/spelling-continuously.png \
 	images/view-split_horizontal.png \
 	images/view-split_vertical.png \
-	images/standard.png \
 	images/tabular-feature_align-decimal.png \
 	images/tabular-feature_append-column.png \
 	images/tabular-feature_append-row.png \
@@ -547,6 +550,9 @@ dist_images_DATA1X = \
 	images/vc-revert.png \
 	images/view-others.png
 
+dist_images_DATA3X = \
+	${dist_images_DATA1X:%.png=%.svgz}
+
 # possible shortcut for complete set of 2x sized icons
 #dist_images_DATA2X = \
 #	${dist_images_DATA1X:%.png=%@2x.png}
@@ -555,11 +561,18 @@ dist_images_DATA2X = \
 	images/banner@2x.png
 
 dist_images_DATA = \
+	images/amssymb.png \
+	images/psnfss1.png \
+	images/psnfss2.png \
+	images/psnfss3.png \
+	images/psnfss4.png \
+	images/standard.png \
 	${dist_images_DATA1X} \
-	${dist_images_DATA2X}
+	${dist_images_DATA2X} \
+	${dist_images_DATA3X}
 
 imagesmathdir = $(imagesdir)/math
-dist_imagesmath_DATA = \
+dist_imagesmath_DATA1X = \
 	images/math/AC.png \
 	images/math/acute.png \
 	images/math/adots.png \
@@ -641,6 +654,7 @@ dist_imagesmath_DATA = \
 	images/math/blacktriangledown.png \
 	images/math/blacktriangleleft.png \
 	images/math/blacktriangleright.png \
+	images/math/boldsymbol.png \
 	images/math/bot.png \
 	images/math/bowtie.png \
 	images/math/bowtie2.png \
@@ -976,12 +990,15 @@ dist_imagesmath_DATA = \
 	images/math/mapstochar.png \
 	images/math/mapstochar2.png \
 	images/math/mars.png \
+	images/math/mathbb.png \
 	images/math/mathbb_C.png \
 	images/math/mathbb_H.png \
 	images/math/mathbb_N.png \
 	images/math/mathbb_Q.png \
 	images/math/mathbb_R.png \
 	images/math/mathbb_Z.png \
+	images/math/mathbf.png \
+	images/math/mathcal.png \
 	images/math/mathcal_F.png \
 	images/math/mathcal_H.png \
 	images/math/mathcal_L.png \
@@ -989,12 +1006,18 @@ dist_imagesmath_DATA = \
 	images/math/mathcircumflex.png \
 	images/math/mathclap.png \
 	images/math/mathdollar.png \
+	images/math/mathfrak.png \
+	images/math/mathit.png \
 	images/math/mathllap.png \
 	images/math/mathparagraph.png \
+	images/math/mathscr.png \
 	images/math/mathsection.png \
 	images/math/mathring.png \
 	images/math/mathrlap.png \
+	images/math/mathrm.png \
 	images/math/mathrm_T.png \
+	images/math/mathsf.png \
+	images/math/mathtt.png \
 	images/math/matrix.png \
 	images/math/measuredangle.png \
 	images/math/mercury.png \
@@ -1262,6 +1285,7 @@ dist_imagesmath_DATA = \
 	images/math/theta.png \
 	images/math/theta2.png \
 	images/math/textdegree.png \
+	images/math/textrm.png \
 	images/math/thickapprox.png \
 	images/math/thicksim.png \
 	images/math/thorn.png \
@@ -1407,8 +1431,15 @@ dist_imagesmath_DATA = \
 	images/math/Yup.png \
 	images/math/zeta.png
 
+dist_imagesmath_DATA2X = \
+	${dist_imagesmath_DATA1X:%.png=%.svgz}
+
+dist_imagesmath_DATA = \
+	${dist_imagesmath_DATA1X} \
+	${dist_imagesmath_DATA2X}
+
 imagesipadir = $(imagesdir)/ipa
-dist_imagesipa_DATA = \
+dist_imagesipa_DATA1X = \
 	images/ipa/ipamacro-insert_deco_bottomtiebar.png \
 	images/ipa/ipamacro-insert_deco_toptiebar.png \
 	images/ipa/ipamacro-insert_tone-falling.png \
@@ -1584,9 +1615,16 @@ dist_imagesipa_DATA = \
 	images/ipa/unicode-insert_0xa71b.png \
 	images/ipa/unicode-insert_0xa71c.png
 
+dist_imagesipa_DATA2X = \
+	${dist_imagesipa_DATA1X:%.png=%.svgz}
+
+dist_imagesipa_DATA = \
+	${dist_imagesipa_DATA1X} \
+	${dist_imagesipa_DATA2X}
+
 
 imagesoxygendir = $(imagesdir)/oxygen
-dist_imagesoxygen_DATA = \
+dist_imagesoxygen_DATA1X = \
 	images/oxygen/all-changes-accept.png \
 	images/oxygen/all-changes-reject.png \
 	images/oxygen/bookmark-goto.png \
@@ -1645,7 +1683,6 @@ dist_imagesoxygen_DATA = \
 	images/oxygen/font-emph.png \
 	images/oxygen/font-noun.png \
 	images/oxygen/footnote-insert.png \
-	images/oxygen/iconsize.png \
 	images/oxygen/href-insert.png \
 	images/oxygen/index-insert.png \
 	images/oxygen/label-insert.png \
@@ -1682,6 +1719,25 @@ dist_imagesoxygen_DATA = \
 	images/oxygen/vc-revert.png \
 	images/oxygen/view-others.png
 
+dist_imagesoxygen_DATA2X = \
+	${dist_imagesoxygen_DATA1X:%.png=%.svgz}
+
+dist_imagesoxygen_DATA = \
+	images/oxygen/iconsize.png \
+	${dist_imagesoxygen_DATA1X} \
+	${dist_imagesoxygen_DATA2X}
+
+imagesmathoxygendir = $(imagesdir)/math/oxygen
+dist_imagesmathoxygen_DATA = \
+	images/math/oxygen/cases.svgz \
+	images/math/oxygen/delim.svgz \
+	images/math/oxygen/font.svgz \
+	images/math/oxygen/frac.svgz \
+	images/math/oxygen/frac-square.svgz \
+	images/math/oxygen/functions.svgz \
+	images/math/oxygen/space.svgz \
+	images/math/oxygen/style.svgz
+
 imagesclassicdir = $(imagesdir)/classic
 dist_imagesclassic_DATA = \
 	images/classic/all-changes-accept.png  \
@@ -1736,7 +1792,6 @@ dist_imagesclassic_DATA = \
 	images/classic/tab-group-close.png  \
 	images/classic/copy.png  \
 	images/classic/cut.png  \
-	images/classic/demote.png  \
 	images/classic/depth-decrement.png  \
 	images/classic/depth-increment.png  \
 	images/classic/dialog-preferences.png  \
@@ -1800,8 +1855,11 @@ dist_imagesclassic_DATA = \
 	images/classic/nomencl-insert.png  \
 	images/classic/note-insert.png  \
 	images/classic/note-next.png  \
+	images/classic/outline-down.png  \
+	images/classic/outline-in.png  \
+	images/classic/outline-out.png  \
+	images/classic/outline-up.png  \
 	images/classic/paste.png  \
-	images/classic/promote.png  \
 	images/classic/redo.png  \
 	images/classic/reload.png  \
 	images/classic/script-insert_subscript.png  \
@@ -1968,6 +2026,7 @@ dist_layouts_DATA =\
 	layouts/entcs.layout \
 	layouts/enumitem.module \
 	layouts/eqs-within-sections.module \
+	layouts/europasscv.layout \
 	layouts/europecv.layout \
 	layouts/extarticle.layout \
 	layouts/extbook.layout \
@@ -2031,6 +2090,7 @@ dist_layouts_DATA =\
 	layouts/numrevtex.inc \
 	layouts/paper.layout \
 	layouts/pdfcomment.module \
+	layouts/pdfform.module \
 	layouts/powerdot.layout \
 	layouts/RJournal.layout \
 	layouts/recipebook.layout \
@@ -2124,6 +2184,7 @@ dist_scripts_DATA = \
 # Note that we "chmod 755" manually these files in install-data-hook.
 dist_scripts_DATA += \
 	scripts/clean_dvi.py \
+	scripts/convert_pdf.py \
 	scripts/convertDefault.py \
 	scripts/csv2lyx.py \
 	scripts/date.py \
@@ -2179,6 +2240,7 @@ dist_templates_DATA = \
 	templates/IJMPC.lyx \
 	templates/IJMPD.lyx \
 	templates/IOP-article.lyx \
+	templates/ja_beamer-conference-ornate-20min.lyx \
 	templates/JASA.lyx \
 	templates/JSS-article.lyx \
 	templates/kluwer.lyx \
@@ -2246,11 +2308,52 @@ CLEANFILES += lyx@program_suffix@.desktop lyx.desktop-temp \
 endif
 dist_noinst_DATA += lyx.desktop.in images/lyx.svg images/lyx.png
 
+exampleandtemplate_files = \
+			   $(dist_caexamples_DATA) \
+			   $(dist_csexamples_DATA) \
+			   $(dist_daexamples_DATA) \
+			   $(dist_deexamples_DATA) \
+			   $(dist_elexamples_DATA) \
+			   $(dist_esexamples_DATA) \
+			   $(dist_euexamples_DATA) \
+			   $(dist_faexamples_DATA) \
+			   $(dist_frexamples_DATA) \
+			   $(dist_glexamples_DATA) \
+			   $(dist_heexamples_DATA) \
+			   $(dist_huexamples_DATA) \
+			   $(dist_idexamples_DATA) \
+			   $(dist_itexamples_DATA) \
+			   $(dist_jaexamples_DATA) \
+			   $(dist_koexamples_DATA) \
+			   $(dist_nlexamples_DATA) \
+			   $(dist_plexamples_DATA) \
+			   $(dist_ptexamples_DATA) \
+			   $(dist_roexamples_DATA) \
+			   $(dist_ruexamples_DATA) \
+			   $(dist_slexamples_DATA) \
+			   $(dist_skexamples_DATA) \
+			   $(dist_srexamples_DATA) \
+			   $(dist_svexamples_DATA) \
+			   $(dist_springerexamples_DATA) \
+			   $(dist_thesisexamples_DATA) \
+			   $(dist_ukexamples_DATA) \
+			   $(dist_examples_DATA) \
+			   $(dist_templates_DATA)
+
 install-data-hook:
 	$(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure.py
 	for i in $(DESTDIR)$(scriptsdir)/*.py $(DESTDIR)$(scriptsdir)/listerrors ; do \
 		$(CHMOD) 755 $$i; \
 	done
+	for i in $(exampleandtemplate_files); do \
+		if $(EGREP) -q "^\\\\origin " "$(DESTDIR)$(pkgdatadir)/$$i"; then \
+			origin=`dirname "/systemlyxdir/$$i"`/; \
+			sed -e "s|^\\\\origin .*|\\\\origin $$origin|" \
+				"$(DESTDIR)$(pkgdatadir)/$$i" > "$(DESTDIR)$(pkgdatadir)/$$i.tmp"; \
+			mv -f "$(DESTDIR)$(pkgdatadir)/$$i.tmp" "$(DESTDIR)$(pkgdatadir)/$$i"; \
+			chmod 644 "$(DESTDIR)$(pkgdatadir)/$$i"; \
+		fi; \
+	done
 
 alltests: check alltests-recursive