X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=7ceaeaac3556a264a3013e30aed479c6147b10d0;hb=23a997bbf68229fc893d5e30bebaf275721a2034;hp=038b33c7526d19b3e1d5fc33433a511cddcf4f6c;hpb=a7e6dcc31dc8b49ad27c16558c8634880a1f6002;p=lyx.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 038b33c752..7ceaeaac35 100644
--- 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 \
@@ -26,18 +25,22 @@ dist_noinst_DATA = \
 	images/math/dots.svgz \
 	images/math/font.svgz
 
-skbinddir = $(pkgdatadir)/bind/sk
-dist_skbind_DATA = \
-	bind/sk/menus.bind
-
 debinddir = $(pkgdatadir)/bind/de
 dist_debind_DATA = \
 	bind/de/menus.bind
 
+hebinddir = $(pkgdatadir)/bind/he
+dist_hebind_DATA = \
+	bind/he/cua.bind
+
 rubinddir = $(pkgdatadir)/bind/ru
 dist_rubind_DATA = \
 	bind/ru/menus.bind
 
+skbinddir = $(pkgdatadir)/bind/sk
+dist_skbind_DATA = \
+	bind/sk/menus.bind
+
 binddir = $(pkgdatadir)/bind
 dist_bind_DATA = \
 	bind/broadway.bind \
@@ -300,6 +303,10 @@ dist_ruinsetexamples_DATA = \
 	examples/ru/Graphics_and_Insets/xyfigure.png \
 	examples/ru/Graphics_and_Insets/XY-Pic.lyx
 
+rumoduleexamplesdir = $(pkgdatadir)/examples/ru/Modules
+dist_rumoduleexamples_DATA = \
+	examples/ru/Modules/Fancy_Colored_Boxes.lyx
+
 rupresentationexamplesdir = $(pkgdatadir)/examples/ru/Presentations
 dist_rupresentationexamples_DATA = \
 	examples/ru/Presentations/Beamer.lyx \
@@ -561,7 +568,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 \
@@ -626,7 +633,9 @@ dist_images_DATA1X = \
 	images/layout-toggle_Section.svgz \
 	images/lyx.svg \
 	images/lyxfiles-system.svgz \
+	images/lyxfiles-system-folder.svgz \
 	images/lyxfiles-user.svgz \
+	images/lyxfiles-user-folder.svgz \
 	images/lyx-quit.svgz \
 	images/marginalnote-insert.svgz \
 	images/master-buffer-update.svgz \
@@ -656,6 +665,7 @@ dist_images_DATA1X = \
 	images/outline-out+rtl.svgz \
 	images/outline-up.svgz \
 	images/paste.svgz \
+	images/process-stop.svgz \
 	images/redo.svgz \
 	images/reload.svgz \
 	images/search-case-sensitive.svgz \
@@ -692,11 +702,11 @@ dist_images_DATA1X = \
 	images/tabular-feature_multicolumn.svgz \
 	images/tabular-feature_multirow.svgz \
 	images/tabular-feature_reset-formal-default.svgz \
-	images/tabular-feature_set-all-lines.svgz \
+	images/tabular-feature_toggle-all-lines.svgz \
 	images/tabular-feature_set-longtabular.svgz \
 	images/tabular-feature_set-rotate-cell.svgz \
-	images/tabular-feature_set-border-lines.svgz \
-	images/tabular-feature_set-inner-lines.svgz \
+	images/tabular-feature_toggle-border-lines.svgz \
+	images/tabular-feature_toggle-inner-lines.svgz \
 	images/tabular-feature_set-rotate-tabular.svgz \
 	images/tabular-feature_toggle-line-bottom.svgz \
 	images/tabular-feature_toggle-line-left.svgz \
@@ -737,7 +747,8 @@ dist_images_DATA = \
 	images/banner.png \
 	$(dist_images_DATA1X) \
 	$(dist_images_DATA2X) \
-	$(dist_images_DATA3X)
+	$(dist_images_DATA3X) \
+	images/icon.aliases
 
 imagesmathdir = $(imagesdir)/math
 dist_imagesmath_DATA = \
@@ -2152,9 +2163,9 @@ dist_imagesoxygen_DATA1X = \
 	images/oxygen/tabular-feature_multicolumn.svgz \
 	images/oxygen/tabular-feature_multirow.svgz \
 	images/oxygen/tabular-feature_reset-formal-default.svgz \
-	images/oxygen/tabular-feature_set-all-lines.svgz \
-	images/oxygen/tabular-feature_set-border-lines.svgz \
-	images/oxygen/tabular-feature_set-inner-lines.svgz \
+	images/oxygen/tabular-feature_toggle-all-lines.svgz \
+	images/oxygen/tabular-feature_toggle-border-lines.svgz \
+	images/oxygen/tabular-feature_toggle-inner-lines.svgz \
 	images/oxygen/tabular-feature_set-longtabular.svgz \
 	images/oxygen/tabular-feature_toggle-line-bottom.svgz \
 	images/oxygen/tabular-feature_toggle-line-left.svgz \
@@ -2350,9 +2361,9 @@ dist_imagesclassic_DATA = \
 	images/classic/tabular-feature_multicolumn.png  \
 	images/classic/tabular-feature_multirow.png  \
 	images/classic/tabular-feature_reset-formal-default.png \
-	images/classic/tabular-feature_set-all-lines.png  \
-	images/classic/tabular-feature_set-border-lines.png  \
-	images/classic/tabular-feature_set-inner-lines.png  \
+	images/classic/tabular-feature_toggle-all-lines.png  \
+	images/classic/tabular-feature_toggle-border-lines.png  \
+	images/classic/tabular-feature_toggle-inner-lines.png  \
 	images/classic/tabular-feature_set-longtabular.png  \
 	images/classic/tabular-feature_set-rotate-cell.png  \
 	images/classic/tabular-feature_set-rotate-tabular.png  \
@@ -2687,6 +2698,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 \
@@ -2868,20 +2880,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 \
@@ -2986,7 +3004,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 \
@@ -3001,12 +3019,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 \
@@ -3023,7 +3041,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 \
@@ -3089,6 +3107,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
@@ -3116,6 +3150,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) \