move tex2lyx and client subdir handling to the main Makefile.am, so they won't be...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19421 a592a061-630c-0410-9148-cb99ea01b6c8

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

diff --git a/src/Makefile.am b/src/Makefile.am
index b724190af399f17300daca3af181369a8eac0863..430bf0519f3aa2b1c3b7682b38e4ee6c443181ce 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,11 +4,7 @@ DISTCLEANFILES += config.h libintl.h version.cpp stamp-version version.cpp-tmp
 
 MAINTAINERCLEANFILES += $(srcdir)/config.h.in
 
-if BUILD_CLIENT_SUBDIR
-CLIENT = client
-endif
-
-SUBDIRS = mathed insets graphics support frontends . $(CLIENT) tex2lyx
+SUBDIRS = mathed insets graphics support frontends .
 
 EXTRA_DIST = config.h.in stamp-h.in version.cpp.in \
        Section.h \

diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index 5955bd66e2b10e2a7dc5e1d615410421d1913cd4..58b04423e04698366ab6df8f470731d8fc74590d 100644 (file)
--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@@ -546,7 +546,7 @@ goto_char_backwards:
        case LFUN_DOWN:
        case LFUN_UP:
                cur.updateFlags(Update::Decoration | Update::FitCursor);
-       case LFUN_DOWN_SELECT: 
+       case LFUN_DOWN_SELECT:
        case LFUN_UP_SELECT: {
                // close active macro
                if (cur.inMacroMode()) {