-EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
- UPGRADING lyx.man acconfig.h autogen.sh \
- config development forms images sourcedoc
+DISTCLEANFILES += lyx.1 config.status config.cache config.log
+
+MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
+ $(srcdir)/configure \
+ $(srcdir)/acinclude.m4
+
+DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
+
+if USE_INCLUDED_BOOST
+SUBDIRS = config development intl po boost src sourcedoc lib
+else
+SUBDIRS = config development intl po src sourcedoc lib
+endif
+
+EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf INSTALL.Win32 \
+ INSTALL.MacOSX README.OS2 README.Win32 \
+ UPGRADING lyx.man autogen.sh