[Build-common-hackers] Bug#573350: cdbs: autotools-vars.mk shouldn't include makefile.mk

[Emilio Pozuelo Monfort]

Package: cdbs
Version: 0.4.68
Severity: normal

Hi,

I'm writing a python-autotools.mk class. I've included autotools-vars.mk
from it to get all the variables I need to use, but autotools-vars.mk
includes makefile.mk and that breaks my class.

I think autotools-vars.mk should only include makefile-vars.mk, and the
stuff that really needs makefile.mk (e.g. autotools.mk or autotools-files.mk)
should include it directly.

Here's a patch that does that. It builds fine (i.e. it passes the test suite)
and lets me include autotools-vars.mk.

Cheers,
Emilio

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-trunk-686 (SMP w/2 CPU cores)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages cdbs depends on:
ii  debhelper                     7.4.15     helper programs for debian/rules

Versions of packages cdbs recommends:
ii  autotools-dev                 20090611.1 Update infrastructure for config.{

Versions of packages cdbs suggests:
ii  devscripts                    2.10.61    scripts to make the life of a Debi
ii  doc-base                      0.9.5      utilities to manage online documen

-- debconf-show failed
-------------- next part --------------
>From a43edfa50adcae313996bdaa31159bae1fc650fc Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu at debian.org>
Date: Wed, 10 Mar 2010 18:44:07 +0100
Subject: [PATCH] Don't include makefile.mk from autotools-vars.mk.

---
 1/class/autotools-files.mk.in |    1 +
 1/class/autotools-vars.mk.in  |    3 ++-
 debian/changelog              |    6 ++++++
 3 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/1/class/autotools-files.mk.in b/1/class/autotools-files.mk.in
index 615c712..f638010 100644
--- a/1/class/autotools-files.mk.in
+++ b/1/class/autotools-files.mk.in
@@ -20,6 +20,7 @@
 ifndef _cdbs_class_autotools_files
 _cdbs_class_autotools_files = 1
 
+include $(_cdbs_class_path)/makefile.mk$(_cdbs_makefile_suffix)
 include $(_cdbs_class_path)/autotools-vars.mk$(_cdbs_makefile_suffix)
 
 # Compatibility blurb, will be eventualy removed
diff --git a/1/class/autotools-vars.mk.in b/1/class/autotools-vars.mk.in
index f1d5762..f6b3a2b 100644
--- a/1/class/autotools-vars.mk.in
+++ b/1/class/autotools-vars.mk.in
@@ -21,7 +21,8 @@
 ifndef _cdbs_class_autotools_vars
 _cdbs_class_autotools_vars = 1
 
-include $(_cdbs_class_path)/makefile.mk$(_cdbs_makefile_suffix)
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+include $(_cdbs_class_path)/makefile-vars.mk$(_cdbs_makefile_suffix)
 
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(cdbs_make_curdestdir)
 DEB_MAKE_CLEAN_TARGET = distclean
diff --git a/debian/changelog b/debian/changelog
index b1c532c..1652088 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cdbs (0.4.72) UNRELEASED; urgency=low
+
+  * Don't include makefile.mk from autotools-vars.mk.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 10 Mar 2010 18:43:17 +0100
+
 cdbs (0.4.71) unstable; urgency=low
 
   * Merge build-info.mk rule with utils.mk, and gracefully handle
-- 
1.7.0