X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=9f3a2855c0ebad7f0745ca05211f63fbe3c3746b;hb=45b4c4236b66597b2f9fc86ea61c4a828d985e09;hp=f87bd5a821b2e295b80654fd4d5f1a9dabd9ceec;hpb=53b93bb4485192528ba1b84285e3e1301d11fc27;p=gitmo%2FClass-MOP.git

diff --git a/Makefile.PL b/Makefile.PL
index f87bd5a..9f3a285 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -10,14 +10,14 @@ perl_version '5.008001';
 all_from 'lib/Class/MOP.pm';
 license 'perl';
 
-
-my $ccflags = -d '.svn' || -d '.git' || $ENV{MAINTAINER_MODE} ? '-Wall' : '';
+my $ccflags = ' -I.';
+$ccflags .= ' -Wall' if -d '.svn' || -d '.git' || $ENV{MAINTAINER_MODE};
 
 requires 'Carp';
 requires 'Devel::GlobalDestruction';
-requires 'MRO::Compat' => '0.05';
-requires 'Scalar::Util'     => '1.18';
-requires 'Sub::Name' => '0.04';
+requires 'MRO::Compat'  => '0.05';
+requires 'Scalar::Util' => '1.18';
+requires 'Sub::Name'    => '0.04';
 requires 'Task::Weaken';
 
 test_requires 'File::Spec';
@@ -26,6 +26,35 @@ test_requires 'Test::Exception' => '0.21';
 
 makemaker_args( CCFLAGS => $ccflags );
 
+{
+    my (@clean, @OBJECT, %XS);
+
+    for my $xs (<xs/*.xs>) {
+        (my $c = $xs) =~ s/\.xs$/.c/i;
+        (my $o = $xs) =~ s/\.xs$/\$(OBJ_EXT)/i;
+
+        $XS{$xs} = $c;
+        push @OBJECT, $o;
+        push @clean, $o;
+    }
+
+    for my $c (<*.c>) {
+        (my $o = $c) =~ s/\.c$/\$(OBJ_EXT)/i;
+        push @OBJECT, $o;
+        push @clean, $o;
+    }
+
+    makemaker_args(
+        clean  => { FILES => join(q{ }, @clean) },
+        OBJECT => join (q{ }, @OBJECT),
+        XS     => \%XS,
+    );
+}
+
+postamble(<<'EOM');
+$(OBJECT) : mop.h
+EOM
+
 WriteAll();
 
 # Use the cpan-smolder-stable script in the Moose svn root to figure
@@ -63,8 +92,27 @@ EOF
     return unless $found;
 
     # More or less copied from Module::Build
-    return if  $ENV{PERL_MM_USE_DEFAULT};
-    return unless -t STDIN && (-t STDOUT || !(-f STDOUT || -c STDOUT));
+    return if $ENV{PERL_MM_USE_DEFAULT};
+    return unless -t STDIN && ( -t STDOUT || !( -f STDOUT || -c STDOUT ) );
 
     sleep 4;
 }
+
+package MY;
+
+use Config;
+
+sub const_cccmd {
+    my $ret = shift->SUPER::const_cccmd(@_);
+    return q{} unless $ret;
+
+    if ($Config{cc} =~ /^cl\b/i) {
+        warn 'you are using MSVC... my condolences.';
+        $ret .= ' /Fo$@';
+    }
+    else {
+        $ret .= ' -o $@';
+    }
+
+    return $ret;
+}