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

The following commit has been merged in the master branch:
commit da121463ca7869de3b27e92585188d3361a29081
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat May 8 09:27:26 2004 +0000

    Minor changes
---
 Makefile  |  8 ++++----
 config.mk | 45 +++++++++++++++++++++++++++++----------------
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index a2733d1..28520fc 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 #
 # RCS information
 #  $Name:  $
-#  $Revision: 1.1 $
+#  $Revision: 1.2 $
 #
 # Description:
 #  This makefile just forwards to src/Makefile.
@@ -15,12 +15,12 @@
 
 .PHONY: all maintainer-clean doc
 
-all maintainer-clean:
+all %:
 	cd src && $(MAKE) $(MAKECMDGOALS)
-	cd doc && $(MAKE) $(MAKECMDGOALS)
 
 doc:
 	cd doc && $(MAKE) $(MAKECMDGOALS)
 
-%:
+maintainer-clean:
 	cd src && $(MAKE) $(MAKECMDGOALS)
+	cd doc && $(MAKE) $(MAKECMDGOALS)
diff --git a/config.mk b/config.mk
index 7d57377..6ac13dd 100644
--- a/config.mk
+++ b/config.mk
@@ -1,32 +1,45 @@
 # ***************************************************** -*- Makefile -*-
 #
-# Copyright (c) 2003, 2004 Andreas Huggel
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.ibm.com/developerworks/oss/CPLv1.0.htm
+# Copyright (C) 2004 Andreas Huggel <ahuggel at gmx.net>
 #
-# Author(s): Andreas Huggel (ahu)
+# This Makefile is part of the Exiv2 distribution.
 #
-# RCS information
-#  $Name:  $
-#  $Revision: 1.1 $
+# 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.
 #
-# Description: System configuration file for GNU/Linux:
-#  gcc 3.x on Debian GNU/Linux running Linux kernel 2.2.x or higher
+# 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.
+#
+# File:      config.mk
+# Version:   $Name:  $ $Revision: 1.2 $
+# Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
+# History:   10-Dec-03, ahu: created
+#
+# Description: 
+#  System configuration file for GNU/Linux: gcc 3.x on Debian GNU/Linux
+#  running Linux kernel 2.2.x or higher
 #
 
 # **********************************************************************
 # Define which libraries (shared and/or static) to build
-SHARED_LIBS = 
-STATIC_LIBS = 1
+SHARED_LIBS = 1
+STATIC_LIBS = 
 
 # **********************************************************************
 # C++ Compiler and precompiler
 CXX = g++
 
-# Common compiler flags (warnings, symbols, optimization, etc)
-CXXFLAGS := -Wall -g
+# Common compiler flags (warnings, symbols [-ggdb], optimization [-O2], etc)
+CXXFLAGS := -Wall -Woverloaded-virtual -Wsign-promo -O2
 # Compiler flags to compile static objects
 CXXFLAGS_STATIC := $(CXXFLAGS)
 # Compiler flags for shared objects
@@ -47,7 +60,7 @@ CXXLANGCXX = -x c++
 # Linker flags
 LDFLAGS = 
 # Linker flags to link applications
-LDFLAGS_APP = $(LDFLAGS)
+LDFLAGS_BIN = $(LDFLAGS)
 # Linker flags used to link shared libraries
 LDFLAGS_SHARED = $(LDFLAGS) -shared -fPIC
 

-- 
exiv2 packaging