remove automake generated Makefiles when using qmake

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 59842adfeb178316a88ea13922e79b502c066100..7237120f7df97d333a5fa6d2397b292d533bfc6d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,12 +9,18 @@ MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
 
 DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
 
+if BUILD_CLIENT_SUBDIR
+CLIENT = src/client
+endif
+
 if USE_INCLUDED_BOOST
-SUBDIRS = config development intl po boost src sourcedoc lib
-else
-SUBDIRS = config development intl po src sourcedoc lib
+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 lyx.man autogen.sh