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

The following commit has been merged in the master branch:
commit 73651871d0fb40fbd0bb8c03a99fab6b7a6ac57d
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Oct 2 02:58:08 2007 +0000

    Attempt to make --disable-xmp work.
---
 Makefile                          | 20 ++++++++++++++++----
 Makefile.in => config/Makefile.in | 12 ++++++++----
 config/{Makefile => config.make}  |  0
 config/configure.ac               |  1 +
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index eda2f54..520b20b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,22 @@
 # History:   15-Jan-04, ahu: created
 #
 # Description:
-#  Simple makefile that mainly forwards to makefiles in subdirectories.
+#  Simple top-level makefile that mainly forwards to makefiles in 
+#  subdirectories.
 #
 # Restrictions:
 #  Requires GNU make.
 #
 
+########################################################################
+# This is a generated file. Do NOT change any settings here.
+# Run ./configure with the appropriate options to regenerate this file
+# and possibly others.
+########################################################################
+
+SHELL = /bin/sh
+ENABLE_XMP = 1
+
 .PHONY: all doc config xmpsdk                        \
         mostlyclean clean distclean maintainer-clean \
         install uninstall
@@ -28,16 +38,18 @@ doc: config/config.mk
 	cd doc && $(MAKE) $(MAKECMDGOALS)
 
 config:
-	cd config && $(MAKE) $(MAKECMDGOALS)
+	cd config && $(MAKE) -f config.make $(MAKECMDGOALS)
 
 xmpsdk: config/config.mk
-	cd xmpsdk/src && $(MAKE) $(MAKECMDGOALS)
+	if test "x$(ENABLE_XMP)" = "x1" ; then \
+	    cd xmpsdk/src && $(MAKE) $(MAKECMDGOALS); \
+	fi;
 
 mostlyclean clean: config/config.mk
 	cd src && $(MAKE) $(MAKECMDGOALS)
 	cd doc && $(MAKE) $(MAKECMDGOALS)
 	cd xmpsdk/src && $(MAKE) $(MAKECMDGOALS)
-	cd config && $(MAKE) $(MAKECMDGOALS)
+	cd config && $(MAKE) -f config.make $(MAKECMDGOALS)
 	cd po && $(MAKE) $(MAKECMDGOALS)
 
 # `make distclean' also removes files created by configuring 
diff --git a/Makefile.in b/config/Makefile.in
similarity index 82%
rename from Makefile.in
rename to config/Makefile.in
index af7b0e6..e74703d 100644
--- a/Makefile.in
+++ b/config/Makefile.in
@@ -6,16 +6,20 @@
 # History:   15-Jan-04, ahu: created
 #
 # Description:
-#  Simple makefile that mainly forwards to makefiles in subdirectories.
+#  Simple top-level makefile that mainly forwards to makefiles in 
+#  subdirectories.
 #
 # Restrictions:
 #  Requires GNU make.
 #
 
-SHELL = /bin/sh
+########################################################################
 # This is a generated file. Do NOT change any settings here.
 # Run ./configure with the appropriate options to regenerate this file
 # and possibly others.
+########################################################################
+
+SHELL = /bin/sh
 ENABLE_XMP = @ENABLE_XMP@
 
 .PHONY: all doc config xmpsdk                        \
@@ -34,7 +38,7 @@ doc: config/config.mk
 	cd doc && $(MAKE) $(MAKECMDGOALS)
 
 config:
-	cd config && $(MAKE) $(MAKECMDGOALS)
+	cd config && $(MAKE) -f config.make $(MAKECMDGOALS)
 
 xmpsdk: config/config.mk
 	if test "x$(ENABLE_XMP)" = "x1" ; then \
@@ -45,7 +49,7 @@ mostlyclean clean: config/config.mk
 	cd src && $(MAKE) $(MAKECMDGOALS)
 	cd doc && $(MAKE) $(MAKECMDGOALS)
 	cd xmpsdk/src && $(MAKE) $(MAKECMDGOALS)
-	cd config && $(MAKE) $(MAKECMDGOALS)
+	cd config && $(MAKE) -f config.make $(MAKECMDGOALS)
 	cd po && $(MAKE) $(MAKECMDGOALS)
 
 # `make distclean' also removes files created by configuring 
diff --git a/config/Makefile b/config/config.make
similarity index 100%
rename from config/Makefile
rename to config/config.make
diff --git a/config/configure.ac b/config/configure.ac
index 48446d8..2f4e940 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -187,6 +187,7 @@ LDFLAGS=${_ldflags}
 # ---------------------------------------------------------------------------
 # Create output files.
 # ---------------------------------------------------------------------------
+AC_CONFIG_FILES([./Makefile:./config/Makefile.in])
 AC_CONFIG_FILES([./config/config.mk])
 AC_CONFIG_FILES([./config/exiv2.pc])
 AC_CONFIG_FILES([./po/Makefile.in])

-- 
exiv2 packaging