X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=cb6c8e642c328e50ac55e2413682b26ac02f6c2b;hb=1cabb18ff7cb102d4036515ee5e487c193d2293f;hp=cb0833c122fe60c50b38297fba0a0ee519575e3d;hpb=48792d0c6714928ef1c444997854774e3cf5d530;p=lyx.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index cb0833c122..cb6c8e642c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -99,7 +99,7 @@ dist_decvexamples_DATA = \
 	examples/de/Curricula_Vitae/Europass_CV_%282013%29.lyx \
 	examples/de/Curricula_Vitae/Simple_CV.lyx
 
-dehandoutexamplesdir = $(pkgdatadir)/examples/de/Curricula_Vitae
+dehandoutexamplesdir = $(pkgdatadir)/examples/de/Handouts
 dist_dehandoutexamples_DATA = \
 	examples/de/Handouts/Tufte_Handout.lyx
 
@@ -190,7 +190,7 @@ dist_frinsetexamples_DATA = \
 
 frmoduleexamplesdir = $(pkgdatadir)/examples/fr/Modules
 dist_frmoduleexamples_DATA = \
-	examples/fr/Presentations/Braille.lyx \
+	examples/fr/Modules/Braille.lyx \
 	examples/fr/Modules/Linguistics.lyx \
 	examples/fr/Modules/Multilingual_Captions.lyx \
 	examples/fr/Modules/PDF_Comments.lyx
@@ -352,7 +352,6 @@ dist_examples_DATA = \
 articleexamplesdir = $(pkgdatadir)/examples/Articles
 dist_articleexamples_DATA = \
 	examples/Articles/Astronomy_%26_Astrophysics.lyx \
-	examples/Articles/American_Astronomical_Society_%28AASTeX_v._6%29.lyx \
 	examples/Articles/American_Astronomical_Society_%28AASTeX_v._6.2%29.lyx \
 	examples/Articles/American_Chemical_Society_%28ACS%29.lyx \
 	examples/Articles/American_Mathematical_Society_%28AMS%29.lyx \
@@ -406,7 +405,8 @@ dist_cvexamples_DATA = \
 	examples/Curricula_Vitae/Modern_CV.lyx \
 	examples/Curricula_Vitae/Simple_CV.lyx \
 	examples/Curricula_Vitae/CV-image.eps \
-	examples/Curricula_Vitae/CV-image.png
+	examples/Curricula_Vitae/CV-image.png \
+	examples/Curricula_Vitae/REPLACEphoto.jpg
 
 externalexamplesdir = $(pkgdatadir)/examples/External_Material
 dist_externalexamples_DATA = \
@@ -680,6 +680,7 @@ dist_images_DATA1X = \
 	images/tabular-feature_move-row-up.svgz \
 	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_set-longtabular.svgz \
 	images/tabular-feature_set-rotate-cell.svgz \
@@ -1962,6 +1963,7 @@ dist_imagesoxygen_DATA1X = \
 	images/oxygen/tabular-feature_move-row-up.svgz \
 	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 \
@@ -2160,6 +2162,7 @@ dist_imagesclassic_DATA = \
 	images/classic/tabular-feature_m-valign-top.png  \
 	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  \
@@ -2531,11 +2534,9 @@ dist_templates_DATA = \
 
 articletemplatesdir = $(pkgdatadir)/templates/Articles
 dist_articletemplates_DATA = \
-	templates/Articles/American_Astronomical_Society_%28AASTeX_v._6%29.lyx \
 	templates/Articles/American_Astronomical_Society_%28AASTeX_v._6.2%29.lyx \
 	templates/Articles/American_Economic_Association_%28AEA%29.lyx \
 	templates/Articles/American_Psychological_Association_%28APA%29.lyx \
-	templates/Articles/American_Psychological_Association_%28APA%29,_v._6.lyx \
 	templates/Articles/Association_for_Computing_Machinery_%28ACM%29.lyx \
 	templates/Articles/Astronomy_%26_Astrophysics.lyx \
 	templates/Articles/Chinese_Article_%28CTeX%29.lyx \
@@ -2590,7 +2591,10 @@ dist_obsoletetemplates_DATA = \
 	templates/Obsolete/ACM_SIGGGRAPH_0.92_%28obsolete%29.lyx \
 	templates/Obsolete/ACM_SIGPLAN_%28Obsolete%29.lyx \
 	templates/Obsolete/ACM_SIG_Proceedings_%28SP,_Obsolete%29.lyx \
-	templates/Obsolete/American_Geophysical_Union_%28AGUTeX%29.lyx
+	templates/Obsolete/American_Astronomical_Society_%28AASTeX_v._6%29.lyx \
+	templates/Obsolete/American_Geophysical_Union_%28AGUTeX%29.lyx \
+	templates/Obsolete/American_Psychological_Association_%28APA%29,_v._6.lyx \
+	templates/Obsolete/Latex8_Article_%28Obsolete%29.lyx
 
 obsoletegbrieftemplatesdir = $(pkgdatadir)/templates/Obsolete/G-Brief_%28V._1,_Obsolete%29
 dist_obsoletegbrieftemplates_DATA = \
@@ -2636,6 +2640,24 @@ dist_ui_DATA = \
 	ui/stdmenus.inc \
 	ui/stdtoolbars.inc
 
+tabletemplatesdir = $(pkgdatadir)/tabletemplates
+dist_tabletemplates_DATA = \
+	tabletemplates/Formal_with_Footline.lyx \
+	tabletemplates/Formal_with_Footline_1x1.lyx \
+	tabletemplates/Formal_with_Footline_1x2.lyx \
+	tabletemplates/Formal_without_Footline.lyx \
+	tabletemplates/Formal_without_Footline_1x1.lyx \
+	tabletemplates/Formal_without_Footline_1x2.lyx \
+	tabletemplates/Grid_with_Head.lyx \
+	tabletemplates/Grid_with_Head_1x1.lyx \
+	tabletemplates/Grid_with_Head_1x2.lyx \
+	tabletemplates/No_Borders.lyx \
+	tabletemplates/No_Borders_1x1.lyx \
+	tabletemplates/No_Borders_1x2.lyx \
+	tabletemplates/Simple_Grid.lyx \
+	tabletemplates/Simple_Grid_1x1.lyx \
+	tabletemplates/Simple_Grid_1x2.lyx
+
 xtemplatesdir = $(pkgdatadir)/xtemplates
 dist_xtemplates_DATA = \
 	xtemplates/chess.xtemplate \
@@ -2750,6 +2772,7 @@ exampleandtemplate_files = \
 			   $(dist_srexamples_DATA) \
 			   $(dist_srmoduleexamples_DATA) \
 			   $(dist_svexamples_DATA) \
+			   $(dist_tabletemplates_DATA) \
 			   $(dist_thesistemplates_DATA) \
 			   $(dist_ukexamples_DATA) \
 			   $(dist_examples_DATA) \