Avoid copies of vectors.

[features.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7aec1370fe1693524f3566cb4c0bfada5981c0f1..61d6f1abce08e2349d41039b56bf361b26c67314 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -15,7 +15,6 @@ dist_pkgdata_DATA = CREDITS autocorrect chkconfig.ltx \
 dist_pkgdata_DATA += configure.py
 
 dist_noinst_DATA = \
-       appdata.xml \
        fonts/test/check_glyphs.lyx \
        images/README \
        images/font-smallcaps.svgz \
@@ -565,7 +564,7 @@ dist_images_DATA1X = \
        images/buffer-write-as.svgz \
        images/buffer-write.svgz \
        images/build-program.svgz \
-       images/busy.gif \
+       images/busy.svgz \
        images/change-accept.svgz \
        images/change-next.svgz \
        images/change-reject.svgz \
@@ -2691,6 +2690,7 @@ dist_scripts_DATA += \
        scripts/convert_pdf.py \
        scripts/convertDefault.py \
        scripts/csv2lyx.py \
+       scripts/docbook_copy.py \
        scripts/ext_copy.py \
        scripts/fen2ascii.py \
        scripts/fig2pdftex.py \
@@ -2872,20 +2872,26 @@ dist_xtemplates_DATA = \
 dist_scripts_DATA += scripts/docbook2epub.py
 
 #2) xslt processor - Saxon 6.5.5
-dist_scripts_DATA += \
+SAXON_FILES = \
        scripts/saxon6.LICENSE.txt \
        scripts/saxon6.5.5.jar
 
+if SAXON_INSTALL
+dist_scripts_DATA += $(SAXON_FILES)
+else
+dist_noinst_DATA += $(SAXON_FILES)
+endif
+
 #3) xslt Stylesheets 1.79.2
 docbookdir = $(pkgdatadir)/docbook
-dist_docbook_DATA = \
+docbook_FILES = \
        docbook/COPYING \
        docbook/source.txt \
        docbook/VERSION \
        docbook/VERSION.xsl
 
 docbookcommondir = $(pkgdatadir)/docbook/common
-dist_docbookcommon_DATA = \
+docbookcommon_FILES = \
        docbook/common/addns.xsl \
        docbook/common/af.xml \
        docbook/common/am.xml \
@@ -2990,7 +2996,7 @@ dist_docbookcommon_DATA = \
        docbook/common/zh.xml
 
 docbookepub3dir = $(pkgdatadir)/docbook/epub3
-dist_docbookepub3_DATA = \
+docbookepub3_FILES = \
        docbook/epub3/build.xml \
        docbook/epub3/chunkfast.xsl \
        docbook/epub3/chunk.xsl \
@@ -3005,12 +3011,12 @@ dist_docbookepub3_DATA = \
        docbook/epub3/titlepage.templates.xsl
 
 docbooklibdir = $(pkgdatadir)/docbook/lib
-dist_docbooklib_DATA = \
+docbooklib_FILES = \
        docbook/lib/build.xml \
        docbook/lib/lib.xsl
 
 docbookxhtml5dir = $(pkgdatadir)/docbook/xhtml5
-dist_docbookxhtml5_DATA = \
+docbookxhtml5_FILES = \
        docbook/xhtml5/build.xml \
        docbook/xhtml5/chunkfast.xsl \
        docbook/xhtml5/chunk.xsl \
@@ -3027,7 +3033,7 @@ dist_docbookxhtml5_DATA = \
        docbook/xhtml5/xhtml-profile-docbook.xsl
 
 docbookxhtmldir = $(pkgdatadir)/docbook/xhtml
-dist_docbookxhtml_DATA = \
+docbookxhtml_FILES = \
        docbook/xhtml/admon.xsl \
        docbook/xhtml/annotations.xsl \
        docbook/xhtml/autoidx-kimber.xsl \
@@ -3093,6 +3099,22 @@ dist_docbookxhtml_DATA = \
        docbook/xhtml/verbatim.xsl \
        docbook/xhtml/xref.xsl
 
+if XSLT_SHEETS_INSTALL
+dist_docbook_DATA = $(docbook_FILES)
+dist_docbookcommon_DATA = $(docbookcommon_FILES)
+dist_docbookepub3_DATA = $(docbookepub3_FILES)
+dist_docbooklib_DATA = $(docbooklib_FILES)
+dist_docbookxhtml5_DATA = $(docbookxhtml5_FILES)
+dist_docbookxhtml_DATA = $(docbookxhtml_FILES)
+else
+dist_noinst_DATA += $(docbook_FILES)
+dist_noinst_DATA += $(docbookcommon_FILES)
+dist_noinst_DATA += $(docbookepub3_FILES)
+dist_noinst_DATA += $(docbooklib_FILES)
+dist_noinst_DATA += $(docbookxhtml5_FILES)
+dist_noinst_DATA += $(docbookxhtml_FILES)
+endif
+
 
 if INSTALL_POSIX
 # install application icons. The 'hicolor' theme is the default theme
@@ -3120,6 +3142,9 @@ CLEANFILES = lyx@program_suffix@.desktop lyx.desktop-temp \
 endif
 dist_noinst_DATA += lyx.desktop.in images/lyx.png
 
+metainfodir = $(datadir)/metainfo
+dist_metainfo_DATA = org.lyx.LyX.metainfo.xml
+
 exampleandtemplate_files = \
                           $(dist_arpresentationexamples_DATA) \
                           $(dist_articleexamples_DATA) \