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 /gruel | |
| 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 'gruel')
| -rw-r--r-- | gruel/gruel.pc.in | 2 | ||||
| -rw-r--r-- | gruel/src/lib/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gruel/gruel.pc.in b/gruel/gruel.pc.in index 6377f5bb3..504c4d949 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 6bde9ee27..1bcd26e90 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) # ---------------------------------------------------------------- |