X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=63ebfba16ab9e5d9f072ac64489ab41089e5a9a8;hb=669acb47c58e1e573d77518c75dbb673af877085;hp=cf147d55bba22ae9c0f550f559b93e85428448eb;hpb=8c8e19bb1cc505f09cb7ea464d8fab347a463a23;p=lyx.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index cf147d55bb..63ebfba16a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,15 +4,18 @@ SUBDIRS = doc lyx2lyx
 
 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.
-dist_pkgdata_DATA += configure.py 
+dist_pkgdata_DATA += configure.py
 
 dist_noinst_DATA = \
+	appdata.xml \
 	fonts/stmary10.sfd \
 	fonts/test/stmary10.lyx \
 	images/README \
@@ -85,9 +88,13 @@ 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/PDF-comment.lyx \
 	examples/de/serienbrief1.lyx \
 	examples/de/serienbrief2.lyx \
 	examples/de/serienbrief3.lyx \
@@ -132,6 +139,8 @@ dist_frexamples_DATA = \
 	examples/fr/Foils.lyx \
 	examples/fr/linguistics.lyx \
 	examples/fr/ListesPuces.lyx \
+	examples/fr/MultilingualCaptions.lyx \
+	examples/fr/PDF-comment.lyx \
 	examples/fr/seminar.lyx \
 	examples/fr/simplecv.lyx \
 	examples/fr/splash.lyx \
@@ -169,11 +178,21 @@ jaexamplesdir = $(pkgdatadir)/examples/ja
 dist_jaexamples_DATA = \
 	examples/ja/Braille.lyx \
 	examples/ja/FeynmanDiagrams.lyx \
+	examples/ja/MultilingualCaptions.lyx \
+	examples/ja/R-S-statements.lyx \
+	examples/ja/beamer.lyx \
+	examples/ja/knitr.lyx \
+	examples/ja/lilypond.lyx \
 	examples/ja/linguistics.lyx \
 	examples/ja/splash.lyx \
+	examples/ja/sweave.lyx \
 	examples/ja/xyfigure.png \
 	examples/ja/xypic.lyx
 
+koexamplesdir = $(pkgdatadir)/examples/ko
+dist_koexamples_DATA = \
+	examples/ko/splash.lyx
+
 nlexamplesdir = $(pkgdatadir)/examples/nl
 dist_nlexamples_DATA = \
 	examples/nl/opsommingstekens.lyx \
@@ -216,6 +235,44 @@ svexamplesdir = $(pkgdatadir)/examples/sv
 dist_svexamples_DATA = \
 	examples/sv/splash.lyx
 
+springerexamplesdir = $(pkgdatadir)/examples/springer
+dist_springerexamples_DATA = \
+	examples/springer/svmono_acknow.lyx \
+	examples/springer/svmono_acronym.lyx \
+	examples/springer/svmono_appendix.lyx \
+	examples/springer/svmono_book-master.lyx \
+	examples/springer/svmono_chapter.lyx \
+	examples/springer/svmono_dedication.lyx \
+	examples/springer/svmono_foreword.lyx \
+	examples/springer/svmono_glossary.lyx \
+	examples/springer/svmono_part.lyx \
+	examples/springer/svmono_preface.lyx \
+	examples/springer/svmono_referenc.lyx \
+	examples/springer/svmono_solutions.lyx \
+	examples/springer/svmult_acknow.lyx \
+	examples/springer/svmult_acronym.lyx \
+	examples/springer/svmult_appendix.lyx \
+	examples/springer/svmult_author.lyx \
+	examples/springer/svmult_cblist.lyx \
+	examples/springer/svmult_dedication.lyx \
+	examples/springer/svmult_editor-master.lyx \
+	examples/springer/svmult_foreword.lyx \
+	examples/springer/svmult_glossary.lyx \
+	examples/springer/svmult_part.lyx \
+	examples/springer/svmult_preface.lyx \
+	examples/springer/svmult_referenc.lyx
+
+thesisexamplesdir = $(pkgdatadir)/examples/thesis
+dist_thesisexamples_DATA = \
+	examples/thesis/Acknowledgments.lyx \
+	examples/thesis/alpha.bst \
+	examples/thesis/Appendix.lyx \
+	examples/thesis/chapter-1.lyx \
+	examples/thesis/chapter-2.lyx \
+	examples/thesis/Summary.lyx \
+	examples/thesis/thesis.lyx \
+	examples/thesis/thesisExample.bib
+
 ukexamplesdir = $(pkgdatadir)/examples/uk
 dist_ukexamples_DATA = \
 	examples/uk/splash.lyx
@@ -248,14 +305,18 @@ dist_examples_DATA = \
 	examples/beamer-knight4-mask.png \
 	examples/beamer-knight4.png \
 	examples/beamerlyxexample1.lyx \
+	examples/beamerposter.lyx \
 	examples/biblioExample.bib \
 	examples/chess-article.lyx \
 	examples/chessgame.lyx \
+	examples/colored-boxes.lyx \
 	examples/docbook_article.lyx \
 	examples/europeCV.lyx \
+	examples/europassCV.lyx \
 	examples/example_lyxified.lyx \
 	examples/example_raw.lyx \
 	examples/FeynmanDiagrams.lyx \
+	examples/H-P-statements.lyx \
 	examples/iecc05.fen \
 	examples/iecc07.fen \
 	examples/iecc12.fen \
@@ -270,6 +331,8 @@ dist_examples_DATA = \
 	examples/modernCV.lyx \
 	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 \
@@ -287,6 +350,8 @@ dist_examples_DATA = \
 	examples/sweave.lyx \
 	examples/tufte-book.lyx \
 	examples/tufte-handout.lyx \
+	examples/varwidth-floats-side-by-side.lyx \
+	examples/xyfigure.lyx \
 	examples/xyfigure.png \
 	examples/xypic.lyx
 
@@ -307,10 +372,9 @@ dist_fonts_DATA = \
 	fonts/wasy10.ttf
 
 imagesdir = $(pkgdatadir)/images
-dist_images_DATA = \
+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 \
@@ -364,7 +428,6 @@ dist_images_DATA = \
 	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 \
@@ -383,6 +446,7 @@ dist_images_DATA = \
 	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 \
@@ -396,6 +460,7 @@ dist_images_DATA = \
 	images/href-insert.png \
 	images/hidetab.png \
 	images/index-insert.png \
+	images/info-insert.png \
 	images/info-insert_buffer_vcs-revision.png \
 	images/label-insert.png \
 	images/layout.png \
@@ -430,20 +495,23 @@ dist_images_DATA = \
 	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 \
 	images/script-insert_superscript.png \
+	images/specialchar-insert_latex.png \
+	images/specialchar-insert_latex2e.png \
+	images/specialchar-insert_lyx.png \
+	images/specialchar-insert_menu-separator.png \
+	images/specialchar-insert_tex.png \
 	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 \
@@ -455,6 +523,10 @@ dist_images_DATA = \
 	images/tabular-feature_m-valign-bottom.png \
 	images/tabular-feature_m-valign-middle.png \
 	images/tabular-feature_m-valign-top.png \
+	images/tabular-feature_move-column-left.png \
+	images/tabular-feature_move-column-right.png \
+	images/tabular-feature_move-row-down.png \
+	images/tabular-feature_move-row-up.png \
 	images/tabular-feature_multicolumn.png \
 	images/tabular-feature_multirow.png \
 	images/tabular-feature_set-all-lines.png \
@@ -489,8 +561,29 @@ dist_images_DATA = \
 	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}
+
+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_DATA3X}
+
 imagesmathdir = $(imagesdir)/math
-dist_imagesmath_DATA = \
+dist_imagesmath_DATA1X = \
 	images/math/AC.png \
 	images/math/acute.png \
 	images/math/adots.png \
@@ -572,6 +665,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 \
@@ -907,12 +1001,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 \
@@ -920,12 +1017,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 \
@@ -1126,6 +1229,8 @@ dist_imagesmath_DATA = \
 	images/math/smallsetminus.png \
 	images/math/smallsmile.png \
 	images/math/smash.png \
+	images/math/smashb.png \
+	images/math/smasht.png \
 	images/math/smile.png \
 	images/math/smiley.png \
 	images/math/space.png \
@@ -1191,6 +1296,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 \
@@ -1327,6 +1433,8 @@ dist_imagesmath_DATA = \
 	images/math/xcancel.png \
 	images/math/xi.png \
 	images/math/xi2.png \
+	images/math/xleftarrow.png \
+	images/math/xrightarrow.png \
 	images/math/Ydown.png \
 	images/math/yen.png \
 	images/math/Yleft.png \
@@ -1334,8 +1442,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 \
@@ -1511,9 +1626,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 \
@@ -1608,6 +1730,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  \
@@ -1662,7 +1803,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  \
@@ -1726,8 +1866,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  \
@@ -1781,7 +1924,7 @@ dist_imagesclassic_DATA = \
 	images/classic/view-others.png
 
 imagescommandsdir = $(imagesdir)/commands
-dist_imagescommands_DATA = 
+dist_imagescommands_DATA =
 
 kbddir = $(pkgdatadir)/kbd
 dist_kbd_DATA = \
@@ -1827,11 +1970,15 @@ dist_kbd_DATA = \
 
 layoutsdir = $(pkgdatadir)/layouts
 dist_layouts_DATA =\
+	layouts/a0poster.layout \
 	layouts/aa.layout \
 	layouts/aapaper.inc \
 	layouts/aapaper.layout \
 	layouts/aastex.layout \
 	layouts/achemso.layout \
+	layouts/acm-sigs.layout \
+	layouts/acm-sigs-alt.layout \
+	layouts/acm-sigs.inc \
 	layouts/acmsiggraph.layout \
 	layouts/AEA.layout \
 	layouts/agutex.layout \
@@ -1843,6 +1990,7 @@ dist_layouts_DATA =\
 	layouts/agu_stdtitle.inc \
 	layouts/agums.layout \
 	layouts/aguplus.inc \
+	layouts/algorithm2e.module \
 	layouts/amsart.layout \
 	layouts/amsbook.layout \
 	layouts/amsdefs.inc \
@@ -1853,10 +2001,12 @@ dist_layouts_DATA =\
 	layouts/article-beamer.layout \
 	layouts/basic.module \
 	layouts/beamer.layout \
+	layouts/beamerposter.layout \
 	layouts/bicaption.module \
 	layouts/book.layout \
 	layouts/braille.module \
 	layouts/broadway.layout \
+	layouts/changebars.module \
 	layouts/chess.layout \
 	layouts/cl2emult.layout \
 	layouts/ctex-article.layout \
@@ -1888,6 +2038,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 \
@@ -1895,16 +2046,19 @@ dist_layouts_DATA =\
 	layouts/extreport.layout \
 	layouts/figs-within-sections.module \
 	layouts/fixltx2e.module \
+	layouts/fixme.module \
 	layouts/fix-cm.module \
 	layouts/foils.layout \
 	layouts/foottoend.module \
 	layouts/frletter.layout \
 	layouts/g-brief.layout \
 	layouts/g-brief2.layout \
+	layouts/graphicboxes.module \
 	layouts/hanging.module \
 	layouts/heb-article.layout \
 	layouts/heb-letter.layout \
 	layouts/hollywood.layout \
+	layouts/hpstatement.module \
 	layouts/IEEEtran.layout \
 	layouts/IEEEtran-CompSoc.layout \
 	layouts/IEEEtran-TransMag.layout \
@@ -1913,6 +2067,7 @@ dist_layouts_DATA =\
 	layouts/initials.module \
 	layouts/iopart.layout \
 	layouts/isprs.layout \
+	layouts/iucr.layout \
 	layouts/jarticle.layout \
 	layouts/jasatex.layout \
 	layouts/jbook.layout \
@@ -1929,6 +2084,7 @@ dist_layouts_DATA =\
 	layouts/lettre.layout \
 	layouts/lilypond.module \
 	layouts/linguistics.module \
+	layouts/litinsets.inc \
 	layouts/llncs.layout \
 	layouts/logicalmkup.module \
 	layouts/ltugboat.layout \
@@ -1947,13 +2103,18 @@ dist_layouts_DATA =\
 	layouts/numreport.inc \
 	layouts/numrevtex.inc \
 	layouts/paper.layout \
+	layouts/paralist.module \
+	layouts/pdfcomment.module \
+	layouts/pdfform.module \
 	layouts/powerdot.layout \
+	layouts/RJournal.layout \
 	layouts/recipebook.layout \
 	layouts/report.layout \
 	layouts/revtex.layout \
 	layouts/revtex4.layout \
 	layouts/revtex4-1.layout \
 	layouts/rsphrase.module \
+	layouts/sciposter.layout \
 	layouts/scrartcl.layout \
 	layouts/scrarticle-beamer.layout \
 	layouts/scrbook.layout \
@@ -1961,6 +2122,7 @@ dist_layouts_DATA =\
 	layouts/scrlettr.layout \
 	layouts/scrlttr2.layout \
 	layouts/scrreprt.layout \
+	layouts/sectionbox.module \
 	layouts/seminar.layout \
 	layouts/shapepar.module \
 	layouts/siamltex.layout \
@@ -1997,6 +2159,7 @@ dist_layouts_DATA =\
 	layouts/tabs-within-sections.module \
 	layouts/tarticle.layout \
 	layouts/tbook.layout \
+	layouts/tcolorbox.module \
 	layouts/theorems-ams.inc \
 	layouts/theorems-ams.module \
 	layouts/theorems-ams-bytype.inc \
@@ -2021,9 +2184,11 @@ dist_layouts_DATA =\
 	layouts/theorems-starred.module \
 	layouts/theorems-std.module \
 	layouts/theorems-without-preamble.inc \
+	layouts/todonotes.module \
 	layouts/treport.layout \
 	layouts/tufte-book.layout \
-	layouts/tufte-handout.layout
+	layouts/tufte-handout.layout \
+	layouts/varwidth.module
 
 scriptsdir = $(pkgdatadir)/scripts
 dist_scripts_DATA = \
@@ -2035,6 +2200,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 \
@@ -2063,9 +2229,9 @@ dist_templates_DATA = \
 	templates/aastex.lyx \
 	templates/ACM-siggraph.lyx \
 	templates/ACM-sigplan.lyx \
+	templates/ACM-SIGS.lyx \
 	templates/AEA.lyx \
 	templates/AGUTeX.lyx \
-	templates/AGU_article.lyx \
 	templates/APA.lyx \
 	templates/APA6.lyx \
 	templates/beamer-conference-ornate-20min.lyx \
@@ -2075,6 +2241,7 @@ dist_templates_DATA = \
 	templates/DocBook_article.lyx \
 	templates/ectaart.lyx \
 	templates/elsarticle.lyx \
+	templates/EPS-cropped.lyx \
 	templates/es_beamer-conference-ornate-20min.lyx \
 	templates/fr_beamer-conference-ornate-20min.lyx \
 	templates/frletter.lyx \
@@ -2089,55 +2256,28 @@ dist_templates_DATA = \
 	templates/IJMPC.lyx \
 	templates/IJMPD.lyx \
 	templates/IOP-article.lyx \
+	templates/IUCr-article.lyx \
+	templates/ja_beamer-conference-ornate-20min.lyx \
 	templates/JASA.lyx \
 	templates/JSS-article.lyx \
 	templates/kluwer.lyx \
 	templates/koma-letter2.lyx \
 	templates/letter.lyx \
 	templates/lettre.lyx \
+	templates/PDF-cropped.lyx \
+	templates/poster-a0poster-colored.lyx \
+	templates/poster-a0poster-simple.lyx \
+	templates/poster-beamerposter.lyx \
+	templates/poster-sciposter.lyx \
 	templates/README.new_templates \
+	templates/RJournal.lyx \
 	templates/revtex4.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 = \
-	templates/thesis/Acknowledgments.lyx \
-	templates/thesis/alpha.bst \
-	templates/thesis/Appendix.lyx \
-	templates/thesis/chapter-1.lyx \
-	templates/thesis/chapter-2.lyx \
-	templates/thesis/Summary.lyx \
-	templates/thesis/thesis.lyx \
-	templates/thesis/thesisExample.bib
+	templates/springer/svjour3.lyx
 
 texdir = $(pkgdatadir)/tex
 dist_tex_DATA = \
@@ -2180,13 +2320,60 @@ lyx@program_suffix@.desktop: lyx.desktop-temp
 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
+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
 
+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 $(scriptsdir)/*.py $(scriptsdir)/listerrors ; do \
-		$(CHMOD) 755 $(DESTDIR)/$$i; \
+	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
+
+alltests-recursive:
+	cd lyx2lyx; $(MAKE) alltests-recursive
+