diff options
| author | lloyd <[email protected]> | 2008-11-07 16:09:12 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2008-11-07 16:09:12 +0000 |
| commit | 39362b98af2bb84e7a436b9c1ff59a7bf023157f (patch) | |
| tree | ecd6e974442a744a28db57b74957c0948a09ec37 | |
| parent | c88a5198b39847f975e0562267f3c010a37fc904 (diff) | |
In Makefiles and pkg-config / botan-config, use -lbotan-@{var:version}
so we link against the specific intended version of the library, for instance
-lbotan-1.7.20 rather than simply -lbotan
This again seems especially an improvement where you want more than one
version installed (1.6 vs 1.7, for instance).
| -rw-r--r-- | src/build-data/botan-config.in | 2 | ||||
| -rw-r--r-- | src/build-data/botan.pc.in | 2 | ||||
| -rw-r--r-- | src/build-data/makefile/unix.in | 2 | ||||
| -rw-r--r-- | src/build-data/makefile/unix_shr.in | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/build-data/botan-config.in b/src/build-data/botan-config.in index bb20ee15e..dfbfd129e 100644 --- a/src/build-data/botan-config.in +++ b/src/build-data/botan-config.in @@ -57,7 +57,7 @@ while test $# -gt 0; do echo -n "-L$prefix/$libdir " fi - echo @{var:link_to} -lbotan + echo @{var:link_to} -lbotan-@{var:version} ;; *) usage diff --git a/src/build-data/botan.pc.in b/src/build-data/botan.pc.in index a061652c2..e7b678e4b 100644 --- a/src/build-data/botan.pc.in +++ b/src/build-data/botan.pc.in @@ -7,5 +7,5 @@ Name: Botan Description: Multi-platform C++ crypto library Version: @{var:version} -Libs: -L${libdir} -lbotan @{var:link_to} +Libs: -L${libdir} -lbotan-@{var:version} @{var:link_to} Cflags: -I${includedir} diff --git a/src/build-data/makefile/unix.in b/src/build-data/makefile/unix.in index 6df85e377..c95312f35 100644 --- a/src/build-data/makefile/unix.in +++ b/src/build-data/makefile/unix.in @@ -81,7 +81,7 @@ all: $(LIBRARIES) # Link Commands # ################################################## $(CHECK): $(LIBRARIES) $(CHECKOBJS) - $(CXX) $(CHECKOBJS) -L. -lbotan $(LINK_TO) -o $(CHECK) + $(CXX) $(CHECKOBJS) -L. libbotan.a $(LINK_TO) -o $(CHECK) $(STATIC_LIB): $(LIBOBJS) $(RM) $(STATIC_LIB) diff --git a/src/build-data/makefile/unix_shr.in b/src/build-data/makefile/unix_shr.in index b4076db49..14c525446 100644 --- a/src/build-data/makefile/unix_shr.in +++ b/src/build-data/makefile/unix_shr.in @@ -88,7 +88,7 @@ all: $(LIBRARIES) # Link Commands # ################################################## $(CHECK): $(LIBRARIES) $(CHECKOBJS) - $(CXX) $(CHECKOBJS) -L. -lbotan $(LINK_TO) -o $(CHECK) + $(CXX) $(CHECKOBJS) -L. -lbotan-@{var:version} $(LINK_TO) -o $(CHECK) $(STATIC_LIB): $(LIBOBJS) $(RM) $(STATIC_LIB) |