-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES = -r *.orig *.rej *~ *.bak lyx.1 core $(srcdir)/sourcedoc/*~ \
- $(srcdir)/sourcedoc/html $(srcdir)/sourcedoc/latex \
- $(srcdir)/sourcedoc/man $(srcdir)/sourcedoc/Doxyfile
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/aclocal.m4 \
- $(srcdir)/configure $(srcdir)/development/lyx.spec \
- $(srcdir)/acinclude.m4 $(srcdir)/sourcedoc/Doxyfile
-SUBDIRS = intl po sigc++ boost src lib
-
-EXTRA_DIST = ANNOUNCE OLD-CHANGES INSTALL.OS2 INSTALL.autoconf README.OS2 \
- UPGRADING lyx.man acconfig.h autogen.sh \
- config development forms images
-ETAGS_ARGS = --lang=c++
-man_MANS = lyx.1
+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