Revert "DocBook: add new layout parameter DocBookWrapperMergeWithPrevious."

[lyx.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ddbe0e9816cb04b08a1a86bab79a4c433d20d9dd..010ef6fa12520e621e2b1e255bad02cf32b9c168 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -355,8 +355,7 @@ dist_articleexamples_DATA = \
        examples/Articles/Astronomy_%26_Astrophysics.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 \
-       examples/Articles/DocBook_Article_%28SGML%29.lyx
+       examples/Articles/American_Mathematical_Society_%28AMS%29.lyx
 
 articlechessexamplesdir = $(pkgdatadir)/examples/Articles/Chess
 dist_articlechessexamples_DATA = \
@@ -502,6 +501,7 @@ dist_fonts_DATA = \
        fonts/cmmi10.ttf \
        fonts/cmr10.ttf \
        fonts/cmsy10.ttf \
+       fonts/dsrom10.ttf \
        fonts/esint10.ttf \
        fonts/eufm10.ttf \
        fonts/msam10.ttf \
@@ -2259,12 +2259,6 @@ dist_layouts_DATA =\
        layouts/acmsiggraph-0-92.layout \
        layouts/AEA.layout \
        layouts/agutex.layout \
-       layouts/agu-dtd.layout \
-       layouts/agu_stdclass.inc \
-       layouts/agu_stdcounters.inc \
-       layouts/agu_stdlists.inc \
-       layouts/agu_stdsections.inc \
-       layouts/agu_stdtitle.inc \
        layouts/agums.layout \
        layouts/aguplus.inc \
        layouts/algorithm2e.module \
@@ -2296,21 +2290,11 @@ dist_layouts_DATA =\
        layouts/ctex-book.layout \
        layouts/ctex-report.layout \
        layouts/customHeadersFooters.module \
-       layouts/db_lyxmacros.inc \
-       layouts/db_stdclass.inc \
        layouts/db_stdcharstyles.inc \
-       layouts/db_stdcounters.inc \
-       layouts/db_stdlayouts.inc \
-       layouts/db_stdlists.inc \
-       layouts/db_stdsections.inc \
-       layouts/db_stdstarsections.inc \
-       layouts/db_stdstruct.inc \
-       layouts/db_stdtitle.inc \
        layouts/dinbrief.layout \
        layouts/docbook-book.layout \
        layouts/docbook-chapter.layout \
        layouts/docbook-section.layout \
-       layouts/docbook.layout \
        layouts/doublecol-new.layout \
        layouts/dtk.layout \
        layouts/ectaart.layout \
@@ -2541,12 +2525,11 @@ dist_articletemplates_DATA = \
        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_v.7%29.lyx \
+       templates/Articles/American_Psychological_Association_%28APA%29,_v._7.lyx \
        templates/Articles/Association_for_Computing_Machinery_%28ACM%29.lyx \
        templates/Articles/Astronomy_%26_Astrophysics.lyx \
        templates/Articles/Chinese_Article_%28CTeX%29.lyx \
        templates/Articles/Copernicus_Publications_Manuscript_Preparation.lyx \
-       templates/Articles/DocBook_Article_%28SGML%29.lyx \
        templates/Articles/Econometrica.lyx \
        templates/Articles/Elsevier.lyx \
        templates/Articles/Hebrew_Article_%28KOMA-Script%29.lyx \