[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=97959c9

The following commit has been merged in the master branch:
commit 97959c9ae322129c4edbe1b0a9e106b9774747fc
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Feb 10 02:37:25 2004 +0000

    Added support for grown-up applications, consisting of more than one file
---
 src/Makefile | 49 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 9731118..8aed633 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,29 +1,28 @@
 # ***************************************************** -*- Makefile -*-
 #
 # Copyright (C) 2004 Andreas Huggel <ahuggel at gmx.net>
-# 
+#
 # This Makefile is part of the Exiv2 distribution.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
 # 02111-1307, USA.
-# 
-# Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
 #
-# RCS information
-#  $Name:  $
-#  $Revision: 1.8 $
+# File:      Makefile
+# Version:   $Name:  $ $Revision: 1.9 $
+# Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
+# History:   10-Dec-03, ahu: created
 #
 # Description:
 #  Do NOT change this file! All system specific settings and configs
@@ -34,9 +33,6 @@
 #  from config.mk. The idea is that configuring and porting the 
 #  software to a new platform should only require changes in config.mk.
 #
-#  Adding new source files or applications: Just add an entry with the
-#  name of the new file in the section 'Source files' below.
-#
 # Restrictions:
 #  Requires GNU make.
 #
@@ -57,8 +53,14 @@ CCHDR = rcsid.hpp
 # Add library C++ source files to this list
 CCSRC = exif.cpp tags.cpp utils.cpp
 
-# Add source files of applications to this list
-BINSRC = exiftest.cpp exifprint.cpp example1.cpp taglist.cpp
+# Add source files of simple applications to this list
+BINSRC = example1.cpp taglist.cpp exifprint.cpp exiftest.cpp
+
+# State the main source file of the Exiv2 application here
+EXIV2MAIN = exiv2.cpp
+
+# Add additional source files of the real application to this list
+EXIV2SRC = actions.cpp
 
 # **********************************************************************
 # Library
@@ -92,11 +94,15 @@ SRC = $(CCSRC)
 HDR = $(CCHDR)
 OBJ = $(CCOBJ)
 SOBJ = $(CCSOBJ)
-DEP = $(CCSRC:%.cpp=.%.d) $(BINSRC:%.cpp=.%.d)
+DEP = $(CCSRC:%.cpp=.%.d) $(BINSRC:%.cpp=.%.d) \
+      $(EXIV2MAIN:%.cpp=.%.d) $(EXIV2SRC:%.cpp=.%.d)
 
 BINOBJ = $(BINSRC:.cpp=.o)
 BINARY = $(BINSRC:.cpp=)
 
+EXIV2OBJ = $(EXIV2MAIN:.cpp=.o) $(EXIV2SRC:.cpp=.o)
+EXIV2BIN = $(EXIV2MAIN:.cpp=)
+
 ARCHIVE = lib$(LIBNAME)$(ARCHIVE_SUFFIX)
 SHAREDLIB = lib$(LIBNAME)$(SHAREDLIB_SUFFIX)
 
@@ -157,6 +163,9 @@ endif
 $(BINARY): %: %.o
 	$(CXX) $(CXXFLAGS) $< $(LDLIBS) $(LDFLAGS_BIN) -o $@
 
+$(EXIV2BIN): %: %.o
+	$(CXX) $(CXXFLAGS) $(EXIV2OBJ) $(LDLIBS) $(LDFLAGS_BIN) -o $@
+
 # **********************************************************************
 # Targets
 .PHONY: all archive sharedlib bin check doc                            \
@@ -190,11 +199,13 @@ ifdef STATIC_LIBS
 $(BINARY): $(ARCHIVE)
 endif
 
-bin: lib $(BINARY)
+$(EXIV2BIN): $(EXIV2OBJ)
+
+bin: lib $(BINARY) $(EXIV2BIN)
 
 install install-bin: $(INSTALL)
 	mkinstalldirs $(bindir) 
-	@list='$(BINARY)'; for p in $$list; do \
+	@list='$(BINARY) $(EXIV2BIN)'; for p in $$list; do \
 	    if test -f $$p; then \
 	        echo "$(INSTALL_PROGRAM) $$p $(bindir)/$$p"; \
 	        $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
@@ -221,7 +232,7 @@ install-sharedlib: sharedlib
 install-lib: $(INSTALL_LIB) install-header
 
 uninstall:
-	@list='$(BINARY)'; for p in $$list; do \
+	@list='$(BINARY) $(EXIV2BIN)'; for p in $$list; do \
 	    echo "rm -f $(bindir)/$$p"; \
 	    rm -f $(bindir)/$$p; \
 	done
@@ -246,7 +257,7 @@ check:
 mostlyclean:
 	$(RM) core
 	$(RM) $(CCSRC:.cpp=.ii)
-	$(RM) $(OBJ) $(SOBJ) $(BINOBJ)
+	$(RM) $(OBJ) $(SOBJ) $(BINOBJ) $(EXIV2OBJ)
 	@if test -n "$(CXX_REPOSITORY)"; then \
 	    echo "rm -rf $(CXX_REPOSITORY)"; \
 	    rm -rf $(CXX_REPOSITORY); \
@@ -254,7 +265,7 @@ mostlyclean:
 
 clean: mostlyclean
 	$(RM) $(ARCHIVE) $(SHAREDLIB)
-	$(RM) $(BINARY)
+	$(RM) $(BINARY) $(EXIV2BIN)
 
 # Run `make distclean' from the top source directory to also remove
 # files created by configuring the program.

-- 
exiv2 packaging