X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=7388a4ef50654bc2d3cbcfdf266813c811e7591a;hb=9f5739e23784ecb407b13f45fe0a33deb92c4bf2;hp=ae61306a977da7b07ba2149d010860aed47a9ae0;hpb=7386a9a077e3955440600086c53a6008fea3a159;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index ae61306a97..7388a4ef50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ 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 = m4 config development po boost src sourcedoc lib
 
 if BUILD_CLIENT_SUBDIR
 CLIENT = src/client
@@ -15,24 +15,17 @@ if USE_INCLUDED_BOOST
 BOOST = boost
 endif
 
-SUBDIRS = config development intl po $(BOOST) src sourcedoc lib \
+SUBDIRS = config development po $(BOOST) src sourcedoc lib \
 	$(CLIENT) src/tex2lyx
 
 
 EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
-	INSTALL.Win32 INSTALL.MacOSX INSTALL.scons INSTALL.cmake \
+	INSTALL.Win32 INSTALL.MacOSX INSTALL.cmake \
 	README.Win32 README.Cygwin README.localization lyx.1in \
-	autogen.sh lib/lyx.desktop
+	autogen.sh
 
 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
@@ -53,16 +46,26 @@ rpmdist: dist
 	rm lyx.png; exit $$saved_status
 
 doxydoc:
-	cd sourcedoc; make doxydoc
+	cd sourcedoc; $(MAKE) doxydoc
+
+lfundoc: $(srcdir)/lib/doc/LFUNs.lyx
 
-lfundoc:
-	development/tools/gen_lfuns.py src/LyXAction.cpp > 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 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