X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debian%2FDebhelper%2FBuildsystem%2Fmakefile.pm;h=d4b68e4c1e2de7f943c6008021e249fc46b1ef66;hb=2bee1e2cffe4a855152cdaf9e8268b2f080e4e29;hp=36081ecc3f2015334c72ae81aeb34f3dfaa076b2;hpb=20411481c9b97c9a7d1927eb61004e4360d77259;p=debhelper.git

diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/Debian/Debhelper/Buildsystem/makefile.pm
index 36081ec..d4b68e4 100644
--- a/Debian/Debhelper/Buildsystem/makefile.pm
+++ b/Debian/Debhelper/Buildsystem/makefile.pm
@@ -1,4 +1,4 @@
-# A buildsystem plugin for handling simple Makefile based projects.
+# A debhelper build system class for handling simple Makefile based projects.
 #
 # Copyright: © 2008 Joey Hess
 #            © 2008-2009 Modestas Vainius
@@ -7,43 +7,47 @@
 package Debian::Debhelper::Buildsystem::makefile;
 
 use strict;
-use Debian::Debhelper::Dh_Lib;
-use base 'Debian::Debhelper::Dh_Buildsystem_Basic';
+use Debian::Debhelper::Dh_Lib qw(escape_shell clean_jobserver_makeflags);
+use base 'Debian::Debhelper::Buildsystem';
 
-sub get_makecmd_C {
-	my $self=shift;
-	if ($self->get_builddir()) {
-		return $self->{makecmd} . " -C " . $self->get_builddir();
-	}
-	return $self->{makecmd};
-}
-
-# XXX JEH I *like* this. Yay for factoring out ugly ugly stuff!
-# XXX MDX TODO: this could use dh debian/rules parser.
-# XXX JEH That one checks for explicit only targets, while we want
-#         implicit targets here too. I think the current code is ok;
-#         it's a bonus that it checks if the target it empty.
-#         Hmm, one problem is that if a target exists but will run no
-#         commands since it's already built, the approach below will return
-#         nothing and assume it doesn't exist.
 sub exists_make_target {
-	my ($self, $target) = @_;
-	my $makecmd=$self->get_makecmd_C();
+	my ($this, $target) = @_;
 
 	# Use make -n to check to see if the target would do
 	# anything. There's no good way to test if a target exists.
-	my $ret=`$makecmd -s -n $target 2>/dev/null`;
-	chomp $ret;
-	return length($ret);
+	my @opts=("-s", "-n", "--no-print-directory");
+	my $buildpath = $this->get_buildpath();
+	unshift @opts, "-C", $buildpath if $buildpath ne ".";
+	open(SAVEDERR, ">&STDERR");
+	open(STDERR, ">/dev/null");
+	open(MAKE, "-|", $this->{makecmd}, @opts, $target);
+	my $output=<MAKE>;
+	chomp $output;
+	close MAKE;
+	open(STDERR, ">&SAVEDERR");
+	return defined $output && length $output;
+}
+
+sub do_make {
+	my $this=shift;
+
+	# Avoid possible warnings about unavailable jobserver,
+	# and force make to start a new jobserver.
+	clean_jobserver_makeflags();
+
+	# Note that this will override any -j settings in MAKEFLAGS.
+	unshift @_, "-j" . ($this->get_parallel() > 0 ? $this->get_parallel() : "");
+
+	$this->doit_in_builddir($this->{makecmd}, @_);
 }
 
 sub make_first_existing_target {
-	my $self=shift;
+	my $this=shift;
 	my $targets=shift;
 
 	foreach my $target (@$targets) {
-		if ($self->exists_make_target($target)) {
-			$self->doit_in_builddir($self->{makecmd}, $target, @_);
+		if ($this->exists_make_target($target)) {
+			$this->do_make($target, @_);
 			return $target;
 		}
 	}
@@ -51,52 +55,48 @@ sub make_first_existing_target {
 }
 
 sub DESCRIPTION {
-	"support for building Makefile based packages (make && make install)"
+	"simple Makefile"
 }
 
 sub new {
-	my $cls=shift;
-	my $self=$cls->SUPER::new(@_);
-	$self->{makecmd} = (exists $ENV{MAKE}) ? $ENV{MAKE} : "make";
-	return $self;
+	my $class=shift;
+	my $this=$class->SUPER::new(@_);
+	$this->{makecmd} = (exists $ENV{MAKE}) ? $ENV{MAKE} : "make";
+	return $this;
 }
 
-sub is_auto_buildable {
-	my $self=shift;
-	my ($action) = @_;
-
-	# Handles build, test, install, clean; configure - next class
-	if (grep /^\Q$action\E$/, qw{build test install clean}) {
-		# This is always called in the source directory, but generally
-		# Makefiles are created (or live) in the the build directory.
-		return -e $self->get_buildpath("Makefile") ||
-		       -e $self->get_buildpath("makefile") ||
-		       -e $self->get_buildpath("GNUmakefile");
-	}
-	return 0;
+sub check_auto_buildable {
+	my $this=shift;
+	my ($step) = @_;
+
+	# This is always called in the source directory, but generally
+	# Makefiles are created (or live) in the the build directory.
+	return (-e $this->get_buildpath("Makefile") ||
+	        -e $this->get_buildpath("makefile") ||
+	        -e $this->get_buildpath("GNUmakefile")) ? 1 : 0;
 }
 
 sub build {
-	my $self=shift;
-	$self->doit_in_builddir($self->{makecmd}, @_);
+	my $this=shift;
+	$this->do_make(@_);
 }
 
 sub test {
-	my $self=shift;
-	$self->make_first_existing_target(['test', 'check'], @_);
+	my $this=shift;
+	$this->make_first_existing_target(['test', 'check'], @_);
 }
 
 sub install {
-	my $self=shift;
+	my $this=shift;
 	my $destdir=shift;
-	$self->make_first_existing_target(['install'], "DESTDIR=$destdir", @_);
+	$this->make_first_existing_target(['install'], "DESTDIR=$destdir", @_);
 }
 
 sub clean {
-	my $self=shift;
-	if (!$self->clean_builddir()) {
-		$self->make_first_existing_target(['distclean', 'realclean', 'clean'], @_);
+	my $this=shift;
+	if (!$this->rmdir_builddir()) {
+		$this->make_first_existing_target(['distclean', 'realclean', 'clean'], @_);
 	}
 }
 
-1;
+1