Commit 478d6eba authored by Adam Mercer's avatar Adam Mercer
Browse files

put lal stochastic routines into liblalstochastic

Original: 6b35fdc5daf9290af665f40e51ed4f8c0bdccafa
parent 8dc998a9
......@@ -20,6 +20,8 @@ LAL_CFLAGS="-I${lalsuite_top_builddir}/lal/include"
export LALSUITE_BUILD LAL_LIBS LAL_CFLAGS
LALSUPPORT_LIBS="${lalsuite_top_builddir}/lal/packages/support/src/liblalsupport.la"
export LALSUPPORT_LIBS
LALSTOCHASTIC_LIBS="${lalsuite_top_builddir}/lal/packages/stochastic/src/liblalstochastic.la"
export LALSTOCHASTIC_LIBS
if test "$frame" = "true" ; then
LIBS_save="$LIBS"
......
......@@ -5,8 +5,7 @@ MAINTAINERCLEANFILES = lal.spec
distcleancheck_listfiles = find . -type f \! -name "LALVCSInfo.h" -print
EXTRA_DIST = README.bugs README.contrib README.install \
lal.pc.in lalsupport.pc.in lalframe.pc.in lalmetaio.pc.in lalxml.pc.in \
lal-config.in aclocal.m4 \
lal.spec.in lal.spec
lalstochastic.pc.in lal-config.in aclocal.m4 lal.spec.in lal.spec
bin_SCRIPTS = lal-config
if FRAME
......@@ -25,7 +24,7 @@ else
LALXMLPC =
endif
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = lal.pc lalsupport.pc $(LALFRAMEPC) $(LALMETAIOPC) $(LALXMLPC)
pkgconfig_DATA = lal.pc lalsupport.pc lalstochastic.pc $(LALFRAMEPC) $(LALMETAIOPC) $(LALXMLPC)
# cvs-clean: more than maintainer-clean, this cleans
# everything not in the cvs archive.
......
......@@ -9,6 +9,7 @@ AC_CONFIG_FILES([ \
lalframe.pc \
lalmetaio.pc \
lalxml.pc \
lalstochastic.pc \
lalsupport.pc \
lal-config \
Makefile \
......@@ -82,11 +83,6 @@ AC_CONFIG_FILES([ \
packages/clremoval/include/Makefile \
packages/clremoval/src/Makefile \
packages/clremoval/test/Makefile \
packages/stochastic/Makefile \
packages/stochastic/doc/Makefile \
packages/stochastic/include/Makefile \
packages/stochastic/src/Makefile \
packages/stochastic/test/Makefile \
packages/inspiral/Makefile \
packages/inspiral/doc/Makefile \
packages/inspiral/include/Makefile \
......@@ -137,6 +133,11 @@ AC_CONFIG_FILES([ \
packages/timefreq/include/Makefile \
packages/timefreq/src/Makefile \
packages/timefreq/test/Makefile \
packages/stochastic/Makefile \
packages/stochastic/doc/Makefile \
packages/stochastic/include/Makefile \
packages/stochastic/src/Makefile \
packages/stochastic/test/Makefile \
packages/support/Makefile \
packages/support/doc/Makefile \
packages/support/include/Makefile \
......
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: LALStochastic
Description: LAL Stochastic Library
Version: @VERSION@
Requires: lal
Libs: -L${libdir} -llalstochastic
Cflags: -I${includedir}
......@@ -19,7 +19,6 @@ liblal_la_DEPENDENCIES = \
$(top_builddir)/packages/window/src/libwindow.la \
$(top_builddir)/packages/fft/src/libfft.la \
$(top_builddir)/packages/clremoval/src/libclremoval.la \
$(top_builddir)/packages/stochastic/src/libstochastic.la \
$(top_builddir)/packages/inspiral/src/libinspiral.la \
$(top_builddir)/packages/noisemodels/src/libnoisemodels.la \
$(top_builddir)/packages/bank/src/libbank.la \
......
......@@ -12,7 +12,6 @@ SUBDIRS = \
window \
fft \
clremoval \
stochastic \
inspiral \
noisemodels \
bank \
......@@ -23,6 +22,7 @@ SUBDIRS = \
burstsearch \
tracksearch \
timefreq \
stochastic \
support \
framedata
......
## Process this file with automake to produce Makefile.in
noinst_LTLIBRARIES = libstochastic.la
libstochastic_la_SOURCES = StochasticCrossCorrelation.c ZeroPadAndFFT.c \
lib_LTLIBRARIES = liblalstochastic.la
liblalstochastic_la_SOURCES = StochasticCrossCorrelation.c ZeroPadAndFFT.c \
StochasticOptimalFilter.c \
StochasticOptimalFilterNormalization.c \
OverlapReductionFunction.c StochasticOmegaGW.c \
......
......@@ -15,37 +15,37 @@ check_PROGRAMS = StochasticCrossCorrelationStatisticTest \
StochasticCrossCorrelationStatisticTest_SOURCES = \
StochasticCrossCorrelationStatisticTest.c \
CheckStatus.c
StochasticCrossCorrelationStatisticTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
StochasticCrossCorrelationStatisticTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/packages/stochastic/src/liblalstochastic.la $(top_builddir)/lib/liblal.la
StochasticHeterodynedCrossCorrelationStatisticTest_SOURCES = \
StochasticHeterodynedCrossCorrelationStatisticTest.c \
CheckStatus.c
StochasticHeterodynedCrossCorrelationStatisticTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
StochasticHeterodynedCrossCorrelationStatisticTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/packages/stochastic/src/liblalstochastic.la $(top_builddir)/lib/liblal.la
StochasticCrossCorrelationSpectrumTest_SOURCES = \
StochasticCrossCorrelationSpectrumTest.c \
CheckStatus.c
StochasticCrossCorrelationSpectrumTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
StochasticCrossCorrelationSpectrumTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/packages/stochastic/src/liblalstochastic.la $(top_builddir)/lib/liblal.la
SZeroPadAndFFTTest_SOURCES = SZeroPadAndFFTTest.c CheckStatus.c
SZeroPadAndFFTTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
SZeroPadAndFFTTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/packages/stochastic/src/liblalstochastic.la $(top_builddir)/lib/liblal.la
CZeroPadAndFFTTest_SOURCES = CZeroPadAndFFTTest.c CheckStatus.c
CZeroPadAndFFTTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
CZeroPadAndFFTTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/packages/stochastic/src/liblalstochastic.la $(top_builddir)/lib/liblal.la
StochasticOptimalFilterTest_SOURCES = StochasticOptimalFilterTest.c \
CheckStatus.c
StochasticOptimalFilterTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
StochasticOptimalFilterTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/packages/stochastic/src/liblalstochastic.la $(top_builddir)/lib/liblal.la
StochasticOptimalFilterNormalizationTest_SOURCES = StochasticOptimalFilterNormalizationTest.c \
CheckStatus.c
StochasticOptimalFilterNormalizationTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
StochasticOptimalFilterNormalizationTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/packages/stochastic/src/liblalstochastic.la $(top_builddir)/lib/liblal.la
StochasticOmegaGWTest_SOURCES = StochasticOmegaGWTest.c CheckStatus.c
StochasticOmegaGWTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
StochasticOmegaGWTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/packages/stochastic/src/liblalstochastic.la $(top_builddir)/lib/liblal.la
OverlapReductionFunctionTest_SOURCES = OverlapReductionFunctionTest.c \
CheckStatus.c
OverlapReductionFunctionTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
OverlapReductionFunctionTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/packages/stochastic/src/liblalstochastic.la $(top_builddir)/lib/liblal.la
StochasticInverseNoiseTest_SOURCES = StochasticInverseNoiseTest.c \
CheckStatus.c
StochasticInverseNoiseTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
StochasticInverseNoiseTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/packages/stochastic/src/liblalstochastic.la $(top_builddir)/lib/liblal.la
SimulateSBTest_SOURCES = SimulateSBTest.c CheckStatus.c
SimulateSBTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
SimulateSBTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/packages/stochastic/src/liblalstochastic.la $(top_builddir)/lib/liblal.la
SimulatePopcornTest_SOURCES = SimulatePopcornTest.c
SimulatePopcornTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
SimulatePopcornTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/packages/stochastic/src/liblalstochastic.la $(top_builddir)/lib/liblal.la
# SFalseAlarmTest_SOURCES = SFalseAlarmTest.c
# SFalseAlarmTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
# SFalseDismissalTest_SOURCES = SFalseDismissalTest.c
......@@ -59,7 +59,7 @@ SimulatePopcornTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport
# DFDismissalVsFAlarmTest_SOURCES = DFDismissalVsFAlarmTest.c
# DFDismissalVsFAlarmTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
AstroOmegaTest_SOURCES = AstroOmegaTest.c
AstroOmegaTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
AstroOmegaTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/packages/stochastic/src/liblalstochastic.la $(top_builddir)/lib/liblal.la
INCLUDES = -I$(top_builddir)/include -I$(srcdir)/../include
TESTS = StochasticCrossCorrelationStatisticTest \
......
......@@ -134,11 +134,13 @@ AC_CHECK_LIB(z, compress)
PKG_CHECK_MODULES(LAL, lal, [ true ], [ false ])
PKG_CHECK_MODULES(LALSUPPORT, lalsupport , [ true ], [ false ])
PKG_CHECK_MODULES(LALSTOCHASTIC, lalstochastic, [ true ], [ false ])
if test "$LALSUITE_BUILD" != "true" ; then
CPPFLAGS="$CPPFLAGS $LAL_CFLAGS $LALSUPPORT_CFLAGS"
LIBS="$LALSUPPORT_LIBS $LAL_LIBS $LIBS"
CPPFLAGS="$CPPFLAGS $LAL_CFLAGS $LALSUPPORT_CFLAGS $LALSTOCHASTIC_CFLAGS"
LIBS="$LALSUPPORT_LIBS $LAL_LIBS $LALSTOCHASTIC_LIBS $LIBS"
AC_CHECK_LIB(lal, LALVersion, , AC_MSG_ERROR(could not find the LAL library))
AC_CHECK_LIB(lalsupport, LALOpenDataFile, , AC_MSG_ERROR(could not find the LAL support library))
AC_CHECK_LIB(lalstochastic, LALStochasticOptimalFilter, , AC_MSG_ERROR(could not find the LAL stochastic library))
fi
dnl LALFrame, LALMetaIo, and LALXML (optional).
......@@ -268,8 +270,8 @@ AC_MSG_RESULT(no))
AC_CHECK_FUNCS(setenv)
if test "$LALSUITE_BUILD" = "true"; then
LIBS="$LALXML_LIBS $LALFRAME_LIBS $LALMETAIO_LIBS $LALSUPPORT_LIBS $LAL_LIBS $LIBS"
CPPFLAGS="$CPPFLAGS $LAL_CFLAGS $LALSUPPORT_CFLAGS $LALFRAME_CFLAGS $LALMETAIO_CFLAGS $LALXML_CFLAGS"
LIBS="$LALXML_LIBS $LALFRAME_LIBS $LALMETAIO_LIBS $LALSTOCHASTIC_LIBS $LALSUPPORT_LIBS $LAL_LIBS $LIBS"
CPPFLAGS="$CPPFLAGS $LAL_CFLAGS $LALSUPPORT_CFLAGS $LALSTOCHASTIC_CFLAGS $LALFRAME_CFLAGS $LALMETAIO_CFLAGS $LALXML_CFLAGS"
lalframe="false"
lalmetaio="false"
lalxml="false"
......
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