projects
/
debian
/
gnuradio
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
745670b
)
Make C++ shared libraries versioned
author
Johnathan Corgan
<jcorgan@corganenterprises.com>
Sat, 29 May 2010 03:02:38 +0000
(20:02 -0700)
committer
Johnathan Corgan
<jcorgan@corganenterprises.com>
Sat, 29 May 2010 03:02:38 +0000
(20:02 -0700)
42 files changed:
Makefile.common
patch
|
blob
|
history
gnuradio-core/gnuradio-core.pc.in
patch
|
blob
|
history
gnuradio-core/src/lib/Makefile.am
patch
|
blob
|
history
gr-atsc/gnuradio-atsc.pc.in
patch
|
blob
|
history
gr-atsc/src/lib/Makefile.am
patch
|
blob
|
history
gr-audio-alsa/gnuradio-audio-alsa.pc.in
patch
|
blob
|
history
gr-audio-alsa/src/Makefile.am
patch
|
blob
|
history
gr-audio-jack/gnuradio-audio-jack.pc.in
patch
|
blob
|
history
gr-audio-jack/src/Makefile.am
patch
|
blob
|
history
gr-audio-oss/gnuradio-audio-oss.pc.in
patch
|
blob
|
history
gr-audio-oss/src/Makefile.am
patch
|
blob
|
history
gr-audio-osx/src/Makefile.am
patch
|
blob
|
history
gr-audio-portaudio/gnuradio-audio-portaudio.pc.in
patch
|
blob
|
history
gr-audio-portaudio/src/Makefile.am
patch
|
blob
|
history
gr-audio-windows/src/Makefile.am
patch
|
blob
|
history
gr-comedi/gnuradio-comedi.pc.in
patch
|
blob
|
history
gr-comedi/src/Makefile.am
patch
|
blob
|
history
gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in
patch
|
blob
|
history
gr-cvsd-vocoder/src/lib/Makefile.am
patch
|
blob
|
history
gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in
patch
|
blob
|
history
gr-gsm-fr-vocoder/src/lib/Makefile.am
patch
|
blob
|
history
gr-msdd6000/gnuradio-msdd6000.pc.in
patch
|
blob
|
history
gr-msdd6000/src/Makefile.am
patch
|
blob
|
history
gr-noaa/lib/Makefile.am
patch
|
blob
|
history
gr-pager/gnuradio-pager.pc.in
patch
|
blob
|
history
gr-pager/lib/Makefile.am
patch
|
blob
|
history
gr-qtgui/src/lib/Makefile.am
patch
|
blob
|
history
gr-trellis/gnuradio-trellis.pc.in
patch
|
blob
|
history
gr-trellis/src/lib/Makefile.am
patch
|
blob
|
history
gr-usrp/gnuradio-usrp.pc.in
patch
|
blob
|
history
gr-usrp/src/Makefile.am
patch
|
blob
|
history
gr-usrp2/gnuradio-usrp2.pc.in
patch
|
blob
|
history
gr-usrp2/src/Makefile.am
patch
|
blob
|
history
gr-video-sdl/gnuradio-video-sdl.pc.in
patch
|
blob
|
history
gr-video-sdl/src/Makefile.am
patch
|
blob
|
history
gr-wxgui/gr-wxgui.pc.in
patch
|
blob
|
history
gruel/gruel.pc.in
patch
|
blob
|
history
gruel/src/lib/Makefile.am
patch
|
blob
|
history
usrp/host/lib/Makefile.am
patch
|
blob
|
history
usrp/usrp.pc.in
patch
|
blob
|
history
usrp2/host/lib/Makefile.am
patch
|
blob
|
history
usrp2/host/usrp2.pc.in
patch
|
blob
|
history
diff --git
a/Makefile.common
b/Makefile.common
index aafe85fe791d3bc5909544ece85e76598cda11b8..fb83b9470d3640ed5793c2a5c378708d6448f6ba 100644
(file)
--- a/
Makefile.common
+++ b/
Makefile.common
@@
-23,6
+23,9
@@
AM_CFLAGS = @autoconf_default_CFLAGS@ @lf_CFLAGS@
AM_CXXFLAGS = @autoconf_default_CXXFLAGS@ @lf_CXXFLAGS@
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
# includes
grincludedir = $(includedir)/gnuradio
diff --git
a/gnuradio-core/gnuradio-core.pc.in
b/gnuradio-core/gnuradio-core.pc.in
index 9ff835041174bf0a19b1bf700639b99689eaabad..5d743a4e9096929040c4d1f5943d7375616afa7c 100644
(file)
--- 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
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}
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 477ba67259a036c022f870838c8a1afc42f2f998..86e3aa1f6c5b08b14931b9551f851232e494e66f 100644
(file)
--- 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
#
#
# 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
# 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_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 \
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
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 4c5ae06823fbee8a2c11959af534cf05aece3f55..4413bfc82de3a559ad004dbc6edc18b284ce862d 100644
(file)
--- 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
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}
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 8aeb80c0a5be7f4b19ee9dbb5bf4a8a22155eae0..bf9c6626adaaeb06b7d5103bc00f1aa6e19b43b7 100644
(file)
--- 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_LIBADD = \
$(GNURADIO_CORE_LA)
-libgnuradio_atsc_la_LDFLAGS = \
- $(NO_UNDEFINED)
+libgnuradio_atsc_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
noinst_LTLIBRARIES = libgnuradio-atsc-qa.la
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 797bfc024442147381c95828d8bbcdb668564cb3..d5147e6af03a028a238fac00270fd68094728e70 100644
(file)
--- 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
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}
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 ee7498af48b8a52ef16eb9797e7b63898cea9266..ed92cc197dece844e39c5c9a76f73dc46d51cbef 100644
(file)
--- 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)
$(GNURADIO_CORE_LA) \
$(ALSA_LIBS)
-libgnuradio_audio_alsa_la_LDFLAGS = \
- $(NO_UNDEFINED)
+libgnuradio_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
if PYTHON
###################################
if PYTHON
###################################
diff --git
a/gr-audio-jack/gnuradio-audio-jack.pc.in
b/gr-audio-jack/gnuradio-audio-jack.pc.in
index eaceaea2f6017fb57eafe45969ce8dd74c82ac76..8fb4a2e0db5bde8fca0a5982f3df1f7800ab5f89 100644
(file)
--- 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
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}
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 b766ec201294a483badd665539833fb6dad1a1fe..8e0dfe1e386dd9b0597dfa8fee824e4abd4f29ce 100644
(file)
--- 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)
$(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
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 f598ba304ac88b82c1c3818e218bfc05f9d82235..4a215bdabfaf1a4c866fdcbed4ef0321ae942ffd 100644
(file)
--- 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
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}
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 6142806395cd9978a2fc9f9afc678f18311e0221..628c9fd9304c52096902d397eff3b697386f7883 100644
(file)
--- 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)
$(GNURADIO_CORE_LA) \
$(OSS_LIBS)
-libgnuradio_audio_oss_la_LDFLAGS = \
- $(NO_UNDEFINED)
+libgnuradio_audio_oss_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
if PYTHON
###################################
if PYTHON
###################################
diff --git
a/gr-audio-osx/src/Makefile.am
b/gr-audio-osx/src/Makefile.am
index 5bf28b8e7e365ae4fea89451243b482e0cbe2e86..ee9df776596607f6809cebafba4b5bfa6e97031f 100644
(file)
--- 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 \
-framework AudioUnit \
-framework CoreAudio \
-framework AudioToolbox \
- $(NO_UNDEFINED)
+ $(NO_UNDEFINED) \
+ $(LTVERSIONFLAGS)
if PYTHON
###################################
if PYTHON
###################################
diff --git
a/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in
b/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in
index 8f2c808698bdafdcf51546f3691f36ccd757f02e..0861959650bbe2f67dd5ad3def43da90bd042789 100644
(file)
--- 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
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}
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 1df6bbceaf546ddc1e72ae04f39d75ffb419a61f..4fa098dcc48f189d24ec6e415bdd0b355e7b8f47 100644
(file)
--- 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)
$(GNURADIO_CORE_LA) \
$(PORTAUDIO_LIBS)
-libgnuradio_audio_portaudio_la_LDFLAGS = \
- $(NO_UNDEFINED)
+libgnuradio_audio_portaudio_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
if PYTHON
if PYTHON
diff --git
a/gr-audio-windows/src/Makefile.am
b/gr-audio-windows/src/Makefile.am
index dc91e140ca00b8e190c31ace6b3d118727a377fd..d3e3f5a85b0f0ade0f29d8e53211b93433935ce5 100644
(file)
--- 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) \
libgnuradio_audio_windows_la_LDFLAGS = \
$(LIBGNURADIO_CORE_EXTRA_LDFLAGS) \
- $(NO_UNDEFINED)
+ $(NO_UNDEFINED) \
+ $(LTVERSIONFLAGS)
if PYTHON
###################################
if PYTHON
###################################
diff --git
a/gr-comedi/gnuradio-comedi.pc.in
b/gr-comedi/gnuradio-comedi.pc.in
index 8c320b563162f5f9777930be6db15d0209b8c716..205b40e37c6b6097bfbf210fdbbb08f9278e4ad9 100644
(file)
--- 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
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}
Libs: -L${libdir} -lgnuradio-comedi
Cflags: -I${includedir}
diff --git
a/gr-comedi/src/Makefile.am
b/gr-comedi/src/Makefile.am
index 462c50ad57221559770cb9fe37c7c00252458217..a55bd175b9d6daf85bf79efe8a9d0f113a386af8 100644
(file)
--- 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)
$(GNURADIO_CORE_LA) \
$(COMEDI_LIBS)
-libgnuradio_comedi_la_LDFLAGS = \
- $(NO_UNDEFINED)
+libgnuradio_comedi_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
if PYTHON
###################################
if PYTHON
###################################
diff --git
a/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in
b/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in
index 05623086428aa42039719627c072bb316d0e4517..f5f0c2e64b7dc5279ab6de4422e9a47acc11b17d 100644
(file)
--- 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
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}
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 500d0e858c30fba91291dd80298abf8c851fcd1a..c5957f4acc7cbabd21e7d8e0f33562de877d44f4 100644
(file)
--- 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_LIBADD = \
$(GNURADIO_CORE_LA)
-libgnuradio_cvsd_vocoder_la_LDFLAGS = \
- $(NO_UNDEFINED)
+libgnuradio_cvsd_vocoder_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
if PYTHON
###################################
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 43d5c6bad8877cdaa1e906d4cdd3c0d8739fd32d..a799fcd824a5016d9fd7015233e10c48c5b16410 100644
(file)
--- 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
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}
Cflags: -I${includedir}
diff --git
a/gr-gsm-fr-vocoder/src/lib/Makefile.am
b/gr-gsm-fr-vocoder/src/lib/Makefile.am
index 3b0270c2f9be5e4d5e05afaa7a24244109af56c0..97d6fc30690a36bef975020d85575fae2bc1974e 100644
(file)
--- 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
$(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
if PYTHON
# SWIG interface and library
diff --git
a/gr-msdd6000/gnuradio-msdd6000.pc.in
b/gr-msdd6000/gnuradio-msdd6000.pc.in
index 8c320b563162f5f9777930be6db15d0209b8c716..5654207189e202b207eb77d4bf6e95a88e799c54 100644
(file)
--- 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
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
Requires: gnuradio-core
-Version: @
VERSION
@
-Libs: -L${libdir} -lgnuradio-
comedi
+Version: @
LIBVER
@
+Libs: -L${libdir} -lgnuradio-
msdd6000
Cflags: -I${includedir}
Cflags: -I${includedir}
diff --git
a/gr-msdd6000/src/Makefile.am
b/gr-msdd6000/src/Makefile.am
index 7744395f34cac4dff90bc424bc48907b2a165e36..f6dbd2fb816822e46c57582530649793b1141e7c 100644
(file)
--- 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
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
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_LIBADD = \
$(GNURADIO_CORE_LA)
-libgnuradio_msdd6000_la_LDFLAGS = \
- $(NO_UNDEFINED)
-
libgnuradio_msdd6000_rs_la_LIBADD = \
$(GNURADIO_CORE_LA)
libgnuradio_msdd6000_rs_la_LIBADD = \
$(GNURADIO_CORE_LA)
-libgnuradio_msdd6000_rs_la_LDFLAGS = \
- $(NO_UNDEFINED)
if PYTHON
#################################
if PYTHON
#################################
diff --git
a/gr-noaa/lib/Makefile.am
b/gr-noaa/lib/Makefile.am
index f01bbfab89c46bf21e086ffe294994fce274ae72..fdc1476cd10cbc7a0839ef4edf9446d200e3b8a3 100644
(file)
--- 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_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 \
grinclude_HEADERS = \
noaa_hrpt_decoder.h \
diff --git
a/gr-pager/gnuradio-pager.pc.in
b/gr-pager/gnuradio-pager.pc.in
index 35516b6eda0d199aeaa0516465b11ea41316949c..6fda2d2f29f9cc9ed891bc395e515074190db649 100644
(file)
--- 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
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}
Libs: -L${libdir} -lgnuradio-pager
Cflags: -I${includedir}
diff --git
a/gr-pager/lib/Makefile.am
b/gr-pager/lib/Makefile.am
index 1d8a43b3c831fd4073469cd7ac309fe1da09ee04..29c82ebe8839c4986a8e6548ccf36871cf83ffe3 100644
(file)
--- 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_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 814bee1369ef033798263482e6eac1c3aff1e5e2..26b97d1d45f0f27426c6ed3bb74e6ec2ccff0a04 100644
(file)
--- 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
$(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) \
libgnuradio_qtgui_la_LIBADD = \
$(GNURADIO_CORE_LA) \
diff --git
a/gr-trellis/gnuradio-trellis.pc.in
b/gr-trellis/gnuradio-trellis.pc.in
index 8c320b563162f5f9777930be6db15d0209b8c716..618667c4211b255b369a2414ab90a335c5d958ef 100644
(file)
--- 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@
libdir=@libdir@
includedir=@includedir@
-Name: gnuradio-
comedi
-Description: GNU Radio blocks for t
he comedi library
+Name: gnuradio-
trellis
+Description: GNU Radio blocks for t
rellis coded modulation
Requires: gnuradio-core
Requires: gnuradio-core
-Version: @
VERSION
@
-Libs: -L${libdir} -lgnuradio-
comedi
+Version: @
LIBVER
@
+Libs: -L${libdir} -lgnuradio-
trellis
Cflags: -I${includedir}
Cflags: -I${includedir}
diff --git
a/gr-trellis/src/lib/Makefile.am
b/gr-trellis/src/lib/Makefile.am
index 58115de254c4db817684f0a943d57659bf3a5068..3e1803554b530edb1a806b7ff6daac3c0925d9f5 100644
(file)
--- 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_LIBADD = \
$(GNURADIO_CORE_LA)
-libgnuradio_trellis_la_LDFLAGS = \
- $(NO_UNDEFINED)
-
-
+libgnuradio_trellis_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
if PYTHON
if PYTHON
diff --git
a/gr-usrp/gnuradio-usrp.pc.in
b/gr-usrp/gnuradio-usrp.pc.in
index 6c1d75d439cbbd9c5176d8f82b3d860eddb80e6d..b1f33f41beee9c3eb78162d19a7ed8bc78ee409d 100644
(file)
--- 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
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}
Libs: -L${libdir} -lgnuradio-usrp
Cflags: -I${includedir}
diff --git
a/gr-usrp/src/Makefile.am
b/gr-usrp/src/Makefile.am
index 3d1cc17543682c5601eb92dbf0d74b6a1084d3ed..572a22485b89d7b8863bf215c8668f568c76b433 100644
(file)
--- 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)
$(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 \
grinclude_HEADERS = \
usrp_base.h \
diff --git
a/gr-usrp2/gnuradio-usrp2.pc.in
b/gr-usrp2/gnuradio-usrp2.pc.in
index 403e5f1c912eda8b8ed83782256a1a82660ef06a..2222badd7ddc1c2321c0fc24df83b4bb1fbdc0ad 100644
(file)
--- 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
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}
Libs: -L${libdir} -lgnuradio-usrp2
Cflags: -I${includedir}
diff --git
a/gr-usrp2/src/Makefile.am
b/gr-usrp2/src/Makefile.am
index 8425c497caff94b1c532282f2e0a23c12e6b2709..03b6d0dd9d15c0747c1ef32201efe66aca95031a 100644
(file)
--- a/
gr-usrp2/src/Makefile.am
+++ b/
gr-usrp2/src/Makefile.am
@@
-50,6
+50,8
@@
AM_CPPFLAGS = \
lib_LTLIBRARIES = libgnuradio-usrp2.la
lib_LTLIBRARIES = libgnuradio-usrp2.la
+libgnuradio_usrp2_la_LDFLAGS = $(LTVERSIONFLAGS)
+
libgnuradio_usrp2_la_SOURCES = \
rx_16sc_handler.cc \
rx_32fc_handler.cc \
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 9a8fe7d5e185ffc6019c8814d6820f38c1c4dbb3..8586a288421f72a93c153706a3950412cd7b75c3 100644
(file)
--- 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
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}
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 e623eb2a9df1a8d37c66d2d1b3d9e11b8cdaff66..45cedfb212a518936f5c4700397553ed935d13bf 100644
(file)
--- 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)
$(SDL_LIBS) \
$(GNURADIO_CORE_LA)
-libgnuradio_video_sdl_la_LDFLAGS = \
- $(NO_UNDEFINED)
+libgnuradio_video_sdl_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
if PYTHON
#################################
if PYTHON
#################################
diff --git
a/gr-wxgui/gr-wxgui.pc.in
b/gr-wxgui/gr-wxgui.pc.in
index a3e352f0f7f3bffe49c5bdf817fdea8581530b94..f7138978951e9aeca719a405b230afd730c48377 100644
(file)
--- 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
Name: gr-wxgui
Description: A simple wx gui for GNU Radio applications
Requires: gnuradio-core
-Version: @
VERSION
@
+Version: @
LIBVER
@
Libs:
Cflags:
Libs:
Cflags:
diff --git
a/gruel/gruel.pc.in
b/gruel/gruel.pc.in
index 6377f5bb3ae9ccb96a78e62004dd1c89a3b7ecaf..504c4d94983ca1323c49b4bd386168aee8dd236c 100644
(file)
--- 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:
Name: gruel
Description: The GNU Radio Utility Etcetera Library
Requires:
-Version: @
VERSION
@
+Version: @
LIBVER
@
Libs: -L${libdir} -lgruel
Cflags: -I${includedir}
Libs: -L${libdir} -lgruel
Cflags: -I${includedir}
diff --git
a/gruel/src/lib/Makefile.am
b/gruel/src/lib/Makefile.am
index 6bde9ee272addaed96b97c1e8570803ea0c51458..1bcd26e90717feed2d578c59dcddcb7519d77adc 100644
(file)
--- 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
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 f01ff8a0adbac064b16d5c0abaea6dd44390abb6..23889fc85a25822b313dcb62883c0f08a684c028 100644
(file)
--- 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
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) \
libusrp_la_common_LIBADD = \
$(USB_LIBS) \
diff --git
a/usrp/usrp.pc.in
b/usrp/usrp.pc.in
index d4794aa6fe722e5111d6075d25e039cea2b00b9f..3c30de62259aa72b59338fd8aad985667f92ad9e 100644
(file)
--- 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@
Name: usrp
Description: USRP Client Side C++ interface
Requires: @LIBUSB_PKG_CONFIG_NAME@
-Version: @
VERSION
@
+Version: @
LIBVER
@
Libs: -L${libdir} -lusrp
Cflags: -I${includedir}
Libs: -L${libdir} -lusrp
Cflags: -I${includedir}
diff --git
a/usrp2/host/lib/Makefile.am
b/usrp2/host/lib/Makefile.am
index cda051bb07327f0ed20aabda8598f115598374e1..209cb70953d88886b2aa1759c88cde1f443c8cbd 100644
(file)
--- 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
lib_LTLIBRARIES = \
libusrp2.la
+libusrp2_la_LDFLAGS = $(LTVERSIONFLAGS)
+
libusrp2_la_SOURCES = \
control.cc \
copiers.cc \
libusrp2_la_SOURCES = \
control.cc \
copiers.cc \
diff --git
a/usrp2/host/usrp2.pc.in
b/usrp2/host/usrp2.pc.in
index e0c2b1986df44c5567f3c801bd86462754c858a2..0c862a87741259121e9af60eb2ac2153ac3cf125 100644
(file)
--- 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
Name: usrp2
Description: Universal Software Radio Peripheral 2
Requires: gruel
-Version: @
VERSION
@
+Version: @
LIBVER
@
Libs: -L${libdir} -lusrp2
Cflags: -I${includedir} @DEFINES@
Libs: -L${libdir} -lusrp2
Cflags: -I${includedir} @DEFINES@