[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=3aff00f

The following commit has been merged in the master branch:
commit 3aff00f983d8e0c523f5ef4c6214ee98ca166c9b
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Sep 21 17:55:55 2013 +0000

    Tweaks to src/Makefile (while trying to figure out how to make libtool *not* relink the exiv2 binary every time I run make. It still does..)
---
 src/Makefile | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index cbbd957..b6e594a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -171,7 +171,6 @@ EXIV2EXE = $(EXIV2MAIN:.cpp=$(EXEEXT))
 
 ifdef DEP_TRACKING
 DEP = $(CCSRC:%.cpp=$(DEPDIR)/%.d) $(CSRC:%.c=$(DEPDIR)/%.d) \
-      $(BINSRC:%.cpp=$(DEPDIR)/%.d) \
       $(EXIV2MAIN:%.cpp=$(DEPDIR)/%.d) $(EXIV2SRC:%.cpp=$(DEPDIR)/%.d) \
       $(EXIVCSRC:%.c=$(DEPDIR)/%.d)
 
@@ -230,11 +229,8 @@ lib: $(OBJ)
 	$(LIBTOOL) --mode=link $(LINK.cc) -o $(LIBRARY) $(LOBJ) -rpath $(libdir) -version-info $(EXIV2_LTVERSION) $(LIBS)
 	@touch lib
 
-$(BINARY): %: %.o lib
-	@$(LIBTOOL) --mode=link $(LINK.cc) -o $@ $(LIBRARY) $@.o -rpath $(libdir)
-
 $(EXIV2BIN): lib $(EXIV2OBJ) $(EXIV2COBJ)
-	mkdir -pv ../bin 2>&1 > /dev/null
+	-mkdir ../bin >/dev/null 2>&1
 	@$(LIBTOOL) --mode=link $(LINK.cc) -o ../bin/$@ $(LIBRARY) $(EXIV2OBJ) $(EXIV2COBJ) -rpath $(libdir)
 
 install-header:
@@ -298,7 +294,7 @@ mostlyclean:
 
 clean: mostlyclean
 	@$(LIBTOOL) --mode=clean $(RM) $(LIBRARY)
-	@$(LIBTOOL) --mode=clean $(RM) $(EXECUTABLE) $(EXIV2EXE)
+	@$(LIBTOOL) --mode=clean $(RM) ../bin/$(EXIV2EXE)
 
 # Run `make distclean' from the top source directory to also remove
 # files created by configuring the program.

-- 
exiv2 packaging