Commit a758df3c authored by Adam Mercer's avatar Adam Mercer 🛌

integrate lalburst into top-level build

Original: 3852958ee2e9903ea1f4843329ac16f69886bf1f
parent 330b9329
......@@ -8,7 +8,7 @@ fail () {
}
## Run 00boot in subdirs
for d in lal lalframe lalmetaio lalxml lalstochastic lalapps; do
for d in lal lalframe lalmetaio lalxml lalburst lalstochastic lalapps; do
echo "00boot: running 00boot in $d"
(cd "$d" && ./00boot 1>/dev/null) || fail "00boot in $d"
done
......
......@@ -26,6 +26,9 @@ export LALMETAIO_LIBS LALMETAIO_CFLAGS
LALXML_LIBS="${lalsuite_top_builddir}/lalxml/src/liblalxml.la"
LALXML_CFLAGS="-I${lalsuite_top_builddir}/lalxml/include"
export LALXML_LIBS LALXML_CFLAGS
LALBURST_LIBS="${lalsuite_top_builddir}/lalburst/src/liblalburst.la"
LALBURST_CFLAGS="-I${lalsuite_top_builddir}/lalburst/include"
export LALBURST_LIBS LALBURST_CFLAGS
LALSTOCHASTIC_LIBS="${lalsuite_top_builddir}/lalstochastic/src/liblalstochastic.la"
LALSTOCHASTIC_CFLAGS="-I${lalsuite_top_builddir}/lalstochastic/include"
export LALSTOCHASTIC_LIBS LALSTOCHASTIC_CFLAGS
......@@ -34,6 +37,7 @@ AC_CONFIG_SUBDIRS([lal])
AC_CONFIG_SUBDIRS([lalframe])
AC_CONFIG_SUBDIRS([lalmetaio])
AC_CONFIG_SUBDIRS([lalxml])
AC_CONFIG_SUBDIRS([lalburst])
AC_CONFIG_SUBDIRS([lalstochastic])
AC_CONFIG_SUBDIRS([lalapps])
......
......@@ -290,18 +290,20 @@ AC_EGREP_HEADER([gethostname],[unistd.h],[AC_MSG_RESULT([yes])]
AC_CHECK_FUNCS([setenv])
if test "$LALSUITE_BUILD" = "true"; then
LIBS="$LAL_LIBS $LALSUPPORT_LIBS $LALSTOCHASTIC_LIBS $LALFRAME_LIBS $LALMETAIO_LIBS $LALXML_LIBS $LIBS"
CPPFLAGS="$LAL_CFLAGS $LALSUPPORT_CFLAGS $LALSTOCHASTIC_CFLAGS $LALFRAME_CFLAGS $LALMETAIO_CFLAGS $LALXML_CFLAGS $CPPFLAGS"
LIBS="$LAL_LIBS $LALSUPPORT_LIBS $LALSTOCHASTIC_LIBS $LALBURST_LIBS $LALFRAME_LIBS $LALMETAIO_LIBS $LALXML_LIBS $LIBS"
CPPFLAGS="$LAL_CFLAGS $LALSUPPORT_CFLAGS $LALSTOCHASTIC_CFLAGS $LALBURST_CFLAGS $LALFRAME_CFLAGS $LALMETAIO_CFLAGS $LALXML_CFLAGS $CPPFLAGS"
echo "LAL_TOP_SRCDIR=$LAL_LIBS"
echo "LAL_TOP_SRCDIR=$LAL_TOP_SRCDIR"
AC_SUBST([LAL_TOP_SRCDIR])
lalframe="false"
lalmetaio="false"
lalxml="false"
lalburst="false"
lalstochastic="false"
test -n "$LALFRAME_LIBS" && lalframe="true"
test -n "$LALMETAIO_LIBS" && lalmetaio="true"
test -n "$LALXML_LIBS" && lalxml="true"
test -n "$LALBURST_LIBS" && lalburst="true"
test -n "$LALSTOCHASTIC_LIBS" && lalstochastic="true"
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment