Sort and format comments

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index efcbeca75ab881bbf43770a09291b306a2c2d65f..bfccb7985b9ad57987191c7316dc0fed1a74e83c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,42 +5,26 @@ ACLOCAL_AMFLAGS = -I m4 -I config
 MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 $(srcdir)/configure \
        $(srcdir)/config.h.in
 
-DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
+DIST_SUBDIRS = 3rdparty autotests m4 config development po src sourcedoc lib
 
 if BUILD_CLIENT_SUBDIR
 CLIENT = src/client
 endif
 
-if USE_INCLUDED_BOOST
-BOOST = boost
-endif
 
-SUBDIRS = config development intl po $(BOOST) src sourcedoc lib \
-       $(CLIENT) src/tex2lyx
+SUBDIRS = autotests config development po 3rdparty src sourcedoc lib \
+       $(CLIENT) src/tex2lyx src/convert
 
 
 EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
-       INSTALL.Win32 INSTALL.MacOSX INSTALL.scons INSTALL.cmake \
-       README.Win32 README.Cygwin README.localization lyx.1in \
-       autogen.sh lib/lyx.desktop lib/images/lyx.svg
+       INSTALL.Win32 INSTALL.MacOSX INSTALL.cmake \
+       INSTALL.Cygwin README.localization lyx.1in \
+       autogen.sh CMakeLists.txt po/CMakeLists.txt
 
 man_MANS = lyx.1
 
-if !INSTALL_WINDOWS
-if !INSTALL_MACOSX
-desktopdir = $(datadir)/applications
-desktop_DATA = lib/lyx.desktop
-endif
-endif
-
-#Wait some time for bumping automake 1.11, which can use dist-xz
-#directly without this code, which is to be removed.
-#xz has low compression by default, but can be affected via
-#export XZ_OPT=-9ev put somewhere in the makefile.
-lyxdist: dist
-       bunzip2 $(PACKAGE)-$(VERSION).tar.bz2
-       xz -9 $(PACKAGE)-$(VERSION).tar
-       ls -hl $(PACKAGE)-$(VERSION).tar.*
+# Set high compression level for xz distribution
+export XZ_OPT=-9ev
 
 rpmdist: dist
        $(LN_S) $(srcdir)/lib/images/lyx.png . ; \
@@ -53,16 +37,27 @@ rpmdist: dist
        rm lyx.png; exit $$saved_status
 
 doxydoc:
-       cd sourcedoc; make doxydoc
+       cd sourcedoc; $(MAKE) doxydoc
 
-lfundoc:
-       development/tools/gen_lfuns.py src/LyXAction.cpp > lib/doc/LFUNs.lyx
+lfundoc: $(srcdir)/lib/doc/LFUNs.lyx
+
+$(srcdir)/lib/doc/LFUNs.lyx: $(srcdir)/development/tools/gen_lfuns.py $(srcdir)/src/LyXAction.cpp
+       $(AM_V_GEN)$(PYTHON) $^ >$@ 2>/dev/null
 
 keystest:
        development/keystest/lyx_make.sh
 
+alltests: check alltests-recursive
+
+alltests-recursive:
+       cd lib; $(MAKE) alltests-recursive
+       cd src; $(MAKE) alltests-recursive
+
+updatetests:
+       cd src; $(MAKE) updatetests
+
 lgbtags:
        etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
 
-.PHONY: doxydoc
+.PHONY: doxydoc alltests alltests-recursive updatetests