X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=5c9e7882b80fb22e2be730ba38437cc3f4351f23;hb=e621229ee392b957d5862f216e02be588c43a3cf;hp=efcbeca75ab881bbf43770a09291b306a2c2d65f;hpb=2b36e0a860390fbe4a7171c69d0974d9cbe64a99;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index efcbeca75a..5c9e7882b8 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 lib/images/lyx.svg
+	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,7 +46,7 @@ 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
@@ -61,8 +54,16 @@ lfundoc:
 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