]> git.lyx.org Git - lyx.git/blobdiff - lib/Makefile.am
Merge remote-tracking branch 'origin/master' into features/latexargs
[lyx.git] / lib / Makefile.am
index 11e15a2bdd4473229a0df198dcb878344381decc..f5ef988f1f3b7789a7f68e9ef1c1a168aa4383c8 100644 (file)
@@ -4,11 +4,13 @@ SUBDIRS = doc lyx2lyx
 
 CHMOD = chmod
 
-dist_pkgdata_DATA = CREDITS chkconfig.ltx external_templates encodings \
-       layouttranslations languages symbols syntax.default unicodesymbols
+dist_pkgdata_DATA = CREDITS autocorrect chkconfig.ltx external_templates \
+       encodings layouttranslations languages latexfonts 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.
-dist_pkgdata_PYTHON = configure.py 
+dist_pkgdata_DATA += configure.py 
 
 dist_noinst_DATA = \
        images/README \
@@ -66,8 +68,8 @@ dist_caexamples_DATA = \
 csexamplesdir = $(pkgdatadir)/examples/cs
 dist_csexamples_DATA = \
        examples/cs/splash.lyx \
-       priklad_syrovy.lyx \
-       priklad_zLyXovany.lyx
+       examples/cs/priklad_syrovy.lyx \
+       examples/cs/priklad_zLyXovany.lyx
 
 daexamplesdir = $(pkgdatadir)/examples/da
 dist_daexamples_DATA = \
@@ -82,7 +84,6 @@ dist_deexamples_DATA = \
        examples/de/ItemizeBullets.lyx \
        examples/de/Lebenslauf.lyx \
        examples/de/linguistics.lyx \
-       examples/de/multicol.lyx \
        examples/de/serienbrief1.lyx \
        examples/de/serienbrief2.lyx \
        examples/de/serienbrief3.lyx \
@@ -98,9 +99,10 @@ dist_esexamples_DATA = \
        examples/es/Braille.lyx \
        examples/es/ejemplo_con_lyx.lyx \
        examples/es/ejemplo_sin_lyx.lyx \
+       examples/es/europeCV.lyx \
        examples/es/ItemizeBullets.lyx \
        examples/es/linguistics.lyx \
-       examples/es/multicol.lyx \
+       examples/es/modernCV.lyx \
        examples/es/splash.lyx \
        examples/es/tufte-book.lyx \
        examples/es/tufte-handout.lyx
@@ -126,7 +128,6 @@ dist_frexamples_DATA = \
        examples/fr/Foils.lyx \
        examples/fr/linguistics.lyx \
        examples/fr/ListesPuces.lyx \
-       examples/fr/multicol.lyx \
        examples/fr/seminar.lyx \
        examples/fr/simplecv.lyx \
        examples/fr/splash.lyx \
@@ -163,15 +164,14 @@ dist_itexamples_DATA = \
 jaexamplesdir = $(pkgdatadir)/examples/ja
 dist_jaexamples_DATA = \
        examples/ja/Braille.lyx \
+       examples/ja/FeynmanDiagrams.lyx \
        examples/ja/linguistics.lyx \
-       examples/ja/multicol.lyx \
        examples/ja/splash.lyx \
        examples/ja/xyfigure.png \
        examples/ja/xypic.lyx
 
 nlexamplesdir = $(pkgdatadir)/examples/nl
 dist_nlexamples_DATA = \
-       examples/nl/multicol.lyx \
        examples/nl/opsommingstekens.lyx \
        examples/nl/splash.lyx \
        examples/nl/voorbeeld_ruw.lyx \
@@ -230,7 +230,6 @@ dist_examples_DATA = \
        examples/addressExample.adr \
        examples/amsart-test.lyx \
        examples/amsbook-test.lyx \
-       examples/armenian-article.lyx \
        examples/beamer-g4.jpg \
        examples/beamer-g4-mask.jpg \
        examples/beamer-icsi-logo.pdf \
@@ -247,7 +246,6 @@ dist_examples_DATA = \
        examples/chess-article.lyx \
        examples/chessgame.lyx \
        examples/docbook_article.lyx \
-       examples/enumitem.lyx \
        examples/europeCV.lyx \
        examples/example_lyxified.lyx \
        examples/example_raw.lyx \
@@ -256,23 +254,30 @@ dist_examples_DATA = \
        examples/iecc07.fen \
        examples/iecc12.fen \
        examples/instant_preview.lyx \
+       examples/knitr.lyx \
        examples/landslide.lyx \
        examples/lilypond.lyx \
        examples/linguistics.lyx \
        examples/listerrors.lyx \
        examples/localization_test.lyx \
+       examples/longsheet.gnumeric \
        examples/modernCV.lyx \
-       examples/multicol.lyx \
+       examples/MultilingualCaptions.lyx \
        examples/noweb2lyx.lyx \
        examples/powerdot-example.lyx \
        examples/recipebook.lyx \
+       examples/R-S-statements.lyx \
        examples/script_form.lyx \
        examples/seminar.lyx \
        examples/serial_letter1.lyx \
        examples/serial_letter2.lyx \
        examples/serial_letter3.lyx \
+       examples/sheet1.gnumeric \
+       examples/sheet2.ods \
+       examples/sheet3.xls \
        examples/simplecv.lyx \
        examples/splash.lyx \
+       examples/spreadsheet.lyx \
        examples/sweave.lyx \
        examples/tufte-book.lyx \
        examples/tufte-handout.lyx \
@@ -349,7 +354,7 @@ dist_images_DATA = \
        images/changes-output.png \
        images/changes-track.png \
        images/closetab.png \
-       images/close-tab-group.png \
+       images/tab-group-close.png \
        images/copy.png \
        images/cut.png \
        images/demote.png \
@@ -370,6 +375,7 @@ dist_images_DATA = \
        images/dialog-toggle_findreplaceadv.png \
        images/dialog-toggle_toc.png \
        images/down.png \
+       images/editclear.png \
        images/ert-insert.png \
        images/file-open.png \
        images/float-insert_figure.png \
@@ -396,7 +402,6 @@ dist_images_DATA = \
        images/layout_Scrap.png \
        images/layout_Section.png \
        images/lyx-quit.png \
-       images/lyx.png \
        images/marginalnote-insert.png \
        images/master-buffer-update.png \
        images/master-buffer-view.png \
@@ -428,8 +433,8 @@ dist_images_DATA = \
        images/reload.png \
        images/script-insert_subscript.png \
        images/script-insert_superscript.png \
-       images/split-view_horizontal.png \
-       images/split-view_vertical.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 \
@@ -496,6 +501,7 @@ dist_imagesmath_DATA = \
        images/math/bars.png \
        images/math/barwedge.png \
        images/math/Bbbk.png \
+       images/math/bcancel.png \
        images/math/because.png \
        images/math/beta.png \
        images/math/beth.png \
@@ -529,6 +535,8 @@ dist_imagesmath_DATA = \
        images/math/bullet.png \
        images/math/bumpeq.png \
        images/math/bumpeq2.png \
+       images/math/cancel.png \
+       images/math/cancelto.png \
        images/math/cap.png \
        images/math/cap2.png \
        images/math/cases.png \
@@ -732,6 +740,9 @@ dist_imagesmath_DATA = \
        images/math/mathcal_L.png \
        images/math/mathcal_O.png \
        images/math/mathcircumflex.png \
+       images/math/mathclap.png \
+       images/math/mathllap.png \
+       images/math/mathrlap.png \
        images/math/mathrm_T.png \
        images/math/matrix.png \
        images/math/measuredangle.png \
@@ -864,6 +875,7 @@ dist_imagesmath_DATA = \
        images/math/smallfrown.png \
        images/math/smallsetminus.png \
        images/math/smallsmile.png \
+       images/math/smash.png \
        images/math/smile.png \
        images/math/space.png \
        images/math/spadesuit.png \
@@ -935,6 +947,7 @@ dist_imagesmath_DATA = \
        images/math/underrightarrow.png \
        images/math/underscore.png \
        images/math/underset.png \
+       images/math/undertilde.png \
        images/math/uparrow.png \
        images/math/uparrow2.png \
        images/math/updownarrow.png \
@@ -946,6 +959,7 @@ dist_imagesmath_DATA = \
        images/math/upsilon2.png \
        images/math/upuparrows.png \
        images/math/urcorner.png \
+       images/math/utilde.png \
        images/math/varepsilon.png \
        images/math/varkappa.png \
        images/math/varnothing.png \
@@ -978,10 +992,189 @@ dist_imagesmath_DATA = \
        images/math/widetilde.png \
        images/math/wp.png \
        images/math/wr.png \
+       images/math/xcancel.png \
        images/math/xi.png \
        images/math/xi2.png \
        images/math/zeta.png
 
+imagesipadir = $(imagesdir)/ipa
+dist_imagesipa_DATA = \
+       images/ipa/ipamacro-insert_deco_bottomtiebar.png \
+       images/ipa/ipamacro-insert_deco_toptiebar.png \
+       images/ipa/ipamacro-insert_tone-falling.png \
+       images/ipa/ipamacro-insert_tone-high-rising-falling.png \
+       images/ipa/ipamacro-insert_tone-high-rising.png \
+       images/ipa/ipamacro-insert_tone-low-rising.png \
+       images/ipa/ipamacro-insert_tone-rising.png \
+       images/ipa/unicode-insert_0x002e.png \
+       images/ipa/unicode-insert_0x0061.png \
+       images/ipa/unicode-insert_0x0062.png \
+       images/ipa/unicode-insert_0x0063.png \
+       images/ipa/unicode-insert_0x0064.png \
+       images/ipa/unicode-insert_0x0065.png \
+       images/ipa/unicode-insert_0x0066.png \
+       images/ipa/unicode-insert_0x0068.png \
+       images/ipa/unicode-insert_0x0069.png \
+       images/ipa/unicode-insert_0x006b.png \
+       images/ipa/unicode-insert_0x006c.png \
+       images/ipa/unicode-insert_0x006d.png \
+       images/ipa/unicode-insert_0x006e.png \
+       images/ipa/unicode-insert_0x006f.png \
+       images/ipa/unicode-insert_0x0070.png \
+       images/ipa/unicode-insert_0x0071.png \
+       images/ipa/unicode-insert_0x0072.png \
+       images/ipa/unicode-insert_0x0073.png \
+       images/ipa/unicode-insert_0x0074.png \
+       images/ipa/unicode-insert_0x0075.png \
+       images/ipa/unicode-insert_0x0076.png \
+       images/ipa/unicode-insert_0x0077.png \
+       images/ipa/unicode-insert_0x0078.png \
+       images/ipa/unicode-insert_0x0079.png \
+       images/ipa/unicode-insert_0x007a.png \
+       images/ipa/unicode-insert_0x007c.png \
+       images/ipa/unicode-insert_0x00e6.png \
+       images/ipa/unicode-insert_0x00e7.png \
+       images/ipa/unicode-insert_0x00f0.png \
+       images/ipa/unicode-insert_0x00f8.png \
+       images/ipa/unicode-insert_0x0127.png \
+       images/ipa/unicode-insert_0x014b.png \
+       images/ipa/unicode-insert_0x0153.png \
+       images/ipa/unicode-insert_0x01c0.png \
+       images/ipa/unicode-insert_0x01c1.png \
+       images/ipa/unicode-insert_0x01c2.png \
+       images/ipa/unicode-insert_0x01c3.png \
+       images/ipa/unicode-insert_0x0250.png \
+       images/ipa/unicode-insert_0x0251.png \
+       images/ipa/unicode-insert_0x0252.png \
+       images/ipa/unicode-insert_0x0253.png \
+       images/ipa/unicode-insert_0x0254.png \
+       images/ipa/unicode-insert_0x0255.png \
+       images/ipa/unicode-insert_0x0256.png \
+       images/ipa/unicode-insert_0x0257.png \
+       images/ipa/unicode-insert_0x0258.png \
+       images/ipa/unicode-insert_0x0259.png \
+       images/ipa/unicode-insert_0x025b.png \
+       images/ipa/unicode-insert_0x025c.png \
+       images/ipa/unicode-insert_0x025e.png \
+       images/ipa/unicode-insert_0x025f.png \
+       images/ipa/unicode-insert_0x0260.png \
+       images/ipa/unicode-insert_0x0261.png \
+       images/ipa/unicode-insert_0x0262.png \
+       images/ipa/unicode-insert_0x0263.png \
+       images/ipa/unicode-insert_0x0264.png \
+       images/ipa/unicode-insert_0x0265.png \
+       images/ipa/unicode-insert_0x0266.png \
+       images/ipa/unicode-insert_0x0267.png \
+       images/ipa/unicode-insert_0x0268.png \
+       images/ipa/unicode-insert_0x026a.png \
+       images/ipa/unicode-insert_0x026c.png \
+       images/ipa/unicode-insert_0x026d.png \
+       images/ipa/unicode-insert_0x026e.png \
+       images/ipa/unicode-insert_0x026f.png \
+       images/ipa/unicode-insert_0x0270.png \
+       images/ipa/unicode-insert_0x0271.png \
+       images/ipa/unicode-insert_0x0272.png \
+       images/ipa/unicode-insert_0x0273.png \
+       images/ipa/unicode-insert_0x0274.png \
+       images/ipa/unicode-insert_0x0275.png \
+       images/ipa/unicode-insert_0x0276.png \
+       images/ipa/unicode-insert_0x0278.png \
+       images/ipa/unicode-insert_0x0279.png \
+       images/ipa/unicode-insert_0x027a.png \
+       images/ipa/unicode-insert_0x027b.png \
+       images/ipa/unicode-insert_0x027d.png \
+       images/ipa/unicode-insert_0x027e.png \
+       images/ipa/unicode-insert_0x0280.png \
+       images/ipa/unicode-insert_0x0281.png \
+       images/ipa/unicode-insert_0x0282.png \
+       images/ipa/unicode-insert_0x0283.png \
+       images/ipa/unicode-insert_0x0284.png \
+       images/ipa/unicode-insert_0x0288.png \
+       images/ipa/unicode-insert_0x0289.png \
+       images/ipa/unicode-insert_0x028a.png \
+       images/ipa/unicode-insert_0x028b.png \
+       images/ipa/unicode-insert_0x028c.png \
+       images/ipa/unicode-insert_0x028d.png \
+       images/ipa/unicode-insert_0x028e.png \
+       images/ipa/unicode-insert_0x028f.png \
+       images/ipa/unicode-insert_0x0290.png \
+       images/ipa/unicode-insert_0x0291.png \
+       images/ipa/unicode-insert_0x0292.png \
+       images/ipa/unicode-insert_0x0294.png \
+       images/ipa/unicode-insert_0x0295.png \
+       images/ipa/unicode-insert_0x0298.png \
+       images/ipa/unicode-insert_0x0299.png \
+       images/ipa/unicode-insert_0x029b.png \
+       images/ipa/unicode-insert_0x029c.png \
+       images/ipa/unicode-insert_0x029d.png \
+       images/ipa/unicode-insert_0x029f.png \
+       images/ipa/unicode-insert_0x02a1.png \
+       images/ipa/unicode-insert_0x02a2.png \
+       images/ipa/unicode-insert_0x02b0.png \
+       images/ipa/unicode-insert_0x02b2.png \
+       images/ipa/unicode-insert_0x02b7.png \
+       images/ipa/unicode-insert_0x02bc.png \
+       images/ipa/unicode-insert_0x02c8.png \
+       images/ipa/unicode-insert_0x02cc.png \
+       images/ipa/unicode-insert_0x02d0.png \
+       images/ipa/unicode-insert_0x02d1.png \
+       images/ipa/unicode-insert_0x02de.png \
+       images/ipa/unicode-insert_0x02e0.png \
+       images/ipa/unicode-insert_0x02e1.png \
+       images/ipa/unicode-insert_0x02e4.png \
+       images/ipa/unicode-insert_0x02e5.png \
+       images/ipa/unicode-insert_0x02e6.png \
+       images/ipa/unicode-insert_0x02e7.png \
+       images/ipa/unicode-insert_0x02e8.png \
+       images/ipa/unicode-insert_0x02e9.png \
+       images/ipa/unicode-insert_0x02fa.png \
+       images/ipa/unicode-insert_0x0300.png \
+       images/ipa/unicode-insert_0x0301.png \
+       images/ipa/unicode-insert_0x0302.png \
+       images/ipa/unicode-insert_0x0303.png \
+       images/ipa/unicode-insert_0x0304.png \
+       images/ipa/unicode-insert_0x0306.png \
+       images/ipa/unicode-insert_0x0308.png \
+       images/ipa/unicode-insert_0x030a.png \
+       images/ipa/unicode-insert_0x030b.png \
+       images/ipa/unicode-insert_0x030c.png \
+       images/ipa/unicode-insert_0x030f.png \
+       images/ipa/unicode-insert_0x0318.png \
+       images/ipa/unicode-insert_0x0319.png \
+       images/ipa/unicode-insert_0x031c.png \
+       images/ipa/unicode-insert_0x031d.png \
+       images/ipa/unicode-insert_0x031e.png \
+       images/ipa/unicode-insert_0x031f.png \
+       images/ipa/unicode-insert_0x0320.png \
+       images/ipa/unicode-insert_0x0324.png \
+       images/ipa/unicode-insert_0x0325.png \
+       images/ipa/unicode-insert_0x0329.png \
+       images/ipa/unicode-insert_0x032a.png \
+       images/ipa/unicode-insert_0x032c.png \
+       images/ipa/unicode-insert_0x032f.png \
+       images/ipa/unicode-insert_0x0330.png \
+       images/ipa/unicode-insert_0x0334.png \
+       images/ipa/unicode-insert_0x0339.png \
+       images/ipa/unicode-insert_0x033a.png \
+       images/ipa/unicode-insert_0x033b.png \
+       images/ipa/unicode-insert_0x033c.png \
+       images/ipa/unicode-insert_0x033d.png \
+       images/ipa/unicode-insert_0x03b2.png \
+       images/ipa/unicode-insert_0x03b8.png \
+       images/ipa/unicode-insert_0x03c7.png \
+       images/ipa/unicode-insert_0x1dc4.png \
+       images/ipa/unicode-insert_0x1dc5.png \
+       images/ipa/unicode-insert_0x1dc8.png \
+       images/ipa/unicode-insert_0x2016.png \
+       images/ipa/unicode-insert_0x203f.png \
+       images/ipa/unicode-insert_0x207f.png \
+       images/ipa/unicode-insert_0x2197.png \
+       images/ipa/unicode-insert_0x2198.png \
+       images/ipa/unicode-insert_0x2c71.png \
+       images/ipa/unicode-insert_0xa71b.png \
+       images/ipa/unicode-insert_0xa71c.png
+
+
 imagesoxygendir = $(imagesdir)/oxygen
 dist_imagesoxygen_DATA = \
        images/oxygen/all-changes-accept.png \
@@ -1018,7 +1211,7 @@ dist_imagesoxygen_DATA = \
        images/oxygen/change-reject.png \
        images/oxygen/changes-output.png \
        images/oxygen/changes-track.png \
-       images/oxygen/close-tab-group.png \
+       images/oxygen/tab-group-close.png \
        images/oxygen/closetab.png \
        images/oxygen/copy.png \
        images/oxygen/cut.png \
@@ -1064,8 +1257,8 @@ dist_imagesoxygen_DATA = \
        images/oxygen/paste.png \
        images/oxygen/redo.png \
        images/oxygen/reload.png \
-       images/oxygen/split-view_horizontal.png \
-       images/oxygen/split-view_vertical.png \
+       images/oxygen/view-split_horizontal.png \
+       images/oxygen/view-split_vertical.png \
        images/oxygen/tabular-insert.png \
        images/oxygen/textstyle-apply.png \
        images/oxygen/thesaurus-entry.png \
@@ -1128,7 +1321,7 @@ dist_imagesclassic_DATA = \
        images/classic/changes-merge.png  \
        images/classic/changes-output.png  \
        images/classic/changes-track.png  \
-       images/classic/close-tab-group.png  \
+       images/classic/tab-group-close.png  \
        images/classic/copy.png  \
        images/classic/cut.png  \
        images/classic/demote.png  \
@@ -1201,8 +1394,8 @@ dist_imagesclassic_DATA = \
        images/classic/reload.png  \
        images/classic/script-insert_subscript.png  \
        images/classic/script-insert_superscript.png  \
-       images/classic/split-view_horizontal.png  \
-       images/classic/split-view_vertical.png  \
+       images/classic/view-split_horizontal.png  \
+       images/classic/view-split_vertical.png  \
        images/classic/tabular-feature_align-decimal.png  \
        images/classic/tabular-feature_append-column.png  \
        images/classic/tabular-feature_append-row.png  \
@@ -1317,15 +1510,19 @@ dist_layouts_DATA =\
        layouts/amsdefs.inc \
        layouts/apa.layout \
        layouts/arab-article.layout \
-       layouts/armenian-article.layout \
        layouts/article.layout \
        layouts/article-beamer.layout \
+       layouts/basic.module \
        layouts/beamer.layout \
+       layouts/bicaption.module \
        layouts/book.layout \
        layouts/braille.module \
        layouts/broadway.layout \
        layouts/chess.layout \
        layouts/cl2emult.layout \
+       layouts/ctex-article.layout \
+       layouts/ctex-book.layout \
+       layouts/ctex-report.layout \
        layouts/customHeadersFooters.module \
        layouts/db_lyxmacros.inc \
        layouts/db_stdclass.inc \
@@ -1376,13 +1573,16 @@ dist_layouts_DATA =\
        layouts/iopart.layout \
        layouts/isprs.layout \
        layouts/jarticle.layout \
+       layouts/jasatex.layout \
        layouts/jbook.layout \
        layouts/jgrga.layout \
        layouts/jreport.layout \
        layouts/jsarticle.layout \
        layouts/jsbook.layout \
        layouts/jss.layout \
+       layouts/jurabib.module \
        layouts/kluwer.layout \
+       layouts/knitr.module \
        layouts/latex8.layout \
        layouts/letter.layout \
        layouts/lettre.layout \
@@ -1399,9 +1599,11 @@ dist_layouts_DATA =\
        layouts/memoir.layout \
        layouts/minimalistic.module \
        layouts/moderncv.layout \
+       layouts/multicol.module \
        layouts/mwart.layout \
        layouts/mwbk.layout \
        layouts/mwrep.layout \
+       layouts/natbib.module \
        layouts/noweb.module \
        layouts/numarticle.inc \
        layouts/numreport.inc \
@@ -1412,6 +1614,8 @@ dist_layouts_DATA =\
        layouts/report.layout \
        layouts/revtex.layout \
        layouts/revtex4.layout \
+       layouts/revtex4-1.layout \
+       layouts/rsphrase.module \
        layouts/scrartcl.layout \
        layouts/scrarticle-beamer.layout \
        layouts/scrbook.layout \
@@ -1437,15 +1641,16 @@ dist_layouts_DATA =\
        layouts/stdlayouts.inc \
        layouts/stdletter.inc \
        layouts/stdlists.inc \
+       layouts/stdlyxlist.inc \
        layouts/stdrefprefix.inc \
        layouts/stdsections.inc \
        layouts/stdstarsections.inc \
        layouts/stdstruct.inc \
        layouts/stdtitle.inc \
+       layouts/svcommon.inc \
        layouts/svglobal.layout \
        layouts/svglobal3.layout \
        layouts/svjog.layout \
-       layouts/svjour.inc \
        layouts/svmono.layout \
        layouts/svmult.layout \
        layouts/svprobth.layout \
@@ -1459,6 +1664,7 @@ dist_layouts_DATA =\
        layouts/theorems-ams-bytype.module \
        layouts/theorems-ams-extended.module \
        layouts/theorems-ams-extended-bytype.module \
+       layouts/theorems-case.inc \
        layouts/theorems-chap.module \
        layouts/theorems.inc \
        layouts/theorems-bytype.inc \
@@ -1475,6 +1681,7 @@ dist_layouts_DATA =\
        layouts/theorems-starred.inc \
        layouts/theorems-starred.module \
        layouts/theorems-std.module \
+       layouts/theorems-without-preamble.inc \
        layouts/treport.layout \
        layouts/tufte-book.layout \
        layouts/tufte-handout.layout
@@ -1482,9 +1689,12 @@ dist_layouts_DATA =\
 scriptsdir = $(pkgdatadir)/scripts
 dist_scripts_DATA = \
        scripts/bash_completion \
+       scripts/lyxknitr.R \
+       scripts/lyxstangle.R \
        scripts/lyxsweave.R
+# We use DATA now instead of PYTHON because automake 1.11.2 complains.
 # Note that we "chmod 755" manually these files in install-data-hook.
-dist_scripts_PYTHON = \
+dist_scripts_DATA += \
        scripts/clean_dvi.py \
        scripts/convertDefault.py \
        scripts/csv2lyx.py \
@@ -1500,8 +1710,6 @@ dist_scripts_PYTHON = \
        scripts/listerrors \
        scripts/lyxpak.py \
        scripts/lyxpreview2bitmap.py \
-       scripts/lyxpreview-lytex2bitmap.py \
-       scripts/lyxpreview-platex2bitmap.py \
        scripts/lyxpreview_tools.py \
        scripts/prefs2prefs.py \
        scripts/prefs2prefs_lfuns.py \
@@ -1516,13 +1724,14 @@ dist_templates_DATA = \
        templates/ACM-siggraph.lyx \
        templates/ACM-sigplan.lyx \
        templates/AEA.lyx \
-       templates/agutex.lyx \
-       templates/agu_article.lyx \
-       templates/apa.lyx \
+       templates/AGUTeX.lyx \
+       templates/AGU_article.lyx \
+       templates/APA.lyx \
        templates/beamer-conference-ornate-20min.lyx \
+       templates/ctex.lyx \
        templates/de_beamer-conference-ornate-20min.lyx \
        templates/dinbrief.lyx \
-       templates/docbook_article.lyx \
+       templates/DocBook_article.lyx \
        templates/ectaart.lyx \
        templates/elsarticle.lyx \
        templates/es_beamer-conference-ornate-20min.lyx \
@@ -1533,24 +1742,47 @@ dist_templates_DATA = \
        templates/g-brief-en.lyx \
        templates/hollywood.lyx \
        templates/IEEEtran.lyx \
-       templates/ijmpc.lyx \
-       templates/ijmpd.lyx \
-       templates/iop-article.lyx \
+       templates/IJMPC.lyx \
+       templates/IJMPD.lyx \
+       templates/IOP-article.lyx \
+       templates/JASA.lyx \
        templates/JSS-article.lyx \
        templates/kluwer.lyx \
        templates/koma-letter2.lyx \
-       templates/latex8.lyx \
        templates/letter.lyx \
        templates/lettre.lyx \
        templates/README.new_templates \
-       templates/revtex.lyx \
        templates/revtex4.lyx \
-       templates/slides.lyx \
-       templates/svjour3.lyx \
-       templates/svmono_book.lyx \
-       templates/svmult_appendix.lyx \
-       templates/svmult_author.lyx \
-       templates/svmult_editor.lyx
+       templates/revtex4-1.lyx \
+       templates/slides.lyx
+
+springertemplatesdir = $(pkgdatadir)/templates/springer
+dist_springertemplates_DATA = \
+       templates/springer/svjour3.lyx \
+       templates/springer/svmono_acknow.lyx \
+       templates/springer/svmono_acronym.lyx \
+       templates/springer/svmono_appendix.lyx \
+       templates/springer/svmono_book-master.lyx \
+       templates/springer/svmono_chapter.lyx \
+       templates/springer/svmono_dedication.lyx \
+       templates/springer/svmono_foreword.lyx \
+       templates/springer/svmono_glossary.lyx \
+       templates/springer/svmono_part.lyx \
+       templates/springer/svmono_preface.lyx
+       templates/springer/svmono_referenc.lyx \
+       templates/springer/svmono_solutions.lyx \
+       templates/springer/svmult_acknow.lyx \
+       templates/springer/svmult_acronym.lyx \
+       templates/springer/svmult_appendix.lyx \
+       templates/springer/svmult_author.lyx \
+       templates/springer/svmult_cblist.lyx \
+       templates/springer/svmult_dedication.lyx \
+       templates/springer/svmult_editor-master.lyx \
+       templates/springer/svmult_foreword.lyx \
+       templates/springer/svmult_glossary.lyx \
+       templates/springer/svmult_part.lyx \
+       templates/springer/svmult_preface.lyx \
+       templates/springer/svmult_referenc.lyx
 
 thesistemplatesdir = $(pkgdatadir)/templates/thesis
 dist_thesistemplates_DATA = \
@@ -1583,8 +1815,34 @@ dist_ui_DATA = \
        ui/stdmenus.inc \
        ui/stdtoolbars.inc
 
+if INSTALL_POSIX
+# install application icons. The 'hicolor' theme is the default theme
+# where applications themselves should install their icons.
+lyx@program_suffix@.svg: images/lyx.svg
+       $(AM_V_GEN)$(INSTALL_DATA) $< $@
+scalableappiconsdir = $(datadir)/icons/hicolor/scalable/apps
+scalableappicons_DATA = lyx@program_suffix@.svg
+
+lyx@program_suffix@.png: images/lyx.png
+       $(AM_V_GEN)$(INSTALL_DATA) $< $@
+fixedappiconsdir = $(datadir)/icons/hicolor/48x48/apps
+fixedappicons_DATA = lyx@program_suffix@.png
+
+# if configure is asked to generate the name with suffix directly, then
+# config.status refuses to rebuild this file (with a variable name), and
+# a build error ensues when lyx.desktop.in is changed.
+lyx@program_suffix@.desktop: lyx.desktop-temp
+       $(AM_V_GEN)$(INSTALL_DATA) $< $@
+desktopdir = $(datadir)/applications
+desktop_DATA = lyx@program_suffix@.desktop
+
+CLEANFILES += lyx@program_suffix@.desktop lyx.desktop-temp \
+              lyx@program_suffix@.svg lyx@program_suffix@.png
+endif
+dist_noinst_DATA += lyx.desktop.in images/lyx.svg images/lyx.png
+
 install-data-hook:
        $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure.py
-       for i in $(dist_scripts_PYTHON); do \
-               $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/$$i; \
+       for i in $(scriptsdir)/*.py $(scriptsdir)/listerrors ; do \
+               $(CHMOD) 755 $(DESTDIR)/$$i; \
        done