- reduce sizeof(MathCharInset) by 20 by better font caching

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 74c3db4fdea8545bd3d5d00149ade94483830c05..eed1c91fe21db5cba1e27f7d7059d83c8470cb45 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,20 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES = -r *.orig *.rej *~ *.bak lyx.1 core $(srcdir)/sourcedoc/*~ \
+include $(top_srcdir)/config/common.am
+
+DISTCLEANFILES += lyx.1 config.status config.cache config.log \
+       $(srcdir)/sourcedoc/*~ \
        $(srcdir)/sourcedoc/html $(srcdir)/sourcedoc/latex \
        $(srcdir)/sourcedoc/man $(srcdir)/sourcedoc/Doxyfile
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/aclocal.m4 \
+
+MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
        $(srcdir)/configure $(srcdir)/development/lyx.spec \
        $(srcdir)/acinclude.m4 $(srcdir)/sourcedoc/Doxyfile
+
 SUBDIRS = intl po sigc++ boost src lib
 
 EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
        UPGRADING lyx.man acconfig.h autogen.sh \
-       config development forms images sourcedoc
+       config development images sourcedoc
 
-ETAGS_ARGS = --lang=c++
 man_MANS = lyx.1
 
 ## Needed by bindist
@@ -24,7 +27,6 @@ lyx.1:
 dist-hook:
        cd $(distdir) ; rm -rf `find config -name \*CVS\*` ; \
        rm -rf `find development -name \*CVS\*` ; \
-       rm -rf `find forms -name \*CVS\*` ; \
        rm -rf `find images -name \*CVS\*`
 
 rpmdist: dist
@@ -57,10 +59,6 @@ doxydoc: sourcedoc/Doxyfile
        cd sourcedoc; \
        doxygen ./Doxyfile
 
-sourcedoc/Doxyfile: sourcedoc/Doxyfile.in config.status
-       cd $(top_builddir) \
-         && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
 lgbtags:
        etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*