From ad13c00ae8cba6327851652a7d0c94a6d6316916 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Fri, 28 May 2010 20:02:38 -0700 Subject: [PATCH] Make C++ shared libraries versioned --- Makefile.common | 3 +++ gnuradio-core/gnuradio-core.pc.in | 2 +- gnuradio-core/src/lib/Makefile.am | 9 +++++---- gr-atsc/gnuradio-atsc.pc.in | 2 +- gr-atsc/src/lib/Makefile.am | 3 +-- gr-audio-alsa/gnuradio-audio-alsa.pc.in | 2 +- gr-audio-alsa/src/Makefile.am | 3 +-- gr-audio-jack/gnuradio-audio-jack.pc.in | 2 +- gr-audio-jack/src/Makefile.am | 3 +-- gr-audio-oss/gnuradio-audio-oss.pc.in | 2 +- gr-audio-oss/src/Makefile.am | 3 +-- gr-audio-osx/src/Makefile.am | 3 ++- gr-audio-portaudio/gnuradio-audio-portaudio.pc.in | 2 +- gr-audio-portaudio/src/Makefile.am | 3 +-- gr-audio-windows/src/Makefile.am | 3 ++- gr-comedi/gnuradio-comedi.pc.in | 2 +- gr-comedi/src/Makefile.am | 3 +-- gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in | 2 +- gr-cvsd-vocoder/src/lib/Makefile.am | 3 +-- gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in | 4 ++-- gr-gsm-fr-vocoder/src/lib/Makefile.am | 3 +-- gr-msdd6000/gnuradio-msdd6000.pc.in | 6 +++--- gr-msdd6000/src/Makefile.am | 8 +++----- gr-noaa/lib/Makefile.am | 2 +- gr-pager/gnuradio-pager.pc.in | 2 +- gr-pager/lib/Makefile.am | 3 +-- gr-qtgui/src/lib/Makefile.am | 2 +- gr-trellis/gnuradio-trellis.pc.in | 8 ++++---- gr-trellis/src/lib/Makefile.am | 5 +---- gr-usrp/gnuradio-usrp.pc.in | 2 +- gr-usrp/src/Makefile.am | 2 +- gr-usrp2/gnuradio-usrp2.pc.in | 2 +- gr-usrp2/src/Makefile.am | 2 ++ gr-video-sdl/gnuradio-video-sdl.pc.in | 2 +- gr-video-sdl/src/Makefile.am | 3 +-- gr-wxgui/gr-wxgui.pc.in | 2 +- gruel/gruel.pc.in | 2 +- gruel/src/lib/Makefile.am | 2 +- usrp/host/lib/Makefile.am | 2 +- usrp/usrp.pc.in | 2 +- usrp2/host/lib/Makefile.am | 2 ++ usrp2/host/usrp2.pc.in | 2 +- 42 files changed, 60 insertions(+), 65 deletions(-) diff --git a/Makefile.common b/Makefile.common index aafe85fe..fb83b947 100644 --- a/Makefile.common +++ b/Makefile.common @@ -23,6 +23,9 @@ AM_CFLAGS = @autoconf_default_CFLAGS@ @lf_CFLAGS@ AM_CXXFLAGS = @autoconf_default_CXXFLAGS@ @lf_CXXFLAGS@ +# Sets ABI version in SONAME and appends -LIBVER to filename +LTVERSIONFLAGS = -version-info 0:0:0 -release $(LIBVER) + # includes grincludedir = $(includedir)/gnuradio diff --git a/gnuradio-core/gnuradio-core.pc.in b/gnuradio-core/gnuradio-core.pc.in index 9ff83504..5d743a4e 100644 --- a/gnuradio-core/gnuradio-core.pc.in +++ b/gnuradio-core/gnuradio-core.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@/gnuradio Name: gnuradio-core Description: GNU Software Radio toolkit Requires: gruel fftw3f gsl -Version: @VERSION@ +Version: @LIBVER@ Libs.private: @BOOST_LDFLAGS@ @BOOST_THREAD_LIB@ @BOOST_DATE_TIME_LIB@ Libs: -L${libdir} -lgnuradio-core Cflags: @BOOST_CPPFLAGS@ @BOOST_CXXFLAGS@ -I${includedir} diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am index 477ba672..86e3aa1f 100644 --- a/gnuradio-core/src/lib/Makefile.am +++ b/gnuradio-core/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2004,2009 Free Software Foundation, Inc. +# Copyright 2001,2004,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -33,10 +33,11 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) # generate libgnuradio-core.la from the convenience libraries in subdirs -lib_LTLIBRARIES = libgnuradio-core.la libgnuradio-core-qa.la +lib_LTLIBRARIES = libgnuradio-core.la +noinst_LTLIBRARIES = libgnuradio-core-qa.la libgnuradio_core_la_SOURCES = bug_work_around_6.cc -libgnuradio_core_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 +libgnuradio_core_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) libgnuradio_core_qa_la_SOURCES = bug_work_around_6.cc libgnuradio_core_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 \ @@ -68,4 +69,4 @@ libgnuradio_core_qa_la_LIBADD = \ bin_PROGRAMS = gnuradio-config-info gnuradio_config_info_SOURCES = gnuradio-config-info.cc -gnuradio_config_info_LDADD = libgnuradio-core.la $(BOOST_PROGRAM_OPTIONS_LIB) \ No newline at end of file +gnuradio_config_info_LDADD = libgnuradio-core.la $(BOOST_PROGRAM_OPTIONS_LIB) diff --git a/gr-atsc/gnuradio-atsc.pc.in b/gr-atsc/gnuradio-atsc.pc.in index 4c5ae068..4413bfc8 100644 --- a/gr-atsc/gnuradio-atsc.pc.in +++ b/gr-atsc/gnuradio-atsc.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: gnuradio-atsc Description: The GNU Radio blocks for ATSC decoding Requires: gnuradio-core -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-atsc Cflags: -I${includedir} diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am index 8aeb80c0..bf9c6626 100644 --- a/gr-atsc/src/lib/Makefile.am +++ b/gr-atsc/src/lib/Makefile.am @@ -92,8 +92,7 @@ BUILT_SOURCES = \ libgnuradio_atsc_la_LIBADD = \ $(GNURADIO_CORE_LA) -libgnuradio_atsc_la_LDFLAGS = \ - $(NO_UNDEFINED) +libgnuradio_atsc_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) noinst_LTLIBRARIES = libgnuradio-atsc-qa.la diff --git a/gr-audio-alsa/gnuradio-audio-alsa.pc.in b/gr-audio-alsa/gnuradio-audio-alsa.pc.in index 797bfc02..d5147e6a 100644 --- a/gr-audio-alsa/gnuradio-audio-alsa.pc.in +++ b/gr-audio-alsa/gnuradio-audio-alsa.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: gnuradio-audio-alsa Description: The GNU Radio block for the ALSA sound system Requires: gnuradio-core alsa -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-audio-alsa Cflags: -I${includedir} diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am index ee7498af..ed92cc19 100644 --- a/gr-audio-alsa/src/Makefile.am +++ b/gr-audio-alsa/src/Makefile.am @@ -50,8 +50,7 @@ libgnuradio_audio_alsa_la_LIBADD = \ $(GNURADIO_CORE_LA) \ $(ALSA_LIBS) -libgnuradio_audio_alsa_la_LDFLAGS = \ - $(NO_UNDEFINED) +libgnuradio_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) if PYTHON ################################### diff --git a/gr-audio-jack/gnuradio-audio-jack.pc.in b/gr-audio-jack/gnuradio-audio-jack.pc.in index eaceaea2..8fb4a2e0 100644 --- a/gr-audio-jack/gnuradio-audio-jack.pc.in +++ b/gr-audio-jack/gnuradio-audio-jack.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: gnuradio-audio-jack Description: GNU Radio blocks for the JACK sound system Requires: gnuradio-core jack -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-audio-jack Cflags: -I${includedir} diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am index b766ec20..8e0dfe1e 100644 --- a/gr-audio-jack/src/Makefile.am +++ b/gr-audio-jack/src/Makefile.am @@ -42,8 +42,7 @@ libgnuradio_audio_jack_la_LIBADD = \ $(GNURADIO_CORE_LA) \ $(JACK_LIBS) -libgnuradio_audio_jack_la_LDFLAGS = \ - $(NO_UNDEFINED) +libgnuradio_audio_jack_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) noinst_PYTHON = \ qa_jack.py diff --git a/gr-audio-oss/gnuradio-audio-oss.pc.in b/gr-audio-oss/gnuradio-audio-oss.pc.in index f598ba30..4a215bda 100644 --- a/gr-audio-oss/gnuradio-audio-oss.pc.in +++ b/gr-audio-oss/gnuradio-audio-oss.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: gnuradio-audio-oss Description: The GNU Radio block for the OSS sound system Requires: gnuradio-core -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-audio-oss Cflags: -I${includedir} diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am index 61428063..628c9fd9 100644 --- a/gr-audio-oss/src/Makefile.am +++ b/gr-audio-oss/src/Makefile.am @@ -42,8 +42,7 @@ libgnuradio_audio_oss_la_LIBADD = \ $(GNURADIO_CORE_LA) \ $(OSS_LIBS) -libgnuradio_audio_oss_la_LDFLAGS = \ - $(NO_UNDEFINED) +libgnuradio_audio_oss_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) if PYTHON ################################### diff --git a/gr-audio-osx/src/Makefile.am b/gr-audio-osx/src/Makefile.am index 5bf28b8e..ee9df776 100644 --- a/gr-audio-osx/src/Makefile.am +++ b/gr-audio-osx/src/Makefile.am @@ -51,7 +51,8 @@ libgnuradio_audio_osx_la_LDFLAGS = \ -framework AudioUnit \ -framework CoreAudio \ -framework AudioToolbox \ - $(NO_UNDEFINED) + $(NO_UNDEFINED) \ + $(LTVERSIONFLAGS) if PYTHON ################################### diff --git a/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in b/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in index 8f2c8086..08619596 100644 --- a/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in +++ b/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: gnuradio-audio-portaudio Description: The GNU Radio block for the PORTAUDIO sound system Requires: gnuradio-core -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-audio-portaudio Cflags: -I${includedir} diff --git a/gr-audio-portaudio/src/Makefile.am b/gr-audio-portaudio/src/Makefile.am index 1df6bbce..4fa098dc 100644 --- a/gr-audio-portaudio/src/Makefile.am +++ b/gr-audio-portaudio/src/Makefile.am @@ -48,8 +48,7 @@ libgnuradio_audio_portaudio_la_LIBADD = \ $(GNURADIO_CORE_LA) \ $(PORTAUDIO_LIBS) -libgnuradio_audio_portaudio_la_LDFLAGS = \ - $(NO_UNDEFINED) +libgnuradio_audio_portaudio_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) if PYTHON diff --git a/gr-audio-windows/src/Makefile.am b/gr-audio-windows/src/Makefile.am index dc91e140..d3e3f5a8 100644 --- a/gr-audio-windows/src/Makefile.am +++ b/gr-audio-windows/src/Makefile.am @@ -44,7 +44,8 @@ libgnuradio_audio_windows_la_LIBADD = \ libgnuradio_audio_windows_la_LDFLAGS = \ $(LIBGNURADIO_CORE_EXTRA_LDFLAGS) \ - $(NO_UNDEFINED) + $(NO_UNDEFINED) \ + $(LTVERSIONFLAGS) if PYTHON ################################### diff --git a/gr-comedi/gnuradio-comedi.pc.in b/gr-comedi/gnuradio-comedi.pc.in index 8c320b56..205b40e3 100644 --- a/gr-comedi/gnuradio-comedi.pc.in +++ b/gr-comedi/gnuradio-comedi.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: gnuradio-comedi Description: GNU Radio blocks for the comedi library Requires: gnuradio-core -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-comedi Cflags: -I${includedir} diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am index 462c50ad..a55bd175 100644 --- a/gr-comedi/src/Makefile.am +++ b/gr-comedi/src/Makefile.am @@ -47,8 +47,7 @@ libgnuradio_comedi_la_LIBADD = \ $(GNURADIO_CORE_LA) \ $(COMEDI_LIBS) -libgnuradio_comedi_la_LDFLAGS = \ - $(NO_UNDEFINED) +libgnuradio_comedi_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) if PYTHON ################################### diff --git a/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in b/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in index 05623086..f5f0c2e6 100644 --- a/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in +++ b/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: gnuradio-cvsd-vocoder Description: GNU Radio blocks implementing a CVSD vocoder Requires: gnuradio-core -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-cvsd-vocoder Cflags: -I${includedir} diff --git a/gr-cvsd-vocoder/src/lib/Makefile.am b/gr-cvsd-vocoder/src/lib/Makefile.am index 500d0e85..c5957f4a 100644 --- a/gr-cvsd-vocoder/src/lib/Makefile.am +++ b/gr-cvsd-vocoder/src/lib/Makefile.am @@ -37,8 +37,7 @@ libgnuradio_cvsd_vocoder_la_SOURCES = \ libgnuradio_cvsd_vocoder_la_LIBADD = \ $(GNURADIO_CORE_LA) -libgnuradio_cvsd_vocoder_la_LDFLAGS = \ - $(NO_UNDEFINED) +libgnuradio_cvsd_vocoder_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) if PYTHON ################################### diff --git a/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in b/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in index 43d5c6ba..a799fcd8 100644 --- a/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in +++ b/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: gnuradio-comedi Description: GNU Radio blocks implementing a GSM full rate vocoder Requires: gnuradio-core -Version: @VERSION@ -Libs: -L${libdir} -lgnuradio-gsm-fr-vocoder +Version: @LIBVER@ +Libs: -L${libdir} -lgnuradio-gsm-fr-vocoder-$@LIBVER@ Cflags: -I${includedir} diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am index 3b0270c2..97d6fc30 100644 --- a/gr-gsm-fr-vocoder/src/lib/Makefile.am +++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am @@ -40,8 +40,7 @@ libgnuradio_gsm_fr_vocoder_la_LIBADD = \ $(GNURADIO_CORE_LA) \ gsm/libgsm.la -libgnuradio_gsm_fr_vocoder_la_LDFLAGS = \ - $(NO_UNDEFINED) +libgnuradio_gsm_fr_vocoder_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) if PYTHON # SWIG interface and library diff --git a/gr-msdd6000/gnuradio-msdd6000.pc.in b/gr-msdd6000/gnuradio-msdd6000.pc.in index 8c320b56..56542071 100644 --- a/gr-msdd6000/gnuradio-msdd6000.pc.in +++ b/gr-msdd6000/gnuradio-msdd6000.pc.in @@ -4,8 +4,8 @@ libdir=@libdir@ includedir=@includedir@ Name: gnuradio-comedi -Description: GNU Radio blocks for the comedi library +Description: GNU Radio blocks for the Softronics MSDD 6000 Requires: gnuradio-core -Version: @VERSION@ -Libs: -L${libdir} -lgnuradio-comedi +Version: @LIBVER@ +Libs: -L${libdir} -lgnuradio-msdd6000 Cflags: -I${includedir} diff --git a/gr-msdd6000/src/Makefile.am b/gr-msdd6000/src/Makefile.am index 7744395f..f6dbd2fb 100644 --- a/gr-msdd6000/src/Makefile.am +++ b/gr-msdd6000/src/Makefile.am @@ -35,6 +35,9 @@ grinclude_HEADERS = \ lib_LTLIBRARIES = libgnuradio-msdd6000.la \ libgnuradio-msdd6000_rs.la +libgnuradio_msdd6000_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) +libgnuradio_msdd6000_rs_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) + libgnuradio_msdd6000_la_SOURCES = \ msdd_source_simple.cc \ msdd6000.cc @@ -47,14 +50,9 @@ libgnuradio_msdd6000_rs_la_SOURCES = \ libgnuradio_msdd6000_la_LIBADD = \ $(GNURADIO_CORE_LA) -libgnuradio_msdd6000_la_LDFLAGS = \ - $(NO_UNDEFINED) - libgnuradio_msdd6000_rs_la_LIBADD = \ $(GNURADIO_CORE_LA) -libgnuradio_msdd6000_rs_la_LDFLAGS = \ - $(NO_UNDEFINED) if PYTHON ################################# diff --git a/gr-noaa/lib/Makefile.am b/gr-noaa/lib/Makefile.am index f01bbfab..fdc1476c 100644 --- a/gr-noaa/lib/Makefile.am +++ b/gr-noaa/lib/Makefile.am @@ -39,7 +39,7 @@ noinst_HEADERS = \ libgnuradio_noaa_la_LIBADD = \ $(GNURADIO_CORE_LA) -libgnuradio_noaa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 +libgnuradio_noaa_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) grinclude_HEADERS = \ noaa_hrpt_decoder.h \ diff --git a/gr-pager/gnuradio-pager.pc.in b/gr-pager/gnuradio-pager.pc.in index 35516b6e..6fda2d2f 100644 --- a/gr-pager/gnuradio-pager.pc.in +++ b/gr-pager/gnuradio-pager.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: gnuradio-comedi Description: GNU Radio blocks implementing a FLEX pager decoder Requires: gnuradio-core -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-pager Cflags: -I${includedir} diff --git a/gr-pager/lib/Makefile.am b/gr-pager/lib/Makefile.am index 1d8a43b3..29c82ebe 100644 --- a/gr-pager/lib/Makefile.am +++ b/gr-pager/lib/Makefile.am @@ -49,5 +49,4 @@ libgnuradio_pager_la_SOURCES = \ libgnuradio_pager_la_LIBADD = \ $(GNURADIO_CORE_LA) -libgnuradio_pager_la_LDFLAGS = \ - $(NO_UNDEFINED) +libgnuradio_pager_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am index 814bee13..26b97d1d 100644 --- a/gr-qtgui/src/lib/Makefile.am +++ b/gr-qtgui/src/lib/Makefile.am @@ -82,7 +82,7 @@ grinclude_HEADERS = \ $(QT_UIC_EXEC) $< -o $@ # magic flags -libgnuradio_qtgui_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 +libgnuradio_qtgui_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) libgnuradio_qtgui_la_LIBADD = \ $(GNURADIO_CORE_LA) \ diff --git a/gr-trellis/gnuradio-trellis.pc.in b/gr-trellis/gnuradio-trellis.pc.in index 8c320b56..618667c4 100644 --- a/gr-trellis/gnuradio-trellis.pc.in +++ b/gr-trellis/gnuradio-trellis.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: gnuradio-comedi -Description: GNU Radio blocks for the comedi library +Name: gnuradio-trellis +Description: GNU Radio blocks for trellis coded modulation Requires: gnuradio-core -Version: @VERSION@ -Libs: -L${libdir} -lgnuradio-comedi +Version: @LIBVER@ +Libs: -L${libdir} -lgnuradio-trellis Cflags: -I${includedir} diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am index 58115de2..3e180355 100644 --- a/gr-trellis/src/lib/Makefile.am +++ b/gr-trellis/src/lib/Makefile.am @@ -82,10 +82,7 @@ libgnuradio_trellis_la_SOURCES = \ libgnuradio_trellis_la_LIBADD = \ $(GNURADIO_CORE_LA) -libgnuradio_trellis_la_LDFLAGS = \ - $(NO_UNDEFINED) - - +libgnuradio_trellis_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) if PYTHON diff --git a/gr-usrp/gnuradio-usrp.pc.in b/gr-usrp/gnuradio-usrp.pc.in index 6c1d75d4..b1f33f41 100644 --- a/gr-usrp/gnuradio-usrp.pc.in +++ b/gr-usrp/gnuradio-usrp.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@/gnuradio Name: gnuradio-usrp Description: GNU Software Radio support for Universal Software Radio Peripheral Requires: gnuradio-core usrp -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-usrp Cflags: -I${includedir} diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am index 3d1cc175..572a2248 100644 --- a/gr-usrp/src/Makefile.am +++ b/gr-usrp/src/Makefile.am @@ -56,7 +56,7 @@ libgnuradio_usrp_la_LIBADD = \ $(GNURADIO_CORE_LA) \ $(USRP_LA) -libgnuradio_usrp_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 +libgnuradio_usrp_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) grinclude_HEADERS = \ usrp_base.h \ diff --git a/gr-usrp2/gnuradio-usrp2.pc.in b/gr-usrp2/gnuradio-usrp2.pc.in index 403e5f1c..2222badd 100644 --- a/gr-usrp2/gnuradio-usrp2.pc.in +++ b/gr-usrp2/gnuradio-usrp2.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@/gnuradio Name: gnuradio-usrp2 Description: GNU Software Radio support for Universal Software Radio Peripheral 2 Requires: gnuradio-core usrp2 -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-usrp2 Cflags: -I${includedir} diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am index 8425c497..03b6d0dd 100644 --- a/gr-usrp2/src/Makefile.am +++ b/gr-usrp2/src/Makefile.am @@ -50,6 +50,8 @@ AM_CPPFLAGS = \ lib_LTLIBRARIES = libgnuradio-usrp2.la +libgnuradio_usrp2_la_LDFLAGS = $(LTVERSIONFLAGS) + libgnuradio_usrp2_la_SOURCES = \ rx_16sc_handler.cc \ rx_32fc_handler.cc \ diff --git a/gr-video-sdl/gnuradio-video-sdl.pc.in b/gr-video-sdl/gnuradio-video-sdl.pc.in index 9a8fe7d5..8586a288 100644 --- a/gr-video-sdl/gnuradio-video-sdl.pc.in +++ b/gr-video-sdl/gnuradio-video-sdl.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: gnuradio-comedi Description: GNU Radio blocks for the SDL library Requires: gnuradio-core sdl -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-video-sdl Cflags: -I${includedir} diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am index e623eb2a..45cedfb2 100644 --- a/gr-video-sdl/src/Makefile.am +++ b/gr-video-sdl/src/Makefile.am @@ -43,8 +43,7 @@ libgnuradio_video_sdl_la_LIBADD = \ $(SDL_LIBS) \ $(GNURADIO_CORE_LA) -libgnuradio_video_sdl_la_LDFLAGS = \ - $(NO_UNDEFINED) +libgnuradio_video_sdl_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) if PYTHON ################################# diff --git a/gr-wxgui/gr-wxgui.pc.in b/gr-wxgui/gr-wxgui.pc.in index a3e352f0..f7138978 100644 --- a/gr-wxgui/gr-wxgui.pc.in +++ b/gr-wxgui/gr-wxgui.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: gr-wxgui Description: A simple wx gui for GNU Radio applications Requires: gnuradio-core -Version: @VERSION@ +Version: @LIBVER@ Libs: Cflags: diff --git a/gruel/gruel.pc.in b/gruel/gruel.pc.in index 6377f5bb..504c4d94 100644 --- a/gruel/gruel.pc.in +++ b/gruel/gruel.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: gruel Description: The GNU Radio Utility Etcetera Library Requires: -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lgruel Cflags: -I${includedir} diff --git a/gruel/src/lib/Makefile.am b/gruel/src/lib/Makefile.am index 6bde9ee2..1bcd26e9 100644 --- a/gruel/src/lib/Makefile.am +++ b/gruel/src/lib/Makefile.am @@ -34,7 +34,7 @@ noinst_PROGRAMS = test_gruel lib_LTLIBRARIES = libgruel.la # magic flags -libgruel_la_LDFLAGS = $(NO_UNDEFINED) $(BOOST_LDFLAGS) -version-info 0:0:0 +libgruel_la_LDFLAGS = $(NO_UNDEFINED) $(BOOST_LDFLAGS) $(LTVERSIONFLAGS) # ---------------------------------------------------------------- diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am index f01ff8a0..23889fc8 100644 --- a/usrp/host/lib/Makefile.am +++ b/usrp/host/lib/Makefile.am @@ -24,7 +24,7 @@ common_INCLUDES = $(USRP_INCLUDES) $(USB_INCLUDES) lib_LTLIBRARIES = libusrp.la -libusrp_la_common_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(BOOST_LDFLAGS) +libusrp_la_common_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) $(BOOST_LDFLAGS) libusrp_la_common_LIBADD = \ $(USB_LIBS) \ diff --git a/usrp/usrp.pc.in b/usrp/usrp.pc.in index d4794aa6..3c30de62 100644 --- a/usrp/usrp.pc.in +++ b/usrp/usrp.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: usrp Description: USRP Client Side C++ interface Requires: @LIBUSB_PKG_CONFIG_NAME@ -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lusrp Cflags: -I${includedir} diff --git a/usrp2/host/lib/Makefile.am b/usrp2/host/lib/Makefile.am index cda051bb..209cb709 100644 --- a/usrp2/host/lib/Makefile.am +++ b/usrp2/host/lib/Makefile.am @@ -30,6 +30,8 @@ usrp2_socket_opener_SOURCES = usrp2_socket_opener.cc lib_LTLIBRARIES = \ libusrp2.la +libusrp2_la_LDFLAGS = $(LTVERSIONFLAGS) + libusrp2_la_SOURCES = \ control.cc \ copiers.cc \ diff --git a/usrp2/host/usrp2.pc.in b/usrp2/host/usrp2.pc.in index e0c2b198..0c862a87 100644 --- a/usrp2/host/usrp2.pc.in +++ b/usrp2/host/usrp2.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: usrp2 Description: Universal Software Radio Peripheral 2 Requires: gruel -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lusrp2 Cflags: -I${includedir} @DEFINES@ -- 2.30.2