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 /usrp | |
| 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 'usrp')
| -rw-r--r-- | usrp/host/lib/Makefile.am | 2 | ||||
| -rw-r--r-- | usrp/usrp.pc.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am index f01ff8a0a..23889fc85 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 d4794aa6f..3c30de622 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} |