[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=26d65a3

The following commit has been merged in the master branch:
commit 26d65a34b1d6aebf8737bbef3f6bea83b527d311
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Jun 15 07:27:50 2006 +0000

    More build environment cleanup
---
 config/exiv2-config.in | 2 +-
 config/exiv2.pc.in     | 2 +-
 src/Makefile           | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/exiv2-config.in b/config/exiv2-config.in
index aca4831..4c593c9 100644
--- a/config/exiv2-config.in
+++ b/config/exiv2-config.in
@@ -79,7 +79,7 @@ while test $# -gt 0; do
         ;;
 
     --libs)
-       	echo -L$libdir -lexiv2
+       	echo -L$libdir -lexiv2 @LIBS@
        	;;
 
     *)
diff --git a/config/exiv2.pc.in b/config/exiv2.pc.in
index 16c388d..1e52d46 100644
--- a/config/exiv2.pc.in
+++ b/config/exiv2.pc.in
@@ -7,5 +7,5 @@ Name: exiv2
 Description: Exif and IPTC metadata library and tools
 Version: @PACKAGE_VERSION@
 URL: http://www.exiv2.org
-Libs: -L${libdir} -lexiv2
+Libs: -L${libdir} -lexiv2 @LIBS@
 Cflags: -I${includedir}
diff --git a/src/Makefile b/src/Makefile
index 757a53b..bb545c7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -136,7 +136,6 @@ LIBRARY = libexiv2.la
 # Defines, Includes and Libraries
 CXXDEFS = $(DEFS)
 CXXINCS = $(INCS)
-LDLIBS  = $(LIBS) $(LIBRARY)
 
 # ******************************************************************************
 # ==============================================================================
@@ -195,7 +194,8 @@ endif
 # Compilation shortcuts
 COMPILE.cc = $(CXX) $(CXXFLAGS) $(CXXDEFS) $(CXXINCS) -c
 COMPILE.c = $(CC) $(CFLAGS) $(DEFS) $(INCS) -c
-LINK.cc = $(CXX) $(CXXFLAGS) $(LDLIBS) $(LDFLAGS) -rpath $(libdir)
+# LINK.cc does not need $(LIBS), libtool's dark magic takes care of that
+LINK.cc = $(CXX) $(CXXFLAGS) $(LIBRARY) $(LDFLAGS) -rpath $(libdir)
 
 # ******************************************************************************
 # Rules
@@ -246,7 +246,7 @@ $(LIBTOOL): $(LIBTOOL_DEPS)
 bin: lib $(BINARY) $(EXIV2BIN) $(MCBIN) path-test
 
 lib: $(OBJ)
-	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) $(LOBJ) -o $(LIBRARY) -rpath $(libdir) -release $(EXIV2_VERSION)
+	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) $(LOBJ) -o $(LIBRARY) -rpath $(libdir) -release $(EXIV2_VERSION) $(LIBS)
 	@touch lib
 
 path-test: path-test.o utils.o

-- 
exiv2 packaging