X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2FMakefile.am;h=cb6c8e642c328e50ac55e2413682b26ac02f6c2b;hb=616bd2a4e6e3b643443ce2df4e1206eda3869cd3;hp=31d9ba1b680bc761adaf4e242cd5febbb276de6a;hpb=683b3a05e2901f2e036bf1b2c873347fa0eb0434;p=lyx.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 31d9ba1b68..cb6c8e642c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -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 \
@@ -681,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 \
@@ -1963,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 \
@@ -2161,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  \
@@ -2532,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 \
@@ -2591,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 = \
@@ -2639,9 +2642,12 @@ dist_ui_DATA = \
 
 tabletemplatesdir = $(pkgdatadir)/tabletemplates
 dist_tabletemplates_DATA = \
-	tabletemplates/Formal.lyx \
-	tabletemplates/Formal_1x1.lyx \
-	tabletemplates/Formal_1x2.lyx \
+	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 \