X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=d2473d948ddde57456e9df205750aed03e83d6b0;hb=d09f87c3ca895e53ff77ca47918778e257826806;hp=2c669cd0202b7b02f631b84c7d846b043d39d5a5;hpb=0ea95fb09f524df879745f9c713a68035e146799;p=lyx.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2c669cd020..d2473d948d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -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 \
@@ -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 \
@@ -100,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
@@ -126,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 \
@@ -163,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 \
@@ -247,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 \
@@ -256,23 +253,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 \
@@ -370,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 \
@@ -396,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 \
@@ -496,6 +500,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 +534,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 +739,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 +874,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 +946,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 +958,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,6 +991,7 @@ 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
@@ -1320,12 +1334,17 @@ dist_layouts_DATA =\
 	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 +1395,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 +1421,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 +1436,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 \
@@ -1443,10 +1469,10 @@ dist_layouts_DATA =\
 	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 \
@@ -1460,6 +1486,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 \
@@ -1476,6 +1503,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
@@ -1483,9 +1511,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 \
@@ -1501,8 +1532,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 \
@@ -1517,13 +1546,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 \
@@ -1534,24 +1564,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 = \
@@ -1584,8 +1637,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