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 /usrp2/host | |
| 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 'usrp2/host')
| -rw-r--r-- | usrp2/host/lib/Makefile.am | 2 | ||||
| -rw-r--r-- | usrp2/host/usrp2.pc.in | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/usrp2/host/lib/Makefile.am b/usrp2/host/lib/Makefile.am index cda051bb0..209cb7095 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 e0c2b1986..0c862a877 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@ |