Commit 0e47142a authored by Kipp Cannon's avatar Kipp Cannon

gstlal-burst: reorganize lib

- move files into a gstlal/ directory so that header files can be
  #include'ed using paths that will work inside and outside the source tree
parent 0f56fcc7
gstlal-burst.spec
lib/gstlal-burst.pc
lib/gstlal-burst/gstlal-burst.pc
......@@ -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 \
......
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)
......@@ -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>
/*
......
......@@ -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
......
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
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)
......@@ -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
......
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
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
......@@ -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>
/*
......
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