diff --git a/gstlal-burst/.gitignore b/gstlal-burst/.gitignore index 08020069a515c946d5310f61cbebd94bcaeb7c3c..0da8d0e3c634566a1f599b148066e42e6c892140 100644 --- a/gstlal-burst/.gitignore +++ b/gstlal-burst/.gitignore @@ -1,2 +1,2 @@ gstlal-burst.spec -lib/gstlal-burst.pc +lib/gstlal-burst/gstlal-burst.pc diff --git a/gstlal-burst/configure.ac b/gstlal-burst/configure.ac index 849d287dbe696e10ea6012fc4da8673a180a72dc..902ba6905daa14184cea41ea4ea37e6e7df09d0b 100644 --- a/gstlal-burst/configure.ac +++ b/gstlal-burst/configure.ac @@ -16,8 +16,9 @@ AC_CONFIG_FILES([ \ Makefile \ gstlal-burst.spec \ bin/Makefile \ - lib/gstlal-burst.pc \ lib/Makefile \ + lib/gstlal-burst/gstlal-burst.pc \ + lib/gstlal-burst/Makefile \ gst/Makefile \ gst/lal/Makefile \ debian/control \ diff --git a/gstlal-burst/gst/lal/Makefile.am b/gstlal-burst/gst/lal/Makefile.am index 6b0cacaf2d2d4134cb3298de5f0eaaa22e1e047d..57956aa39d19c7fa412054b7fbe36969e4e1b2d9 100644 --- a/gstlal-burst/gst/lal/Makefile.am +++ b/gstlal-burst/gst/lal/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/lib +AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib plugin_LTLIBRARIES = lib@GSTPLUGINPREFIX@gstlalburst.la @@ -8,6 +8,6 @@ lib@GSTPLUGINPREFIX@gstlalburst_la_SOURCES = \ gstlal_string_triggergen.c gstlal_string_triggergen.h lib@GSTPLUGINPREFIX@gstlalburst_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS) $(LAL_CFLAGS) $(GSTLAL_CFLAGS) $(gstreamer_CFLAGS) -lib@GSTPLUGINPREFIX@gstlalburst_la_LIBADD = $(top_builddir)/lib/libgstlalburst.la +lib@GSTPLUGINPREFIX@gstlalburst_la_LIBADD = $(top_builddir)/lib/gstlal-burst/libgstlalburst.la lib@GSTPLUGINPREFIX@gstlalburst_la_LDFLAGS = $(AM_LDFLAGS) $(GSL_LIBS) $(LAL_LIBS) $(GSTLAL_LIBS) $(gstreamer_LIBS) $(GSTLAL_PLUGIN_LDFLAGS) diff --git a/gstlal-burst/gst/lal/gstlal_trigger.c b/gstlal-burst/gst/lal/gstlal_trigger.c index 8f18d64f7f976026f2e2fab346c514dd3b423a6c..aa3ced809bdd2f1b8487c7f19b8fa81789cbdd71 100644 --- a/gstlal-burst/gst/lal/gstlal_trigger.c +++ b/gstlal-burst/gst/lal/gstlal_trigger.c @@ -51,7 +51,7 @@ #include <gstlal/gstaudioadapter.h> #include <gstlal/gstlal_tags.h> #include <gstlal/gstlal_autocorrelation_chi2.h> -#include <gstlal_sngltrigger.h> +#include <gstlal-burst/gstlal_sngltrigger.h> /* diff --git a/gstlal-burst/gst/lal/gstlal_trigger.h b/gstlal-burst/gst/lal/gstlal_trigger.h index 50c5af3a2d0abceea082d99132049adceef27b88..68e896a37e845fc731f6c9a2c646595a9f2bfedf 100644 --- a/gstlal-burst/gst/lal/gstlal_trigger.h +++ b/gstlal-burst/gst/lal/gstlal_trigger.h @@ -38,7 +38,7 @@ #include <lal/LIGOMetadataTables.h> #include <gsl/gsl_matrix.h> #include <gsl/gsl_matrix_float.h> -#include <gstlal_sngltrigger.h> +#include <gstlal-burst/gstlal_sngltrigger.h> G_BEGIN_DECLS diff --git a/gstlal-burst/lib/Makefile.am b/gstlal-burst/lib/Makefile.am index 203886e6b4e8d0a8df64bc06cd2affeb9e4b22e8..a27b880424a18a980834e26879ab0e80bed40418 100644 --- a/gstlal-burst/lib/Makefile.am +++ b/gstlal-burst/lib/Makefile.am @@ -1,10 +1 @@ -pkginclude_HEADERS = gstlal_snglburst.h gstlal_sngltrigger.h sngltriggerrowtype.h -pkgconfig_DATA = gstlal-burst.pc -lib_LTLIBRARIES = libgstlalburst.la - -libgstlalburst_la_SOURCES = \ - gstlal_snglburst.h gstlal_snglburst.c \ - gstlal_sngltrigger.h gstlal_sngltrigger.c \ - sngltriggerrowtype.h sngltriggerrowtype.c -libgstlalburst_la_CFLAGS = $(AM_CFLAGS) $(LAL_CFLAGS) $(GSTLAL_CFLAGS) $(gstreamer_CFLAGS) -libgstlalburst_la_LDFLAGS = -version-info $(LIBVERSION) $(AM_LDFLAGS) $(LAL_LIBS) $(GSTLAL_LIBS) $(gstreamer_LIBS) +SUBDIRS = gstlal-burst diff --git a/gstlal-burst/lib/gstlal-burst/Makefile.am b/gstlal-burst/lib/gstlal-burst/Makefile.am new file mode 100644 index 0000000000000000000000000000000000000000..ee02617700318d0466d7eb797c221f4754827c1d --- /dev/null +++ b/gstlal-burst/lib/gstlal-burst/Makefile.am @@ -0,0 +1,12 @@ +AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib + +pkginclude_HEADERS = gstlal_snglburst.h gstlal_sngltrigger.h sngltriggerrowtype.h +pkgconfig_DATA = gstlal-burst.pc +lib_LTLIBRARIES = libgstlalburst.la + +libgstlalburst_la_SOURCES = \ + gstlal_snglburst.h gstlal_snglburst.c \ + gstlal_sngltrigger.h gstlal_sngltrigger.c \ + sngltriggerrowtype.h sngltriggerrowtype.c +libgstlalburst_la_CFLAGS = $(AM_CFLAGS) $(LAL_CFLAGS) $(GSTLAL_CFLAGS) $(gstreamer_CFLAGS) +libgstlalburst_la_LDFLAGS = -version-info $(LIBVERSION) $(AM_LDFLAGS) $(LAL_LIBS) $(GSTLAL_LIBS) $(gstreamer_LIBS) diff --git a/gstlal-burst/lib/gstlal-burst.pc.in b/gstlal-burst/lib/gstlal-burst/gstlal-burst.pc.in similarity index 100% rename from gstlal-burst/lib/gstlal-burst.pc.in rename to gstlal-burst/lib/gstlal-burst/gstlal-burst.pc.in diff --git a/gstlal-burst/lib/gstlal_snglburst.c b/gstlal-burst/lib/gstlal-burst/gstlal_snglburst.c similarity index 100% rename from gstlal-burst/lib/gstlal_snglburst.c rename to gstlal-burst/lib/gstlal-burst/gstlal_snglburst.c diff --git a/gstlal-burst/lib/gstlal_snglburst.h b/gstlal-burst/lib/gstlal-burst/gstlal_snglburst.h similarity index 100% rename from gstlal-burst/lib/gstlal_snglburst.h rename to gstlal-burst/lib/gstlal-burst/gstlal_snglburst.h diff --git a/gstlal-burst/lib/gstlal_sngltrigger.c b/gstlal-burst/lib/gstlal-burst/gstlal_sngltrigger.c similarity index 100% rename from gstlal-burst/lib/gstlal_sngltrigger.c rename to gstlal-burst/lib/gstlal-burst/gstlal_sngltrigger.c diff --git a/gstlal-burst/lib/gstlal_sngltrigger.h b/gstlal-burst/lib/gstlal-burst/gstlal_sngltrigger.h similarity index 100% rename from gstlal-burst/lib/gstlal_sngltrigger.h rename to gstlal-burst/lib/gstlal-burst/gstlal_sngltrigger.h diff --git a/gstlal-burst/lib/sngltriggerrowtype.c b/gstlal-burst/lib/gstlal-burst/sngltriggerrowtype.c similarity index 100% rename from gstlal-burst/lib/sngltriggerrowtype.c rename to gstlal-burst/lib/gstlal-burst/sngltriggerrowtype.c diff --git a/gstlal-burst/lib/sngltriggerrowtype.h b/gstlal-burst/lib/gstlal-burst/sngltriggerrowtype.h similarity index 97% rename from gstlal-burst/lib/sngltriggerrowtype.h rename to gstlal-burst/lib/gstlal-burst/sngltriggerrowtype.h index 18626d3da3423d8f7e85bf9aa633e564b4bfcb67..347c8264e1126ed083b1bc4e04e9bbb3111c4333 100644 --- a/gstlal-burst/lib/sngltriggerrowtype.h +++ b/gstlal-burst/lib/gstlal-burst/sngltriggerrowtype.h @@ -34,7 +34,7 @@ #include <lal/LALDatatypes.h> #include <lal/LIGOMetadataTables.h> -#include <gstlal_sngltrigger.h> +#include <gstlal-burst/gstlal_sngltrigger.h> G_BEGIN_DECLS diff --git a/gstlal-burst/python/Makefile.am b/gstlal-burst/python/Makefile.am index 35aab3403f011c97f502243e508b65a88a42075a..2fa862f74f123ac4456305c1a4c3ca2689ba81f1 100644 --- a/gstlal-burst/python/Makefile.am +++ b/gstlal-burst/python/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/lib +AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib SUBDIRS = excesspower fxtools @@ -11,5 +11,5 @@ pkgpyexec_LTLIBRARIES = _snglbursttable.la _snglbursttable_la_SOURCES = snglbursttable.c snglburstrowtype.h _snglbursttable_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS) -DMODULE_NAME="\"gstlal._snglbursttable\"" _snglbursttable_la_CFLAGS = $(AM_CFLAGS) $(LAL_CFLAGS) $(GSL_CFLAGS) $(gstreamer_CFLAGS) -fno-strict-aliasing -DMODULE_NAME="\"gstlal._snglbursttable\"" -_snglbursttable_la_LIBADD = $(top_builddir)/lib/libgstlalburst.la +_snglbursttable_la_LIBADD = $(top_builddir)/lib/gstlal-burst/libgstlalburst.la _snglbursttable_la_LDFLAGS = $(AM_LDFLAGS) $(LAL_LIBS) $(GSL_LIBS) $(PYTHON_LIBS) -module -avoid-version diff --git a/gstlal-burst/python/fxtools/Makefile.am b/gstlal-burst/python/fxtools/Makefile.am index 8a306eee824f9e005ff8a99e10a2a98675967d51..14c2ad7e00194cd45e000693b4745df5b0366c11 100644 --- a/gstlal-burst/python/fxtools/Makefile.am +++ b/gstlal-burst/python/fxtools/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/lib +AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib # This is a trick taken from the gst-python automake setup. # All of the Python scripts will be installed under the exec dir, @@ -22,5 +22,5 @@ pkgpyexec_LTLIBRARIES = _sngltriggertable.la _sngltriggertable_la_SOURCES = sngltriggertable.c _sngltriggertable_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS) -DMODULE_NAME="\"gstlal._sngltriggertable\"" _sngltriggertable_la_CFLAGS = $(AM_CFLAGS) $(GSTLAL_CFLAGS) $(LAL_CFLAGS) $(GSL_CFLAGS) $(gstreamer_CFLAGS) -fno-strict-aliasing -DMODULE_NAME="\"gstlal._sngltriggertable\"" -_sngltriggertable_la_LIBADD = $(top_builddir)/lib/libgstlalburst.la +_sngltriggertable_la_LIBADD = $(top_builddir)/lib/gstlal-burst/libgstlalburst.la _sngltriggertable_la_LDFLAGS = $(AM_LDFLAGS) $(LAL_LIBS) $(GSL_LIBS) $(PYTHON_LIBS) -module -avoid-version diff --git a/gstlal-burst/python/fxtools/sngltriggertable.c b/gstlal-burst/python/fxtools/sngltriggertable.c index d1b626b885cfbfb0d52e6c5f56b78af8d388d03f..8b862d5c4bd0b02fc49a789c95b81a491323344a 100644 --- a/gstlal-burst/python/fxtools/sngltriggertable.c +++ b/gstlal-burst/python/fxtools/sngltriggertable.c @@ -35,8 +35,8 @@ #include <lal/TimeSeries.h> #include <lal/Units.h> -#include <gstlal_sngltrigger.h> -#include <sngltriggerrowtype.h> +#include <gstlal-burst/gstlal_sngltrigger.h> +#include <gstlal-burst/sngltriggerrowtype.h> /*