[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=96f6866

The following commit has been merged in the master branch:
commit 96f6866afd164879d251c0cee45ff58471dcd1ac
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Jul 10 04:41:46 2005 +0000

    Minor tweaks to the build environment: use values from the configure script rather than hardcoding them
---
 config/config.mk.in | 12 +++++-------
 config/configure.ac |  1 +
 src/Makefile        |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/config/config.mk.in b/config/config.mk.in
index 32f77e8..a911c9d 100644
--- a/config/config.mk.in
+++ b/config/config.mk.in
@@ -48,14 +48,13 @@ CXX = @CXX@
 GXX = @GXX@
 
 # Common compiler flags (warnings, symbols [-ggdb], optimization [-O2], etc)
+CXXFLAGS = @CXXFLAGS@
 ifeq ($(GXX),yes)
-	CXXFLAGS = -Wall -O2
-else
-	CXXFLAGS = @CXXFLAGS@
+	CXXFLAGS += -Wall
 endif
 
 # Command to run only the preprocessor
-CPP = $(CXX) -E -dD
+CXXCPP = @CXXCPP@
 
 # Preprocessor flags
 CPPFLAGS = @CPPFLAGS@
@@ -71,10 +70,9 @@ EXEEXT := @EXEEXT@
 CC = @CC@
 GCC = @GCC@
 
+CFLAGS = @CFLAGS@
 ifeq ($(GCC),yes)
-	CFLAGS := -Wall -O2
-else
-	CFLAGS := @CFLAGS@
+	CFLAGS += -Wall
 endif
 
 # **********************************************************************
diff --git a/config/configure.ac b/config/configure.ac
index ff082be..5e79ad0 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -9,6 +9,7 @@ AC_CONFIG_AUX_DIR([./config])
 
 # Checks for programs.
 AC_PROG_CXX
+AC_PROG_CXXCPP
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
diff --git a/src/Makefile b/src/Makefile
index 577e093..6f75213 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -161,7 +161,7 @@ $(sort $(BINOBJ) $(EXIV2OBJ) $(MCOBJ) path-test.o): %.o: %.cpp
 
 %.ii: %.cpp
 	set -e; \
-	$(CPP) $(CPPFLAGS) $(CXXDEFS) $(CXXINCS) $< | sed '/^[ 	]*$$/d' > $@
+	$(CXXCPP) $(CPPFLAGS) $(CXXDEFS) $(CXXINCS) $< | sed '/^[ 	]*$$/d' > $@
 
 # ******************************************************************************
 # Targets

-- 
exiv2 packaging