include $(top_srcdir)/config/common.am
-DIST_SUBDIRS = hunspell libiconv zlib
+DIST_SUBDIRS = boost hunspell libiconv zlib
-SUBDIRS = hunspell libiconv zlib
+if USE_INCLUDED_BOOST
+BOOST = boost
+endif
+SUBDIRS = $(BOOST)
MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 $(srcdir)/configure \
$(srcdir)/config.h.in
-DIST_SUBDIRS = 3rdparty autotests m4 config development po boost src sourcedoc lib
+DIST_SUBDIRS = 3rdparty autotests m4 config development po src sourcedoc lib
if BUILD_CLIENT_SUBDIR
CLIENT = src/client
endif
-if USE_INCLUDED_BOOST
-BOOST = boost
-endif
-SUBDIRS = autotests config development po $(BOOST) src sourcedoc lib \
+SUBDIRS = autotests config development po 3rdparty src sourcedoc lib \
$(CLIENT) src/tex2lyx
AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes)
AC_MSG_RESULT([$lyx_cv_with_included_boost])
if test x$lyx_cv_with_included_boost = xyes ; then
- BOOST_INCLUDES='-I$(top_srcdir)/boost'
- BOOST_LIBS='$(top_builddir)/boost/liblyxboost.a'
+ BOOST_INCLUDES='-I$(top_srcdir)/3rdparty/boost'
+ BOOST_LIBS='$(top_builddir)/3rdparty/boost/liblyxboost.a'
else
AC_LANG_PUSH(C++)
save_LIBS=$LIBS
AC_CONFIG_FILES([Makefile \
lyx.1:lyx.1in \
3rdparty/Makefile \
+ 3rdparty/boost/Makefile \
3rdparty/hunspell/Makefile \
3rdparty/libiconv/Makefile \
3rdparty/zlib/Makefile \
autotests/Makefile \
- boost/Makefile \
config/Makefile \
development/Makefile \
development/MacOSX/Makefile \