]> git.lyx.org Git - lyx.git/blobdiff - lib/Makefile.am
Add support for R package knitr (a Sweave alternative)
[lyx.git] / lib / Makefile.am
index f90defd3b23d7286eca33cfdcc02cbe15e4bb3bc..7af19a0d81c33e501a5dbc35049efbb973a9605e 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 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 \
@@ -65,7 +67,9 @@ dist_caexamples_DATA = \
 
 csexamplesdir = $(pkgdatadir)/examples/cs
 dist_csexamples_DATA = \
-       examples/cs/splash.lyx
+       examples/cs/splash.lyx \
+       examples/cs/priklad_syrovy.lyx \
+       examples/cs/priklad_zLyXovany.lyx
 
 daexamplesdir = $(pkgdatadir)/examples/da
 dist_daexamples_DATA = \
@@ -80,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,7 +101,6 @@ dist_esexamples_DATA = \
        examples/es/ejemplo_sin_lyx.lyx \
        examples/es/ItemizeBullets.lyx \
        examples/es/linguistics.lyx \
-       examples/es/multicol.lyx \
        examples/es/splash.lyx \
        examples/es/tufte-book.lyx \
        examples/es/tufte-handout.lyx
@@ -124,7 +126,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 \
@@ -161,15 +162,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 \
@@ -245,7 +245,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 \
@@ -253,23 +252,31 @@ dist_examples_DATA = \
        examples/iecc05.fen \
        examples/iecc07.fen \
        examples/iecc12.fen \
-       examples/instant_preview.lyx \
        examples/landslide.lyx \
+       examples/instant_preview.lyx \
+       examples/knitr.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 \
@@ -367,6 +374,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 \
@@ -393,7 +401,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 \
@@ -729,6 +736,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 \
@@ -861,6 +871,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 \
@@ -932,6 +943,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 \
@@ -943,6 +955,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 \
@@ -991,8 +1004,23 @@ dist_imagesoxygen_DATA = \
        images/oxygen/buffer-reload.png \
        images/oxygen/buffer-toggle-output-sync.png \
        images/oxygen/buffer-update.png \
+       images/oxygen/buffer-update_dvi.png \
+       images/oxygen/buffer-update_dvi3.png \
+       images/oxygen/buffer-update_pdf.png \
+       images/oxygen/buffer-update_pdf2.png \
+       images/oxygen/buffer-update_pdf3.png \
+       images/oxygen/buffer-update_pdf4.png \
+       images/oxygen/buffer-update_pdf5.png \
+       images/oxygen/buffer-update_ps.png \
        images/oxygen/buffer-view.png \
        images/oxygen/buffer-view_dvi.png \
+       images/oxygen/buffer-view_dvi3.png \
+       images/oxygen/buffer-view_pdf.png \
+       images/oxygen/buffer-view_pdf2.png \
+       images/oxygen/buffer-view_pdf3.png \
+       images/oxygen/buffer-view_pdf4.png \
+       images/oxygen/buffer-view_pdf5.png \
+       images/oxygen/buffer-view_ps.png \
        images/oxygen/buffer-write-as.png \
        images/oxygen/buffer-write.png \
        images/oxygen/change-accept.png \
@@ -1059,135 +1087,177 @@ dist_imagesoxygen_DATA = \
        images/oxygen/vc-revert.png \
        images/oxygen/view-others.png
 
-imagesliberdir = $(imagesdir)/liber
-dist_imagesliber_DATA = \
-       images/liber/all-changes-accept.png  \
-       images/liber/all-changes-reject.png  \
-       images/liber/bookmark-goto.png  \
-       images/liber/bookmark-goto_0.png  \
-       images/liber/bookmark-save.png  \
-       images/liber/box-insert.png  \
-       images/liber/break-line.png  \
-       images/liber/buffer-export_dvi.png  \
-       images/liber/buffer-export_dvi3.png  \
-       images/liber/buffer-export_pdf.png  \
-       images/liber/buffer-export_pdf2.png  \
-       images/liber/buffer-export_pdf3.png  \
-       images/liber/buffer-export_pdf4.png  \
-       images/liber/buffer-export_pdf5.png  \
-       images/liber/buffer-export_ps.png  \
-       images/liber/buffer-new.png  \
-       images/liber/buffer-toggle-output-sync.png  \
-       images/liber/buffer-update.png  \
-       images/liber/buffer-update_dvi.png  \
-       images/liber/buffer-update_dvi3.png  \
-       images/liber/buffer-update_pdf.png  \
-       images/liber/buffer-update_pdf2.png  \
-       images/liber/buffer-update_pdf3.png  \
-       images/liber/buffer-update_pdf4.png  \
-       images/liber/buffer-update_pdf5.png  \
-       images/liber/buffer-update_ps.png  \
-       images/liber/buffer-view.png  \
-       images/liber/buffer-view_dvi.png  \
-       images/liber/buffer-view_dvi3.png  \
-       images/liber/buffer-view_pdf.png  \
-       images/liber/buffer-view_pdf2.png  \
-       images/liber/buffer-view_pdf3.png  \
-       images/liber/buffer-view_pdf4.png  \
-       images/liber/buffer-view_pdf5.png  \
-       images/liber/buffer-view_ps.png  \
-       images/liber/buffer-write-as.png  \
-       images/liber/buffer-write.png  \
-       images/liber/build-program.png  \
-       images/liber/change-accept.png  \
-       images/liber/change-next.png  \
-       images/liber/change-reject.png  \
-       images/liber/changes-merge.png  \
-       images/liber/changes-output.png  \
-       images/liber/changes-track.png  \
-       images/liber/copy.png  \
-       images/liber/cut.png  \
-       images/liber/demote.png  \
-       images/liber/depth-decrement.png  \
-       images/liber/depth-increment.png  \
-       images/liber/dialog-preferences.png  \
-       images/liber/dialog-show-new-inset_citation.png  \
-       images/liber/dialog-show-new-inset_graphics.png  \
-       images/liber/dialog-show-new-inset_include.png  \
-       images/liber/dialog-show-new-inset_ref.png  \
-       images/liber/dialog-show_character.png  \
-       images/liber/dialog-show_findreplace.png  \
-       images/liber/dialog-show_print.png  \
-       images/liber/dialog-show_spellchecker.png  \
-       images/liber/dialog-toggle_findreplaceadv.png  \
-       images/liber/dialog-toggle_toc.png  \
-       images/liber/down.png  \
-       images/liber/ert-insert.png  \
-       images/liber/file-open.png  \
-       images/liber/float-insert_figure.png  \
-       images/liber/float-insert_table.png  \
-       images/liber/font-bold.png  \
-       images/liber/font-emph.png  \
-       images/liber/font-noun.png  \
-       images/liber/footnote-insert.png  \
-       images/liber/href-insert.png  \
-       images/liber/iconsize.png  \
-       images/liber/index-insert.png  \
-       images/liber/label-insert.png  \
-       images/liber/layout-document.png  \
-       images/liber/layout-paragraph.png  \
-       images/liber/layout.png  \
-       images/liber/layout_Description.png  \
-       images/liber/layout_Enumerate.png  \
-       images/liber/layout_Itemize.png  \
-       images/liber/layout_List.png  \
-       images/liber/marginalnote-insert.png  \
-       images/liber/master-buffer-update.png  \
-       images/liber/master-buffer-view.png  \
-       images/liber/math-macro_newmacroname_newcommand.png  \
-       images/liber/math-mode.png  \
-       images/liber/nomencl-insert.png  \
-       images/liber/note-insert.png  \
-       images/liber/note-next.png  \
-       images/liber/paste.png  \
-       images/liber/promote.png  \
-       images/liber/redo.png  \
-       images/liber/reload.png  \
-       images/liber/tabular-feature_align-decimal.png  \
-       images/liber/tabular-feature_append-column.png  \
-       images/liber/tabular-feature_append-row.png  \
-       images/liber/tabular-feature_delete-column.png  \
-       images/liber/tabular-feature_delete-row.png  \
-       images/liber/tabular-feature_m-align-center.png  \
-       images/liber/tabular-feature_m-align-left.png  \
-       images/liber/tabular-feature_m-align-right.png  \
-       images/liber/tabular-feature_m-valign-bottom.png  \
-       images/liber/tabular-feature_m-valign-middle.png  \
-       images/liber/tabular-feature_m-valign-top.png  \
-       images/liber/tabular-feature_multicolumn.png  \
-       images/liber/tabular-feature_multirow.png  \
-       images/liber/tabular-feature_set-all-lines.png  \
-       images/liber/tabular-feature_set-border-lines.png  \
-       images/liber/tabular-feature_set-rotate-cell.png  \
-       images/liber/tabular-feature_set-rotate-tabular.png  \
-       images/liber/tabular-feature_toggle-line-bottom.png  \
-       images/liber/tabular-feature_toggle-line-left.png  \
-       images/liber/tabular-feature_toggle-line-right.png  \
-       images/liber/tabular-feature_toggle-line-top.png  \
-       images/liber/tabular-feature_toggle-rotate-cell.png  \
-       images/liber/tabular-feature_toggle-rotate-tabular.png  \
-       images/liber/tabular-feature_unset-all-lines.png  \
-       images/liber/tabular-insert.png  \
-       images/liber/tabular-template.png  \
-       images/liber/textstyle-apply.png  \
-       images/liber/thesaurus-entry.png  \
-       images/liber/toolbar-toggle_math.png  \
-       images/liber/toolbar-toggle_math_panels.png  \
-       images/liber/toolbar-toggle_table.png  \
-       images/liber/undo.png  \
-       images/liber/up.png  \
-       images/liber/update-others.png  \
-       images/liber/view-others.png
+imagesclassicdir = $(imagesdir)/classic
+dist_imagesclassic_DATA = \
+       images/classic/all-changes-accept.png  \
+       images/classic/all-changes-reject.png  \
+       images/classic/bookmark-goto.png  \
+       images/classic/bookmark-goto_0.png  \
+       images/classic/bookmark-save.png  \
+       images/classic/box-insert.png  \
+       images/classic/break-line.png  \
+       images/classic/buffer-close.png  \
+       images/classic/buffer-export.png  \
+       images/classic/buffer-export_dvi.png  \
+       images/classic/buffer-export_dvi3.png  \
+       images/classic/buffer-export_latex.png  \
+       images/classic/buffer-export_pdf.png  \
+       images/classic/buffer-export_pdf2.png  \
+       images/classic/buffer-export_pdf3.png  \
+       images/classic/buffer-export_pdf4.png  \
+       images/classic/buffer-export_pdf5.png  \
+       images/classic/buffer-export_ps.png  \
+       images/classic/buffer-export_text.png  \
+       images/classic/buffer-new.png  \
+       images/classic/buffer-reload.png  \
+       images/classic/buffer-toggle-output-sync.png  \
+       images/classic/buffer-update.png  \
+       images/classic/buffer-update_dvi.png  \
+       images/classic/buffer-update_dvi3.png  \
+       images/classic/buffer-update_pdf.png  \
+       images/classic/buffer-update_pdf2.png  \
+       images/classic/buffer-update_pdf3.png  \
+       images/classic/buffer-update_pdf4.png  \
+       images/classic/buffer-update_pdf5.png  \
+       images/classic/buffer-update_ps.png  \
+       images/classic/buffer-view.png  \
+       images/classic/buffer-view_dvi.png  \
+       images/classic/buffer-view_dvi3.png  \
+       images/classic/buffer-view_pdf.png  \
+       images/classic/buffer-view_pdf2.png  \
+       images/classic/buffer-view_pdf3.png  \
+       images/classic/buffer-view_pdf4.png  \
+       images/classic/buffer-view_pdf5.png  \
+       images/classic/buffer-view_ps.png  \
+       images/classic/buffer-write-as.png  \
+       images/classic/buffer-write.png  \
+       images/classic/build-program.png  \
+       images/classic/change-accept.png  \
+       images/classic/change-next.png  \
+       images/classic/change-reject.png  \
+       images/classic/changes-merge.png  \
+       images/classic/changes-output.png  \
+       images/classic/changes-track.png  \
+       images/classic/close-tab-group.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  \
+       images/classic/dialog-show_mathdelimiter.png  \
+       images/classic/dialog-show_mathmatrix.png  \
+       images/classic/dialog-show-new-inset_citation.png  \
+       images/classic/dialog-show-new-inset_graphics.png  \
+       images/classic/dialog-show-new-inset_include.png  \
+       images/classic/dialog-show-new-inset_ref.png  \
+       images/classic/dialog-show_character.png  \
+       images/classic/dialog-show_findreplace.png  \
+       images/classic/dialog-show_print.png  \
+       images/classic/dialog-show_spellchecker.png  \
+       images/classic/dialog-show_vclog.png  \
+       images/classic/dialog-toggle_findreplaceadv.png  \
+       images/classic/dialog-toggle_toc.png  \
+       images/classic/down.png  \
+       images/classic/ert-insert.png  \
+       images/classic/file-open.png  \
+       images/classic/float-insert_figure.png  \
+       images/classic/float-insert_table.png  \
+       images/classic/font-bold.png  \
+       images/classic/font-emph.png  \
+       images/classic/font-noun.png  \
+       images/classic/font-sans.png  \
+       images/classic/font-smallcaps.png  \
+       images/classic/footnote-insert.png  \
+       images/classic/href-insert.png  \
+       images/classic/iconsize.png  \
+       images/classic/index-insert.png  \
+       images/classic/info-insert_buffer_vcs-revision.png  \
+       images/classic/label-insert.png  \
+       images/classic/layout-document.png  \
+       images/classic/layout-paragraph.png  \
+       images/classic/layout.png  \
+       images/classic/layout_Description.png  \
+       images/classic/layout_Enumerate.png  \
+       images/classic/layout_Itemize.png  \
+       images/classic/layout_List.png  \
+       images/classic/layout_LyX-Code.png  \
+       images/classic/layout_Scrap.png  \
+       images/classic/layout_Section.png  \
+       images/classic/marginalnote-insert.png  \
+       images/classic/master-buffer-update.png  \
+       images/classic/master-buffer-view.png  \
+       images/classic/math-display.png  \
+       images/classic/math-macro-add-greedy-optional-param.png \
+       images/classic/math-macro-add-optional-param.png \
+       images/classic/math-macro-add-param.png \
+       images/classic/math-macro-append-greedy-param.png \
+       images/classic/math-macro-make-nonoptional.png \
+       images/classic/math-macro-make-optional.png \
+       images/classic/math-macro-remove-greedy-param.png \
+       images/classic/math-macro-remove-optional-param.png \
+       images/classic/math-macro-remove-param.png \
+       images/classic/math-macro_newmacroname_newcommand.png  \
+       images/classic/math-matrix.png  \
+       images/classic/math-mode.png  \
+       images/classic/math-subscript.png  \
+       images/classic/math-superscript.png  \
+       images/classic/nomencl-insert.png  \
+       images/classic/note-insert.png  \
+       images/classic/note-next.png  \
+       images/classic/paste.png  \
+       images/classic/promote.png  \
+       images/classic/redo.png  \
+       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/tabular-feature_align-decimal.png  \
+       images/classic/tabular-feature_append-column.png  \
+       images/classic/tabular-feature_append-row.png  \
+       images/classic/tabular-feature_delete-column.png  \
+       images/classic/tabular-feature_delete-row.png  \
+       images/classic/tabular-feature_m-align-center.png  \
+       images/classic/tabular-feature_m-align-left.png  \
+       images/classic/tabular-feature_m-align-right.png  \
+       images/classic/tabular-feature_m-valign-bottom.png  \
+       images/classic/tabular-feature_m-valign-middle.png  \
+       images/classic/tabular-feature_m-valign-top.png  \
+       images/classic/tabular-feature_multicolumn.png  \
+       images/classic/tabular-feature_multirow.png  \
+       images/classic/tabular-feature_set-all-lines.png  \
+       images/classic/tabular-feature_set-border-lines.png  \
+       images/classic/tabular-feature_set-longtabular.png  \
+       images/classic/tabular-feature_set-rotate-cell.png  \
+       images/classic/tabular-feature_set-rotate-tabular.png  \
+       images/classic/tabular-feature_toggle-line-bottom.png  \
+       images/classic/tabular-feature_toggle-line-left.png  \
+       images/classic/tabular-feature_toggle-line-right.png  \
+       images/classic/tabular-feature_toggle-line-top.png  \
+       images/classic/tabular-feature_toggle-rotate-cell.png  \
+       images/classic/tabular-feature_toggle-rotate-tabular.png  \
+       images/classic/tabular-feature_unset-all-lines.png  \
+       images/classic/tabular-insert.png  \
+       images/classic/textstyle-apply.png  \
+       images/classic/thesaurus-entry.png  \
+       images/classic/toolbar-toggle_math.png  \
+       images/classic/toolbar-toggle_math_panels.png  \
+       images/classic/toolbar-toggle_table.png  \
+       images/classic/undo.png  \
+       images/classic/unknown.png  \
+       images/classic/up.png  \
+       images/classic/update-others.png  \
+       images/classic/url-insert.png  \
+       images/classic/vc-check-in.png  \
+       images/classic/vc-check-out.png  \
+       images/classic/vc-compare.png  \
+       images/classic/vc-compare_0.png  \
+       images/classic/vc-locking-toggle.png  \
+       images/classic/vc-register.png  \
+       images/classic/vc-repo-update.png  \
+       images/classic/vc-revert.png  \
+       images/classic/view-others.png
 
 imagescommandsdir = $(imagesdir)/commands
 dist_imagescommands_DATA = 
@@ -1261,11 +1331,15 @@ dist_layouts_DATA =\
        layouts/article.layout \
        layouts/article-beamer.layout \
        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 \
@@ -1316,6 +1390,7 @@ dist_layouts_DATA =\
        layouts/iopart.layout \
        layouts/isprs.layout \
        layouts/jarticle.layout \
+       layouts/jasatex.layout \
        layouts/jbook.layout \
        layouts/jgrga.layout \
        layouts/jreport.layout \
@@ -1339,6 +1414,7 @@ dist_layouts_DATA =\
        layouts/memoir.layout \
        layouts/minimalistic.module \
        layouts/moderncv.layout \
+       layouts/multicol.module \
        layouts/mwart.layout \
        layouts/mwbk.layout \
        layouts/mwrep.layout \
@@ -1352,6 +1428,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 \
@@ -1377,19 +1455,21 @@ 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 \
        layouts/sweave.module \
+       layouts/knitr.module \
        layouts/tabs-within-sections.module \
        layouts/tarticle.layout \
        layouts/tbook.layout \
@@ -1399,6 +1479,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 \
@@ -1415,6 +1496,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
@@ -1422,9 +1504,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 \
@@ -1440,8 +1525,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 \
@@ -1456,13 +1539,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 \
@@ -1473,24 +1557,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 = \
@@ -1523,8 +1630,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 \
+       for i in $(scriptdir)/*.py ; do \
                $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/$$i; \
        done