-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak lyx.1 core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/aclocal.m4 \
- $(srcdir)/configure $(srcdir)/development/lyx.spec \
- $(srcdir)/acinclude.m4
-SUBDIRS = intl po sigc++ src lib
-
-EXTRA_DIST = ANNOUNCE OLD-CHANGES INSTALL.OS2 INSTALL.autoconf README.OS2 \
- UPGRADING lyx.man acconfig.h \
- config development forms images
-ETAGS_ARGS = --lang=c++
+include $(top_srcdir)/config/common.am
+
+ACLOCAL_AMFLAGS = -I m4 -I config
+
+DISTCLEANFILES += lyx.1 config.status config.cache config.log
+
+MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
+ $(srcdir)/configure
+
+DIST_SUBDIRS = m4 config development intl po boost 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
+
+
+EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
+ INSTALL.Win32 INSTALL.MacOSX INSTALL.scons INSTALL.cmake \
+ README.Win32 README.Cygwin README.localization lyx.man autogen.sh
+