From 0e47142a684ef92712b7efe0e665aee96c2b71f4 Mon Sep 17 00:00:00 2001
From: Kipp Cannon <kipp.cannon@ligo.org>
Date: Thu, 7 Mar 2019 13:11:26 +0900
Subject: [PATCH] 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
---
gstlal-burst/.gitignore | 2 +-
gstlal-burst/configure.ac | 3 ++-
gstlal-burst/gst/lal/Makefile.am | 4 ++--
gstlal-burst/gst/lal/gstlal_trigger.c | 2 +-
gstlal-burst/gst/lal/gstlal_trigger.h | 2 +-
gstlal-burst/lib/Makefile.am | 11 +----------
gstlal-burst/lib/gstlal-burst/Makefile.am | 12 ++++++++++++
.../lib/{ => gstlal-burst}/gstlal-burst.pc.in | 0
.../lib/{ => gstlal-burst}/gstlal_snglburst.c | 0
.../lib/{ => gstlal-burst}/gstlal_snglburst.h | 0
.../lib/{ => gstlal-burst}/gstlal_sngltrigger.c | 0
.../lib/{ => gstlal-burst}/gstlal_sngltrigger.h | 0
.../lib/{ => gstlal-burst}/sngltriggerrowtype.c | 0
.../lib/{ => gstlal-burst}/sngltriggerrowtype.h | 2 +-
gstlal-burst/python/Makefile.am | 4 ++--
gstlal-burst/python/fxtools/Makefile.am | 4 ++--
gstlal-burst/python/fxtools/sngltriggertable.c | 4 ++--
17 files changed, 27 insertions(+), 23 deletions(-)
create mode 100644 gstlal-burst/lib/gstlal-burst/Makefile.am
rename gstlal-burst/lib/{ => gstlal-burst}/gstlal-burst.pc.in (100%)
rename gstlal-burst/lib/{ => gstlal-burst}/gstlal_snglburst.c (100%)
rename gstlal-burst/lib/{ => gstlal-burst}/gstlal_snglburst.h (100%)
rename gstlal-burst/lib/{ => gstlal-burst}/gstlal_sngltrigger.c (100%)
rename gstlal-burst/lib/{ => gstlal-burst}/gstlal_sngltrigger.h (100%)
rename gstlal-burst/lib/{ => gstlal-burst}/sngltriggerrowtype.c (100%)
rename gstlal-burst/lib/{ => gstlal-burst}/sngltriggerrowtype.h (97%)
diff --git a/gstlal-burst/.gitignore b/gstlal-burst/.gitignore
index 08020069a5..0da8d0e3c6 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 849d287dbe..902ba6905d 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 6b0cacaf2d..57956aa39d 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 8f18d64f7f..aa3ced809b 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 50c5af3a2d..68e896a37e 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 203886e6b4..a27b880424 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 0000000000..ee02617700
--- /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 18626d3da3..347c8264e1 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 35aab3403f..2fa862f74f 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 8a306eee82..14c2ad7e00 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 d1b626b885..8b862d5c4b 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>
/*
--
GitLab