use strict;
use ExtUtils::MakeMaker;
-my %tables = (EUC_JP => ['euc-jp.enc'],
- MACJAPAN => ['macJapan.enc'],
- CP932 => ['cp932.enc'],
+my %tables = (
+ euc_jp_t => ['euc-jp.ucm'],
+ sjis_t => ['shiftjis.ucm',
+ 'macJapan.ucm',
+ 'cp932.ucm'],
);
my $name = 'JP';
WriteMakefile(
- INC => "-I..",
+ INC => "-I../Encode",
NAME => 'Encode::'.$name,
VERSION_FROM => "$name.pm",
OBJECT => '$(O_FILES)',
$self->{'O_FILES'} = [sort keys %o];
my @files = ("$name.xs");
$self->{'C'} = ["$name.c"];
- $self->{'H'} = [$self->catfile($self->updir,'encode.h')];
+ $self->{'H'} = [$self->catfile($self->updir,'Encode', 'encode.h')];
my %xs;
foreach my $table (keys %tables) {
push (@{$self->{'C'}},"$table.c");
#include <perl.h>
#include <XSUB.h>
#define U8 U8
-#include "../encode.h"
+#include "encode.h"
END
foreach my $table (keys %tables) {
print XS qq[#include "${table}.h"\n];
}
MODULE = Encode::$name PACKAGE = Encode::$name
+PROTOTYPES: DISABLE
BOOT:
{
END
{
my $self = shift;
my $dir = $self->catdir($self->updir,'Encode');
- my $str = "# $name\$(OBJ_EXT) depends on .h and _def.h files not .c files - but all written by compile\n";
+ my $str = "# $name\$(OBJ_EXT) depends on .h and _def.h files not .c files - but all written by enc2xs\n";
$str .= "$name.c : $name.xs ";
foreach my $table (keys %tables)
{
$str .= "\n\n";
$str .= "$name\$(OBJ_EXT) : $name.c\n\n";
- my $compile = $self->catfile($self->updir,'compile');
+ my $enc2xs = $self->catfile($self->updir,'bin', 'enc2xs');
foreach my $table (keys %tables)
{
my $numlines = 1;
my $lengthsofar = length($str);
my $continuator = '';
- $str .= "$table.c : $compile Makefile.PL";
+ $str .= "$table.c : $enc2xs Makefile.PL";
foreach my $file (@{$tables{$table}})
{
$str .= $continuator.' '.$self->catfile($dir,$file);
$continuator = '';
}
}
- $str .= "\n\t\$(PERL) $compile -o \$\@ -f $table.fnm\n\n";
+ $str .= $^O eq 'VMS' # In VMS quote to preserve case
+ ? qq{\n\t\$(PERL) $enc2xs -"Q" -o \$\@ -f $table.fnm\n\n}
+ : qq{\n\t\$(PERL) $enc2xs -Q -o \$\@ -f $table.fnm\n\n};
open (FILELIST, ">$table.fnm")
|| die "Could not open $table.fnm: $!";
foreach my $file (@{$tables{$table}})