move tex2lyx and client subdir handling to the main Makefile.am, so they won't be considered when building in src only. Faster roundtrips...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19421 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2007-08-11 08:48:57 +00:00
parent d4069f6519
commit b99bbdb7f1
3 changed files with 12 additions and 10 deletions

View File

@ -9,12 +9,18 @@ MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
if USE_INCLUDED_BOOST if BUILD_CLIENT_SUBDIR
SUBDIRS = config development intl po boost src sourcedoc lib CLIENT = src/client
else
SUBDIRS = config development intl po src sourcedoc lib
endif 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 \ EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
INSTALL.Win32 INSTALL.MacOSX INSTALL.scons INSTALL.cmake \ INSTALL.Win32 INSTALL.MacOSX INSTALL.scons INSTALL.cmake \
README.Win32 README.Cygwin lyx.man autogen.sh README.Win32 README.Cygwin lyx.man autogen.sh

View File

@ -4,11 +4,7 @@ DISTCLEANFILES += config.h libintl.h version.cpp stamp-version version.cpp-tmp
MAINTAINERCLEANFILES += $(srcdir)/config.h.in MAINTAINERCLEANFILES += $(srcdir)/config.h.in
if BUILD_CLIENT_SUBDIR SUBDIRS = mathed insets graphics support frontends .
CLIENT = client
endif
SUBDIRS = mathed insets graphics support frontends . $(CLIENT) tex2lyx
EXTRA_DIST = config.h.in stamp-h.in version.cpp.in \ EXTRA_DIST = config.h.in stamp-h.in version.cpp.in \
Section.h \ Section.h \

View File

@ -546,7 +546,7 @@ goto_char_backwards:
case LFUN_DOWN: case LFUN_DOWN:
case LFUN_UP: case LFUN_UP:
cur.updateFlags(Update::Decoration | Update::FitCursor); cur.updateFlags(Update::Decoration | Update::FitCursor);
case LFUN_DOWN_SELECT: case LFUN_DOWN_SELECT:
case LFUN_UP_SELECT: { case LFUN_UP_SELECT: {
// close active macro // close active macro
if (cur.inMacroMode()) { if (cur.inMacroMode()) {