[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=d45a652

The following commit has been merged in the master branch:
commit d45a652f6eaeabb5a297dea438cde220d45330f6
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Nov 9 16:37:46 2004 +0000

    More Makefile tweaking
---
 Makefile     |  3 +--
 src/Makefile | 15 +++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index feb1ab1..08c9d8c 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@
 #  Requires GNU make.
 #
 
-.PHONY: all clean distclean doc
+.PHONY: all doc clean distclean maintainer-clean
 
 all:
 	cd src && $(MAKE) $(MAKECMDGOALS)
@@ -44,4 +44,3 @@ maintainer-clean: distclean
 # Catch-all
 %:
 	cd src && $(MAKE) $(MAKECMDGOALS)
-	
\ No newline at end of file
diff --git a/src/Makefile b/src/Makefile
index e5293dd..fb491fa 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -145,7 +145,6 @@ ifdef SHARED_LIBS
     UNINSTALL := uninstall-sharedlib
     INSTALL_LIB := $(INSTALL_LIB) install-sharedlib
     UNINSTALL_LIB := $(UNINSTALL_LIB) uninstall-sharedlib
-
 endif
 
 # ******************************************************************************
@@ -191,18 +190,12 @@ endif
 $(BINARY): %: %.o
 	$(CXX) $(CXXFLAGS) $< $(LDLIBS) $(LDFLAGS_BIN) -o $@
 
-$(EXIV2BIN): %: %.o
-	$(CXX) $(CXXFLAGS) $(EXIV2OBJ) $(LDLIBS) $(LDFLAGS_BIN) -o $@
-
-$(MCBIN): %: %.o
-	$(CXX) $(CXXFLAGS) $(MCOBJ) $(LDLIBS) $(LDFLAGS_BIN) -o $@
-
 mn.cpp: ./mn.sh
 	./mn.sh
 
 # ******************************************************************************
 # Targets
-.PHONY: all archive sharedlib bin check ctags doc                      \
+.PHONY: all bin check ctags doc                  \
         clean mostlyclean distclean maintainer-clean                   \
         install install-archive install-header                         \
         install-sharedlib install-lib                                  \
@@ -220,13 +213,16 @@ $(ARCHIVE): $(ARCHIVE)($(OBJ))
 	$(RANLIB) $@
 
 archive: $(ARCHIVE)
+	touch archive
 
 $(SHAREDLIB): $(SOBJ)
 	$(CXX) $^ $(LDFLAGS_SHARED) -o $@
 
 sharedlib: $(SHAREDLIB)
+	@touch sharedlib
 
 lib: $(LIBRARY)
+	@touch lib
 
 # Re-link executables whenever the static library changes
 ifdef STATIC_LIBS
@@ -234,8 +230,10 @@ $(BINARY): $(ARCHIVE) mn.o
 endif
 
 $(EXIV2BIN): lib $(EXIV2OBJ)
+	$(CXX) $(CXXFLAGS) $(EXIV2OBJ) $(LDLIBS) $(LDFLAGS_BIN) -o $@
 
 $(MCBIN): lib $(MCOBJ)
+	$(CXX) $(CXXFLAGS) $(MCOBJ) $(LDLIBS) $(LDFLAGS_BIN) -o $@
 
 bin: lib $(BINARY) $(EXIV2BIN) $(MCBIN)
 
@@ -298,6 +296,7 @@ check:
 mostlyclean:
 	$(RM) core
 	$(RM) $(CCSRC:.cpp=.ii)
+	$(RM) lib archive sharedlib
 	$(RM) $(OBJ) $(SOBJ) $(BINOBJ) $(EXIV2OBJ) $(MCOBJ)
 	$(RM) mn.o
 	@if test -n "$(CXX_REPOSITORY)"; then \

-- 
exiv2 packaging