Commit fda15288 authored by Karl Wette's avatar Karl Wette

Move all LAL library source files under src/

- And all test programs under test/
- Refs #1960
Original: 0a700fb55a876daa8ac51734da261a132bcafeb1
parent b8f813d1
......@@ -90,13 +90,13 @@ AC_DEFUN([lalsuite_config_subdir],[
# lal and lalsupport are always configured
lalsuite_config_doxygen([LAL])
AC_CONFIG_SUBDIRS(lal)
LAL_LIBS="${lalsuite_abs_top_builddir}/lal/lib/lal/liblal.la"
LAL_LIBS="${lalsuite_abs_top_builddir}/lal/src/liblal.la"
LAL_CFLAGS="-I${lalsuite_abs_top_builddir}/lal/include"
LAL_DATA_PATH="${lalsuite_top_srcdir}/lal/test"
LAL_OCTAVE_PATH="${lalsuite_abs_top_builddir}/lal/octave"
LAL_PYTHON_PATH="${lalsuite_abs_top_builddir}/lal/python"
LAL_HTMLDIR="${htmldir}/../lal"
LALSUPPORT_LIBS="${lalsuite_abs_top_builddir}/lal/lib/lalsupport/src/liblalsupport.la"
LALSUPPORT_LIBS="${lalsuite_abs_top_builddir}/lal/src/support/liblalsupport.la"
LALSUPPORT_CFLAGS="-I${lalsuite_abs_top_builddir}/lal/include"
LALSUPPORT_DATA_PATH="${LAL_DATA_PATH}"
LALSUPPORT_OCTAVE_PATH="${LAL_OCTAVE_PATH}"
......
......@@ -21,164 +21,119 @@ config.lt
doxygen/doxygen.cfg
doxygen/filter
doxygen/out/
include/config.h
include/config.h.in
include/lal/*.h
include/lal/*.i
include/lal/header-link-stamp
include/stamp-h1
lal-*.tar.gz
lal-user-env.csh
lal-user-env.sh
lal-user-env.shell
lal.spec
lib/lal/.vcsinfo
lib/lal/LALBuildInfo.c
lib/lal/LALConfig.h
lib/lal/LALVCSInfo.c
lib/lal/LALVCSInfo.h
lib/lal/LALVCSInfoHeader.h
lib/lal/git_info.sed
lib/lal/git_version
lib/lal/lal-version
lib/lal/stamp-h2
lib/lalsupport/test/*PrintVector.*
lib/lalsupport/test/?FS*.dat
lib/lalsupport/test/?TS*.dat
lib/lalsupport/test/ConfigFile.cfg
lib/lalsupport/test/ConfigFileTest
lib/lalsupport/test/ConfigFileTest2
lib/lalsupport/test/GzipTest
lib/lalsupport/test/LALMath3DPlotTest
lib/lalsupport/test/LALMathNDPlotTest
lib/lalsupport/test/Math3DNotebook.nb
lib/lalsupport/test/MathNDNotebook.nb
lib/lalsupport/test/NRWaveIOTest
lib/lalsupport/test/ParseStringValueTest
lib/lalsupport/test/PrintFTSeriesTest
lib/lalsupport/test/PrintVectorTest
lib/lalsupport/test/ReadFTSeriesTest
lib/lalsupport/test/SFTfileIOTest
lib/lalsupport/test/SegmentsIOTest
lib/lalsupport/test/SegmentsOutput1.data
lib/lalsupport/test/StreamInputTest
lib/lalsupport/test/StreamSeriesInputTest
lib/lalsupport/test/TranslateAnglesTest
lib/lalsupport/test/TranslateMJDTest
lib/lalsupport/test/UserInputTest
libtool
octave/
packages/*/test/*.out
packages/*/test/*.sft
packages/*/test/*.txt
packages/*/test/*PrintVector.*
packages/bank/test/BCVTemplates
packages/bank/test/BCVTemplatesFlatMesh
packages/bank/test/ChirpSpace
packages/bank/test/CoarseTest
packages/bank/test/CoarseTest2
packages/bank/test/GetOrientationEllipse
packages/bank/test/InspiralSpinBankTest
packages/bank/test/MetricTest
packages/bank/test/MetricTestBCV
packages/bank/test/MetricTestPTF
packages/bank/test/PNTemplates
packages/bank/test/SpaceCovering
packages/date/test/DateStringTest
packages/date/test/DelayTest
packages/date/test/GPStoFloatTest
packages/date/test/GPStoGMST1Test
packages/date/test/GPStoUTCTest
packages/date/test/IncrementGPSTest
packages/date/test/JulianDayTest
packages/date/test/LMST2Test
packages/date/test/LMSTTest
packages/date/test/LeapSecsTest
packages/date/test/StrToGPSTest
packages/date/test/UTCtoGPSTest
packages/factories/test/ArrayFactoriesTest
packages/factories/test/ArraySequenceFactoriesTest
packages/factories/test/StringVectorTest
packages/factories/test/VectorFactoriesTest
packages/factories/test/VectorSequenceFactoriesTest
packages/fft/src/CudaFFT.cpp
packages/fft/test/*.dat
packages/fft/test/AverageSpectrumTest
packages/fft/test/AvgSpecTest
packages/fft/test/ComplexFFTTest
packages/fft/test/RealFFTTest
packages/fft/test/TimeFreqFFTTest
packages/findchirp/test/FindChirpBCVSpinTest
packages/findchirp/test/FindChirpBankVetoTest
packages/findchirp/test/FindChirpTDTest
packages/inject/test/BasicInjectTest
packages/inject/test/GeneratePPNAmpCorInspiralTest
packages/inject/test/GeneratePPNInspiralTest
packages/inject/test/GeneratePulsarSignalTest
packages/inject/test/GeocentricGeodeticTest
packages/inject/test/InjectTest
packages/inject/test/InjectionInterfaceTest
packages/inject/test/SimulateTaylorCWTest
packages/inject/test/SkyCoordinatesTest
packages/inspiral/test/GenerateInspiralWaveform
packages/inspiral/test/LALHybridTest
packages/noisemodels/test/FilterTest
packages/noisemodels/test/NoisePSDTest
packages/noisemodels/test/RandomInspiralSignalTest
packages/slopefilters/test/SlopeDetectorFilterTest
packages/stats/test/LALCorrelationTest
packages/stats/test/LALMomentTest
packages/std/test/LALConstantsTest
packages/std/test/LALGSLTest
packages/std/test/LALMallocTest
packages/std/test/LALVersionTest
packages/std/test/StringConvertTest
packages/tdfilter/test/BandPassTest
packages/tdfilter/test/IIRFilterTest
packages/tdfilter/test/LPCTest
packages/tools/test/CoherentEstimationTest
packages/tools/test/ComputeTransferTest
packages/tools/test/CubicSplineTriggerInterpolantTest
packages/tools/test/DetResponseTest
packages/tools/test/DetectorSiteTest
packages/tools/test/FrequencySeriesTest
packages/tools/test/IndependentDetResponseTest
packages/tools/test/LanczosTriggerInterpolantTest
packages/tools/test/NearestNeighborTriggerInterpolantTest
packages/tools/test/QuadraticFitTriggerInterpolantTest
packages/tools/test/ResampleTimeSeriesTest
packages/tools/test/SegmentsTest
packages/tools/test/SequenceTest
packages/tools/test/SkymapTest
packages/tools/test/TimeSeriesInterpTest
packages/tools/test/TimeSeriesTest
packages/tools/test/UnitsTest
packages/utilities/test/CCoarseGrainFrequencySeriesTest
packages/utilities/test/CSInterpolateTest
packages/utilities/test/DCoarseGrainFrequencySeriesTest
packages/utilities/test/DetInverseTest
packages/utilities/test/DirichletTest
packages/utilities/test/EigenTest
packages/utilities/test/FindRootTest
packages/utilities/test/FlatMeshTest
packages/utilities/test/IntegrateTest
packages/utilities/test/InterpolateTest
packages/utilities/test/LALRunningMedianTest
packages/utilities/test/MersenneRandomTest
packages/utilities/test/NormalizeSFTRngMedTest
packages/utilities/test/ODETest
packages/utilities/test/RandomTest
packages/utilities/test/RngMedBiasTest
packages/utilities/test/SCoarseGrainFrequencySeriesTest
packages/utilities/test/SFTCleanTest
packages/utilities/test/SortTest
packages/utilities/test/ZCoarseGrainFrequencySeriesTest
packages/vectorops/test/VectorIndexRangeTest
packages/vectorops/test/VectorMathTest
packages/vectorops/test/VectorOpsTest
packages/window/test/WindowTest
python/lal/__init__.py
python/lal/_lal*
python/lal/git_version.py
python/lal/lal.py
src/LALBuildInfo.c
src/LALConfig.h
src/LALVCSInfo.c
src/LALVCSInfo.h
src/LALVCSInfoHeader.h
src/config.h
src/config.h.in
src/fft/src/CudaFFT.cpp
src/git_version
src/lal-version
src/stamp-h1
src/stamp-h2
swig/swiglal*
test/*/*.dat
test/*/*.out
test/*/*.txt
test/*/*PrintVector.*
test/date/DelayTest
test/date/GPStoFloatTest
test/date/GPStoGMST1Test
test/date/GPStoUTCTest
test/date/IncrementGPSTest
test/date/JulianDayTest
test/date/LMST2Test
test/date/LMSTTest
test/date/LeapSecsTest
test/date/StrToGPSTest
test/date/UTCtoGPSTest
test/factories/ArrayFactoriesTest
test/factories/ArraySequenceFactoriesTest
test/factories/StringVectorTest
test/factories/VectorFactoriesTest
test/factories/VectorSequenceFactoriesTest
test/fft/AverageSpectrumTest
test/fft/AvgSpecTest
test/fft/ComplexFFTTest
test/fft/RealFFTTest
test/fft/TimeFreqFFTTest
test/inject/GeocentricGeodeticTest
test/inject/SkyCoordinatesTest
test/noisemodels/NoisePSDTest
test/stats/LALCorrelationTest
test/stats/LALMomentTest
test/std/LALConstantsTest
test/std/LALGSLTest
test/std/LALMallocTest
test/std/LALVersionTest
test/std/StringConvertTest
test/support/ConfigFileTest
test/support/GzipTest
test/support/LALMath3DPlotTest
test/support/LALMathNDPlotTest
test/support/Math3DNotebook.nb
test/support/MathNDNotebook.nb
test/support/ParseStringValueTest
test/support/PrintFTSeriesTest
test/support/PrintVectorTest
test/support/ReadFTSeriesTest
test/support/SegmentsIOTest
test/support/SegmentsOutput1.data
test/support/StreamInputTest
test/support/StreamSeriesInputTest
test/support/TranslateAnglesTest
test/support/TranslateMJDTest
test/support/UserInputTest
test/tdfilter/BandPassTest
test/tdfilter/IIRFilterTest
test/tools/ComputeTransferTest
test/tools/CubicSplineTriggerInterpolantTest
test/tools/DetResponseTest
test/tools/DetectorSiteTest
test/tools/FrequencySeriesTest
test/tools/IndependentDetResponseTest
test/tools/LanczosTriggerInterpolantTest
test/tools/NearestNeighborTriggerInterpolantTest
test/tools/QuadraticFitTriggerInterpolantTest
test/tools/SequenceTest
test/tools/SkymapTest
test/tools/TimeSeriesInterpTest
test/tools/TimeSeriesTest
test/tools/UnitsTest
test/utilities/CCoarseGrainFrequencySeriesTest
test/utilities/CSInterpolateTest
test/utilities/DCoarseGrainFrequencySeriesTest
test/utilities/DetInverseTest
test/utilities/DirichletTest
test/utilities/EigenTest
test/utilities/FindRootTest
test/utilities/IntegrateTest
test/utilities/InterpolateTest
test/utilities/LALRunningMedianTest
test/utilities/MersenneRandomTest
test/utilities/ODETest
test/utilities/RandomTest
test/utilities/RngMedBiasTest
test/utilities/SCoarseGrainFrequencySeriesTest
test/utilities/SortTest
test/utilities/ZCoarseGrainFrequencySeriesTest
test/vectorops/VectorIndexRangeTest
test/vectorops/VectorMathTest
test/vectorops/VectorOpsTest
test/window/WindowTest
......@@ -16,10 +16,10 @@ EXTRA_DIST += \
SUBDIRS = \
debian \
include \
packages \
lib \
src \
swig \
python \
test \
doxygen \
$(END_OF_LIST)
......
......@@ -65,7 +65,7 @@ This example shows how to add a package called "mypackage" to LAL.
echo "SUBDIRS = include src test doc" > Makefile.am
(3) Enter the doc directory and copy doc/Makefile.am from
packages/sample
src/lal/sample
cd doc
cp ../../sample/doc/Makefile.am .
......@@ -84,7 +84,7 @@ This example shows how to add a package called "mypackage" to LAL.
to be created in the doc directory.
(4) Enter the include directory and copy include/Makefile.am from
packages/sample
src/lal/sample
cd ../include
cp ../../sample/include/Makefile.am .
......@@ -102,7 +102,7 @@ This example shows how to add a package called "mypackage" to LAL.
pkginclude_HEADERS = MyHeaderA.h MyHeaderB.h MyHeaderC.h
(5) Enter the src directory and copy src/Makefile.am from
packages/sample
src/lal/sample
cd ../src
cp ../../sample/src/Makefile.am .
......@@ -126,11 +126,11 @@ This example shows how to add a package called "mypackage" to LAL.
If your package requires any of the optional packages in LAL (frame
and/or mpi) use the Makefile.am's in
packages/[framedata|comm|findchirp]/src
src/lal/[framedata|comm|findchirp]/src
as a guide to constructing your own.
(6) Enter the test directory and copy test/Makefile.am from
packages/sample
src/lal/sample
cd ../test
cp ../../sample/test/Makefile.am .
......@@ -147,16 +147,16 @@ This example shows how to add a package called "mypackage" to LAL.
sources and link them to LAL. Change the lines
LALSampleTest_SOURCES = LALSampleTest.c
LALSampleTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
LALSampleTest_LDADD = $(top_builddir)/src/lal/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
LALTemplateTest_SOURCES = LALTemplateTest.c
LALTemplateTest_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
LALTemplateTest_LDADD = $(top_builddir)/src/lal/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
to
MyTestProgA_SOURCES = MyTestProgA.c
MyTestProgA_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
MyTestProgA_LDADD = $(top_builddir)/src/lal/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
MyTestProgB_SOURCES = MyTestProgB.c
MyTestProgB_LDADD = $(top_builddir)/packages/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
MyTestProgB_LDADD = $(top_builddir)/src/lal/support/src/liblalsupport.la $(top_builddir)/lib/liblal.la
and the line
......@@ -205,7 +205,7 @@ Appendix: how to use laldoc to generate documentation.
mypackage.tex
This file is read by a driver texfile to make the documentation in
the packages/mypackage/doc directory and is also read by lsd.tex in
the src/lal/mypackage/doc directory and is also read by lsd.tex in
the top-level doc directory to make the mypackage documentation in
the lsd
......@@ -248,8 +248,8 @@ Appendix: how to use laldoc to generate documentation.
make dvi LATEX=latex
The package will have its own documentation in a file
packages/mypackage/doc/main.[dvi|pdf].
src/lal/mypackage/doc/main.[dvi|pdf].
In the directory packages/mypackage. If any errors occur, consult
the file packages/mypackage/doc/.adoc/laldoc.log for laldoc errors
or the file packages/mypackage/doc/.adoc/main.log for tex errors.
In the directory src/lal/mypackage. If any errors occur, consult
the file src/lal/mypackage/doc/.adoc/laldoc.log for laldoc errors
or the file src/lal/mypackage/doc/.adoc/main.log for tex errors.
AC_PREREQ([2.63])
AC_INIT([LAL],[6.13.4.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([include/config.h lib/lal/LALConfig.h])
AC_CONFIG_SRCDIR([packages/std/include/LALStdio.h])
AC_CONFIG_HEADERS([src/config.h src/LALConfig.h])
AC_CONFIG_SRCDIR([src/std/LALStdio.h])
AC_CONFIG_AUX_DIR([gnuscripts])
AC_CONFIG_MACRO_DIR([gnuscripts])
AC_CONFIG_FILES([ \
......@@ -14,69 +14,42 @@ AC_CONFIG_FILES([ \
lal.pc \
lal.spec \
lalsupport.pc \
lib/Makefile \
lib/lal/LALVCSInfo.c \
lib/lal/LALVCSInfo.h \
lib/lal/Makefile \
lib/lalsupport/Makefile \
lib/lalsupport/include/Makefile \
lib/lalsupport/src/Makefile \
lib/lalsupport/test/Makefile \
packages/Makefile \
packages/date/Makefile \
packages/date/include/Makefile \
packages/date/src/Makefile \
packages/date/test/Makefile \
packages/factories/Makefile \
packages/factories/include/Makefile \
packages/factories/src/Makefile \
packages/factories/test/Makefile \
packages/fft/Makefile \
packages/fft/include/Makefile \
packages/fft/src/Makefile \
packages/fft/test/Makefile \
packages/inject/Makefile \
packages/inject/include/Makefile \
packages/inject/src/Makefile \
packages/inject/test/Makefile \
packages/noisemodels/Makefile \
packages/noisemodels/include/Makefile \
packages/noisemodels/src/Makefile \
packages/noisemodels/test/Makefile \
packages/stats/Makefile \
packages/stats/include/Makefile \
packages/stats/src/Makefile \
packages/stats/test/Makefile \
packages/std/Makefile \
packages/std/include/Makefile
packages/std/src/Makefile \
packages/std/test/Makefile \
packages/tdfilter/Makefile \
packages/tdfilter/include/Makefile \
packages/tdfilter/src/Makefile \
packages/tdfilter/test/Makefile \
packages/tools/Makefile \
packages/tools/include/Makefile \
packages/tools/src/Makefile \
packages/tools/test/Makefile \
packages/utilities/Makefile \
packages/utilities/include/Makefile \
packages/utilities/src/Makefile \