jpl tweak

p4raw-id: //depot/perl@4160

diff --git a/MANIFEST b/MANIFEST
index 99f3cc8..d2ca7e3 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -490,11 +490,19 @@ installperl               Perl script to do "make install" dirty work
 intrpvar.h             Variables held in each interpreter instance
 iperlsys.h             Perl's interface to the system
 jpl/JNI/Changes                Java Native Interface changes
+jpl/JNI/Closer.java    Java Native Interface example
 jpl/JNI/JNI.pm         Java Native Interface module
-jpl/JNI/JNI.xs         Java Native Interface external subroutines
+jpl/JNI/JNI.pm         Java Native Interface module
+jpl/JNI/JNIConfig      Java Native Interface config
+jpl/JNI/JNIConfig.Win32        Java Native Interface config
+jpl/JNI/JNIConfig.kaffe        Java Native Interface config
+jpl/JNI/JNIConfig.noembed      Java Native Interface config
+jpl/JNI/JNIConfig.standard     Java Native Interface config
 jpl/JNI/Makefile.PL    Java Native Interface makefile generator
 jpl/JNI/test.pl                Java Native Interface tests
 jpl/JNI/typemap                Java/Perl interface typemap
+jpl/JNI/typemap.gcc    Java/Perl interface typemap
+jpl/JNI/typemap.win32  Java/Perl interface typemap
 jpl/JPL/AutoLoader.pm  Java/Perl compiler module
 jpl/JPL/Class.pm       Java/Perl compiler module
 jpl/JPL/Compile.pm     Java/Perl compiler module
@@ -508,6 +516,7 @@ jpl/PerlInterpreter/PerlInterpreter.c               Perl interpreter abstraction
 jpl/PerlInterpreter/PerlInterpreter.h          Perl interpreter abstraction
 jpl/PerlInterpreter/PerlInterpreter.java       Perl interpreter abstraction
 jpl/README                                     JPL instructions
+jpl/SETVARS.PL                                 JPL setup
 jpl/Sample/Makefile.PL                         JPL sample makefile generator
 jpl/Sample/Sample.jpl                          JPL sample
 jpl/Test/Makefile.PL                           JPL tests makefile generator

diff --git a/jpl/JNI/Makefile.PL b/jpl/JNI/Makefile.PL
index 021970d..1a54b9d 100644 (file)
--- a/jpl/JNI/Makefile.PL
+++ b/jpl/JNI/Makefile.PL
@@ -47,9 +47,7 @@ foreach (@JAVALIBS) {
         $INC =~ s#/#\\#g;
         $INC =~ s#\\$##;
         $CCFLAGS .= "-DWIN32 -Z7 -D_DEBUG";
-        $MYEXTLIB = "$libjava " .
-                "$Config{installarchlib}\\CORE\\perlcore.lib " .
-                "$Config{installarchlib}\\CORE\\perlcapi.lib";
+        $MYEXTLIB = $libjava;
     } elsif (/libkaffevm.so$/) {
         $CCFLAGS .= "-DKAFFE";
     }
@@ -98,6 +96,7 @@ my %Makefile = (
     LINKTYPE => 'dynamic',
     INC        => $INC,
     CCFLAGS => "$Config{ccflags} $CCFLAGS", 
+    ($Config{archname} =~ /mswin32.*-object/i ? ('CAPI' => 'TRUE') : ()),
 );
 
 $Makefile{LIBS} = ["$LIBPATH $LIBS"];