X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=90935c3fe66235a05fe2a4af99c3b535b1aea8c0;hb=5464189898f9e880a265bfabbd9b1381c7a4e62f;hp=9a25f226ae86791987871245f7380901ba5fc561;hpb=b640a2742649d264d159d5f3d00016e85181bd53;p=lyx.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9a25f226ae..90935c3fe6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,11 +5,14 @@ SUBDIRS = doc lyx2lyx
 CHMOD = chmod
 
 dist_pkgdata_DATA = CREDITS autocorrect chkconfig.ltx external_templates \
-	encodings layouttranslations languages symbols syntax.default \
+	encodings layouttranslations languages latexfonts symbols syntax.default \
 	unicodesymbols
 
+nodist_pkgdata_DATA = installed_translations
+
+# 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 \
@@ -83,7 +86,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 \
@@ -99,9 +101,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
@@ -127,7 +130,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 \
@@ -166,14 +168,12 @@ 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 \
@@ -249,7 +249,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 \
@@ -258,23 +257,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 \
@@ -399,7 +405,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 \
@@ -499,6 +504,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 \
@@ -532,6 +538,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 \
@@ -735,6 +743,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 \
@@ -867,6 +878,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 \
@@ -983,6 +995,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
@@ -1322,15 +1335,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 \
@@ -1381,13 +1398,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 \
@@ -1404,9 +1424,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 \
@@ -1418,6 +1440,7 @@ dist_layouts_DATA =\
 	layouts/revtex.layout \
 	layouts/revtex4.layout \
 	layouts/revtex4-1.layout \
+	layouts/rsphrase.module \
 	layouts/scrartcl.layout \
 	layouts/scrarticle-beamer.layout \
 	layouts/scrbook.layout \
@@ -1466,6 +1489,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 \
@@ -1490,9 +1514,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 \
@@ -1508,8 +1535,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 \
@@ -1524,13 +1549,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 \
@@ -1541,9 +1567,10 @@ 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 \
@@ -1552,27 +1579,36 @@ dist_templates_DATA = \
 	templates/README.new_templates \
 	templates/revtex4.lyx \
 	templates/revtex4-1.lyx \
-	templates/slides.lyx \
-	templates/svjour3.lyx \
-	templates/svmult_appendix.lyx \
-	templates/svmult_author.lyx \
-	templates/svmult_editor.lyx
+	templates/slides.lyx
 
 springertemplatesdir = $(pkgdatadir)/templates/springer
 dist_springertemplates_DATA = \
-	templates/springer/acknow.lyx \
-	templates/springer/acronym.lyx \
-	templates/springer/appendix.lyx \
-	templates/springer/chapter.lyx \
-	templates/springer/dedication.lyx \
-	templates/springer/foreword.lyx \
-	templates/springer/glossary.lyx \
-	templates/springer/part.lyx \
-	templates/springer/preface.lyx
-	templates/springer/referenc.lyx \
-	templates/springer/solutions.lyx \
-	templates/springer/svmono_book.lyx
-	
+	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 \
@@ -1604,8 +1640,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