diff options
| author | Johnathan Corgan | 2010-05-30 23:08:32 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-05-30 23:08:32 -0700 |
| commit | edb46cf12cc2a7327b1d6d4dd9422b8f0f3529cc (patch) | |
| tree | 9d97002e30ffd135fbff1d0d89859c63d2733a67 /gr-atsc | |
| parent | 4fb81dbcbb1416a954740555882f496a9d086d14 (diff) | |
| parent | b98cabac11306fa25c29a2e0adc1c0c0a697e9a0 (diff) | |
| download | gnuradio-edb46cf12cc2a7327b1d6d4dd9422b8f0f3529cc.tar.gz gnuradio-edb46cf12cc2a7327b1d6d4dd9422b8f0f3529cc.tar.bz2 gnuradio-edb46cf12cc2a7327b1d6d4dd9422b8f0f3529cc.zip | |
Merge branch 'master' into next
* master:
howto: make versioned libraries
Make C++ shared libraries versioned
build: refactor GR_GIT and GR_VERSION
Update howto revision to 3.4git
Diffstat (limited to 'gr-atsc')
| -rw-r--r-- | gr-atsc/gnuradio-atsc.pc.in | 2 | ||||
| -rw-r--r-- | gr-atsc/src/lib/Makefile.am | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/gr-atsc/gnuradio-atsc.pc.in b/gr-atsc/gnuradio-atsc.pc.in index 4c5ae0682..4413bfc82 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 8aeb80c0a..bf9c6626a 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 |