[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=50abec1

The following commit has been merged in the master branch:
commit 50abec1639873f143352d0b9d569602c95308193
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Jun 26 14:42:19 2005 +0000

    Replaced 'order-only prerequisites' with a simpler solution to remove dependency on the latest GNU make
---
 src/Makefile | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 2ccc3e4..577e093 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -131,7 +131,8 @@ MCBIN = $(MCMAIN:.cpp=)
 MCEXE = $(MCMAIN:.cpp=$(EXEEXT))
 
 # Dependency files post-process commands 
-POSTDEPEND = if test -e $*.d ; then cp $*.d $(DEPDIR)/$*.d; \
+POSTDEPEND = if test ! -d $(DEPDIR); then mkdir $(DEPDIR); fi; \
+	     if test -e $*.d; then cp $*.d $(DEPDIR)/$*.d; \
 	     sed -e 's/^\#.*//' -e 's/^[^:]*: *//' -e 's/ *\$$//' \
                  -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $(DEPDIR)/$*.d; \
              $(RM) $*.d; fi
@@ -143,17 +144,17 @@ LINK.cc = $(CXX) $(CXXFLAGS) $(LDLIBS) $(LDFLAGS) -rpath $(libdir)
 
 # ******************************************************************************
 # Rules
-$(OBJ): %.o: %.cpp | $(DEPDIR)
+$(OBJ): %.o: %.cpp
 	@$(LIBTOOL) --mode=compile $(COMPILE.cc) -o $@ $<
 	@$(MAKEDEPEND)
 	@$(POSTDEPEND)
 
-$(sort $(BINOBJ) $(EXIV2OBJ) $(MCOBJ) path-test.o): %.o: %.cpp | $(DEPDIR)
+$(sort $(BINOBJ) $(EXIV2OBJ) $(MCOBJ) path-test.o): %.o: %.cpp
 	$(COMPILE.cc) -o $@ $<
 	@$(MAKEDEPEND)
 	@$(POSTDEPEND)
 
-%.o: %.c | $(DEPDIR)
+%.o: %.c
 	$(COMPILE.c) -o $@ $<
 	@$(MAKEDEPEND)
 	@$(POSTDEPEND)
@@ -177,9 +178,6 @@ actions.cpp basicio.cpp exif.cpp exiv2.cpp futils.cpp image.cpp jpgimage.cpp uti
 exv_conf.h: $(top_srcdir)/config/config.h
 	sed 's/#define \([A-Z]\)/#define EXV_
/; s/#undef \([A-Z]\)/#undef EXV_
/' < $< > $@
 
-$(DEPDIR):
-	mkdir $(DEPDIR)
-
 $(LIBTOOL): $(LIBTOOL_DEPS)
 	$(SHELL) $(top_srcdir)/config.status --recheck
 

-- 
exiv2 packaging