From f8a1988fc60df084afefbda41cff3b71ac39e7a4 Mon Sep 17 00:00:00 2001 From: Kipp Cannon <kipp.cannon@ligo.org> Date: Thu, 14 Feb 2019 12:47:36 -0800 Subject: [PATCH] gstlal: don't distribute libezligolw - as a separate library. put it in libgstlal to not complicate the build process of other stuff that uses it --- gstlal/gst/lal/Makefile.am | 2 +- gstlal/lib/gstlal/Makefile.am | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gstlal/gst/lal/Makefile.am b/gstlal/gst/lal/Makefile.am index c1b10591de..4394df2ef4 100644 --- a/gstlal/gst/lal/Makefile.am +++ b/gstlal/gst/lal/Makefile.am @@ -27,5 +27,5 @@ lib@GSTPLUGINPREFIX@gstlal_la_SOURCES = \ gstlal_whiten.h gstlal_whiten.c \ gstlal_shift.h gstlal_shift.c lib@GSTPLUGINPREFIX@gstlal_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS) $(FFTW_CFLAGS) $(LAL_CFLAGS) $(gstreamer_CFLAGS) $(gstreamer_audio_CFLAGS) -lib@GSTPLUGINPREFIX@gstlal_la_LIBADD = $(top_builddir)/lib/gstlal/libezligolw.la $(top_builddir)/lib/gstlal/libgstlal.la $(top_builddir)/lib/gstlal/libgstlaltags.la $(top_builddir)/lib/gstlal/libgstlaltypes.la +lib@GSTPLUGINPREFIX@gstlal_la_LIBADD = $(top_builddir)/lib/gstlal/libgstlal.la $(top_builddir)/lib/gstlal/libgstlaltags.la $(top_builddir)/lib/gstlal/libgstlaltypes.la lib@GSTPLUGINPREFIX@gstlal_la_LDFLAGS = $(AM_LDFLAGS) $(GSL_LIBS) $(FFTW_LIBS) $(LAL_LIBS) $(gstreamer_LIBS) $(gstreamer_audio_LIBS) $(GSTLAL_PLUGIN_LDFLAGS) diff --git a/gstlal/lib/gstlal/Makefile.am b/gstlal/lib/gstlal/Makefile.am index c156d54f98..75512afc59 100644 --- a/gstlal/lib/gstlal/Makefile.am +++ b/gstlal/lib/gstlal/Makefile.am @@ -3,13 +3,9 @@ CLEANFILES = pkginclude_HEADERS = ezligolw.h ezxml.h gstlal.h gstlal_debug.h gstlal_marshal.h gstlal_tags.h gstlal_cdf_weighted_chisq_P.h gstlal_segments.h gstaudioadapter.h gstlalcollectpads.h gstlal_peakfinder.h gstlal_autocorrelation_chi2.h gstlal_gps_clock.h gstlal_frhistory.h gstlal_audio_info.h pkgconfig_DATA = gstlal.pc -lib_LTLIBRARIES = libezligolw.la libgstlal.la libgstlaltags.la libgstlaltypes.la +lib_LTLIBRARIES = libgstlal.la libgstlaltags.la libgstlaltypes.la -libezligolw_la_SOURCES = ezligolw.c ezligolw.h ezxml.c ezxml.h -libezligolw_la_CFLAGS = $(AM_CFLAGS) -I.. -libezligolw_la_LDFLAGS = -version-info $(LIBVERSION) $(AM_LDFLAGS) - -libgstlal_la_SOURCES = gstlal.c gstlal.h gstlal_debug.h gstlal_fftw.c gstlal_marshal.c gstlal_marshal.h gstlal_cdf_weighted_chisq_P.c gstlal_cdf_weighted_chisq_P.h gstlal_segments.h gstlal_segments.c gstlal_peakfinder.h gstlal_peakfinder.c gstlal_autocorrelation_chi2.h gstlal_autocorrelation_chi2.c gstlal_audio_info.c +libgstlal_la_SOURCES = ezligolw.c ezligolw.h ezxml.c ezxml.h gstlal.c gstlal.h gstlal_debug.h gstlal_fftw.c gstlal_marshal.c gstlal_marshal.h gstlal_cdf_weighted_chisq_P.c gstlal_cdf_weighted_chisq_P.h gstlal_segments.h gstlal_segments.c gstlal_peakfinder.h gstlal_peakfinder.c gstlal_autocorrelation_chi2.h gstlal_autocorrelation_chi2.c gstlal_audio_info.c libgstlal_la_CFLAGS = $(AM_CFLAGS) $(FFTW_CFLAGS) $(GSL_CFLAGS) $(LAL_CFLAGS) $(gstreamer_CFLAGS) libgstlal_la_LDFLAGS = -version-info $(LIBVERSION) $(AM_LDFLAGS) $(FFTW_LIBS) $(GSL_LIBS) $(LAL_LIBS) $(gstreamer_LIBS) $(gstreamer_audio_LIBS) -- GitLab