X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=2badce833d01271a0a4c94437fad0a80f7d57f62;hb=a02bfeebc534925734821e8921bac07c67af6d39;hp=4faf263051318715c8cf24e6a02f20411d60be89;hpb=2bc2f96a107a4dd1e1d77eca1601e3fe9c202e0e;p=lyx.git diff --git a/lib/Makefile.am b/lib/Makefile.am index 4faf263051..2badce833d 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -8,8 +8,9 @@ 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 \ @@ -252,6 +253,7 @@ 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 \ @@ -259,6 +261,7 @@ dist_examples_DATA = \ examples/localization_test.lyx \ examples/longsheet.gnumeric \ examples/modernCV.lyx \ + examples/MultilingualCaptions.lyx \ examples/noweb2lyx.lyx \ examples/powerdot-example.lyx \ examples/recipebook.lyx \ @@ -398,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 \ @@ -498,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 \ @@ -531,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 \ @@ -734,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 \ @@ -866,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 \ @@ -982,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 @@ -1324,7 +1334,9 @@ 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 \ @@ -1383,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 \ @@ -1410,6 +1425,7 @@ dist_layouts_DATA =\ layouts/mwart.layout \ layouts/mwbk.layout \ layouts/mwrep.layout \ + layouts/natbib.module \ layouts/noweb.module \ layouts/numarticle.inc \ layouts/numreport.inc \ @@ -1470,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 \ @@ -1494,10 +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 \ @@ -1510,7 +1529,6 @@ dist_scripts_PYTHON = \ scripts/include_bib.py \ scripts/layout2layout.py \ scripts/legacy_lyxpreview2ppm.py \ - scripts/libreoffice2eps.py \ scripts/listerrors \ scripts/lyxpak.py \ scripts/lyxpreview2bitmap.py \ @@ -1549,6 +1567,7 @@ dist_templates_DATA = \ templates/IJMPC.lyx \ templates/IJMPD.lyx \ templates/IOP-article.lyx \ + templates/JASA.lyx \ templates/JSS-article.lyx \ templates/kluwer.lyx \ templates/koma-letter2.lyx \ @@ -1586,7 +1605,7 @@ dist_springertemplates_DATA = \ 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 \ @@ -1606,19 +1625,6 @@ dist_tex_DATA = \ tex/lyxskak.sty \ tex/revtex.cls -if !INSTALL_WINDOWS -if !INSTALL_MACOSX -# install application icons. The 'hicolor' theme is the default theme -# where applications themselves should install their icons. -scalableappiconsdir = $(datadir)/icons/hicolor/scalable/apps -scalableappicons_DATA = images/lyx.svg - -fixedappiconsdir = $(datadir)/icons/hicolor/48x48/apps -fixedappicons_DATA = images/lyx.png - -endif -endif - # subscript.sty is not in dist_tex_DATA since we don't want to install it # (it is part of TeXLive). We include it in our source package only so that # packagers may decide to install it (e.g. for MikTeX). @@ -1631,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 \ - $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/$$i; \ + for i in $(scriptsdir)/*.py $(scriptsdir)/listerrors ; do \ + $(CHMOD) 755 $(DESTDIR)/$$i; \ done