Correct spelling of "Acknowledgments" in the APA layout.

[lyx.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index a60675fe63660c9e296fbf2d0d534a3073e871d5..3e01ce285b8772986847574a72132736cab5b606 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,24 +1,23 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES = *.orig *.rej *~ *.bak core textclass.lst packages.lst \
-               lyxrc.defaults doc/LyXConfig.lyx doc/LaTeXConfig.lyx
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-SUBDIRS = reLyX
+include $(top_srcdir)/config/common.am
 
-EXTRA_DIST = CREDITS chkconfig.ltx configure.cmd lyxrc.example \
-       external_templates bind clipart doc/LaTeXConfig.lyx.in doc/LyXConfig.lyx.in examples images \
-       kbd layouts lyx2lyx scripts templates tex ui encodings \
-       languages symbols configure configure.m4
+DISTCLEANFILES += textclass.lst packages.lst lyxrc.defaults
+
+SUBDIRS = doc reLyX
+
+EXTRA_DIST = \
+       configure.m4 \
+       chkconfig.ltx
 
 CHMOD = chmod
 
-pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx lyxrc.defaults \
+dist_pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx lyxrc.defaults \
               textclass.lst packages.lst external_templates \
               encodings languages symbols
 
-pkgdata_SCRIPTS = configure configure.cmd
+dist_pkgdata_SCRIPTS = configure configure.cmd
 
 binddir = $(pkgdatadir)/bind
-bind_DATA = \
+dist_bind_DATA = \
        bind/broadway.bind \
        bind/cua.bind \
        bind/cyrkeys.bind \
@@ -37,14 +36,10 @@ bind_DATA = \
        bind/aqua.bind
 
 clipartdir = $(pkgdatadir)/clipart
-clipart_DATA = clipart/platypus.eps
-
-docdir = $(pkgdatadir)/doc
-doc_DATA = \
-       doc/LaTeXConfig.lyx
+dist_clipart_DATA = clipart/platypus.eps
 
 examplesdir = $(pkgdatadir)/examples
-examples_DATA = \
+dist_examples_DATA = \
        examples/Foils.lyx \
        examples/ItemizeBullets.lyx \
        examples/Literate.lyx \
@@ -116,7 +111,7 @@ examples_DATA = \
        examples/ro_splash.lyx
 
 imagesdir = $(pkgdatadir)/images
-images_DATA = \
+dist_images_DATA = \
        images/amssymb.xpm \
        images/banner.ppm \
        images/bookmark-goto.xpm \
@@ -217,7 +212,7 @@ images_DATA = \
        images/url-insert.xpm
 
 imagesmathdir = $(imagesdir)/math
-imagesmath_DATA = \
+dist_imagesmath_DATA = \
        images/math/Bbbk.xpm \
        images/math/Finv.xpm \
        images/math/Game.xpm \
@@ -672,7 +667,7 @@ imagesmath_DATA = \
        images/math/zeta.xpm
 
 kbddir = $(pkgdatadir)/kbd
-kbd_DATA = \
+dist_kbd_DATA = \
        kbd/american-2.kmap \
        kbd/american.kmap \
        kbd/arabic.kmap \
@@ -727,7 +722,7 @@ kbd_DATA = \
        kbd/espanol.kmap
 
 layoutsdir = $(pkgdatadir)/layouts
-layouts_DATA =\
+dist_layouts_DATA =\
        layouts/IEEEtran.layout \
        layouts/aa.layout \
        layouts/aapaper.inc \
@@ -838,8 +833,8 @@ layouts_DATA =\
        layouts/svglobal.layout
 
 lyx2lyxdir = $(pkgdatadir)/lyx2lyx
-lyx2lyx_SCRIPTS = lyx2lyx/lyx2lyx
-lyx2lyx_DATA = \
+dist_lyx2lyx_SCRIPTS = lyx2lyx/lyx2lyx
+dist_lyx2lyx_DATA = \
        lyx2lyx/lyx2lyx \
        lyx2lyx/parser_tools.py \
        lyx2lyx/lyx_0_12.py \
@@ -854,7 +849,7 @@ lyx2lyx_DATA = \
        lyx2lyx/lyx_1_4.py
 
 scriptsdir = $(pkgdatadir)/scripts
-scripts_SCRIPTS = \
+dist_scripts_SCRIPTS = \
        scripts/TeXFiles.sh \
        scripts/convertDefault.sh \
        scripts/fen2ascii.py \
@@ -865,7 +860,7 @@ scripts_SCRIPTS = \
        scripts/lyxpreview2bitmap.py
 
 templatesdir = $(pkgdatadir)/templates
-templates_DATA = \
+dist_templates_DATA = \
        templates/IEEEtran.lyx \
        templates/README.new_templates \
        templates/aa.lyx \
@@ -888,7 +883,7 @@ templates_DATA = \
        templates/agu_article.lyx
 
 texdir = $(pkgdatadir)/tex
-tex_DATA = \
+dist_tex_DATA = \
        tex/broadway.cls \
        tex/cv.cls \
        tex/hollywood.cls \
@@ -897,7 +892,7 @@ tex_DATA = \
        tex/revtex.cls
 
 uidir = $(pkgdatadir)/ui
-ui_DATA = \
+dist_ui_DATA = \
        ui/classic.ui \
        ui/default.ui \
        ui/stdmenus.ui \
@@ -933,9 +928,3 @@ install-data-local: install-xfonts
 
 
 uninstall-local: uninstall-xfonts
-
-# dist-hook:
-#      cd $(distdir) ; rm -rf `find . -name \*CVS\*` ; \
-#      rm -rf doc/.cvsignore; \
-#      [ -f doc/UserGuide.lyx ] || { cvs -Q export -r HEAD -d doc lyxdoc || \
-#        echo "WARNING: Unable to get LyX Documentation from CVS!" ; true ; }