Simplify ext/SDBM_File layout and build

Tony: fix MANIFEST

28 files changed, 17 insertions, 114 deletions

diff --git a/ext/SDBM_File/.gitignore b/ext/SDBM_File/.gitignore
new file mode 100644
index 0000000000..acccbd016a
--- /dev/null
+++ b/ext/SDBM_File/.gitignore
@@ -0,0 +1,2 @@
+!*.c
+SDBM_File.c
diff --git a/ext/SDBM_File/sdbm/CHANGES b/ext/SDBM_File/CHANGES
index f7296d1b3a..f7296d1b3a 100644
--- a/ext/SDBM_File/sdbm/CHANGES
+++ b/ext/SDBM_File/CHANGES
diff --git a/ext/SDBM_File/sdbm/COMPARE b/ext/SDBM_File/COMPARE
index a595e831d2..a595e831d2 100644
--- a/ext/SDBM_File/sdbm/COMPARE
+++ b/ext/SDBM_File/COMPARE
diff --git a/ext/SDBM_File/Makefile.PL b/ext/SDBM_File/Makefile.PL
index 676708ca4e..02f28c4a07 100644
--- a/ext/SDBM_File/Makefile.PL
+++ b/ext/SDBM_File/Makefile.PL
@@ -1,66 +1,17 @@
+use strict; use warnings;
 use ExtUtils::MakeMaker;
-use Config;
 
-# The existence of the ./sdbm/Makefile.PL file causes MakeMaker
-# to automatically include Makefile code for the targets
-#	config, all, clean, realclean and sdbm/Makefile
-# which perform the corresponding actions in the subdirectory.
-
-# Work around: Darwin ppc64 bug ignores archive contents when building bundles
-
-$define = ($^O eq 'MSWin32') ? '-DMSDOS' : '';
-if ($^O eq 'MSWin32') { $myextlib = 'sdbm\\libsdbm$(LIB_EXT)'; }
-elsif ($^O eq 'darwin' && $Config{'ldflags'} =~/-arch ppc64/) {
-                        $myextlib = '-all_load sdbm/libsdbm$(LIB_EXT)'; }
-else                  { $myextlib = 'sdbm/libsdbm$(LIB_EXT)';  }
+my $define = '-DSDBM -DDUFF';
+# no -DMSDOS because MSDOS and WIN32 treated same in code
+$define .= ' -DWIN32 -DPERL_STATIC_SYMS' if $^O eq 'MSWin32';
 
 WriteMakefile(
-              NAME	=> 'SDBM_File',
-              MYEXTLIB => $myextlib,
-              XSPROTOARG => '-noprototypes', 		# XXX remove later?
-              VERSION_FROM => 'SDBM_File.pm',
-              DEFINE => $define,
-             );
-
-# We don't want the default subdir rule, as it creates a race condition with the
-# rule we add below.
-sub MY::subdir_x {
-    return '';
-}
-
-sub MY::postamble {
-  if ($^O =~ /MSWin32/ && !defined($ENV{SYSTEMROOT})) {
-	if ($Config{'make'} =~ /dmake/i) {
-	    # dmake-specific
-	    return <<'EOT';
-$(MYEXTLIB): sdbm/Makefile
-@[
-	cd sdbm
-	$(MAKE) all
-	cd ..
-]
-EOT
-	} elsif ($Config{'make'} =~ /nmake/i) {
-	    #
-	    return <<'EOT';
-$(MYEXTLIB): sdbm/Makefile
-	cd sdbm
-	$(MAKE) all
-	cd ..
-EOT
-	} 
-} elsif ($^O ne 'VMS') {
-    '
-$(MYEXTLIB): sdbm/Makefile
-	cd sdbm && $(MAKE) all
-';
-  }
-  else {
-    '   
-$(MYEXTLIB) : [.sdbm]descrip.mms
-	set def [.sdbm]
-    $(MMS) all
-    set def [-]
-';  
-  }
-}
+    NAME      => 'SDBM_File',
+    VERSION_FROM => 'SDBM_File.pm',
+    DEFINE    => $define,
+    INC       => '-I$(PERL_INC)', # force PERL_INC dir ahead of system -I's
+    OBJECT    => '$(O_FILES)',
+    clean     => {'FILES' => 'dbu dbd dba dbe x-dbu *.dir *.pag'},
+    H         => [qw(tune.h sdbm.h pair.h $(PERL_INC)/config.h)],
+    C         => [qw(SDBM_File.c sdbm.c pair.c hash.c)],
+);
diff --git a/ext/SDBM_File/sdbm/README b/ext/SDBM_File/README
index a5a23e00d3..a5a23e00d3 100644
--- a/ext/SDBM_File/sdbm/README
+++ b/ext/SDBM_File/README
diff --git a/ext/SDBM_File/sdbm/README.too b/ext/SDBM_File/README.too
index cc86fb4dd5..cc86fb4dd5 100644
--- a/ext/SDBM_File/sdbm/README.too
+++ b/ext/SDBM_File/README.too
diff --git a/ext/SDBM_File/SDBM_File.pm b/ext/SDBM_File/SDBM_File.pm
index f1f85f58ea..707a9f8bf2 100644
--- a/ext/SDBM_File/SDBM_File.pm
+++ b/ext/SDBM_File/SDBM_File.pm
@@ -7,7 +7,7 @@ require Tie::Hash;
 require XSLoader;
 
 our @ISA = qw(Tie::Hash);
-our $VERSION = "1.12";
+our $VERSION = "1.13";
 
 our @EXPORT_OK = qw(PAGFEXT DIRFEXT PAIRMAX);
 use Exporter "import";
diff --git a/ext/SDBM_File/SDBM_File.xs b/ext/SDBM_File/SDBM_File.xs
index bb994f71c5..434784a36d 100644
--- a/ext/SDBM_File/SDBM_File.xs
+++ b/ext/SDBM_File/SDBM_File.xs
@@ -2,7 +2,7 @@
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
-#include "sdbm/sdbm.h"
+#include "sdbm.h"
 
 #define fetch_key 0
 #define store_key 1
diff --git a/ext/SDBM_File/sdbm/biblio b/ext/SDBM_File/biblio
index f2880dc490..f2880dc490 100644
--- a/ext/SDBM_File/sdbm/biblio
+++ b/ext/SDBM_File/biblio
diff --git a/ext/SDBM_File/sdbm/dba.c b/ext/SDBM_File/dba.c
index b27c3e66a4..b27c3e66a4 100644
--- a/ext/SDBM_File/sdbm/dba.c
+++ b/ext/SDBM_File/dba.c
diff --git a/ext/SDBM_File/sdbm/dbd.c b/ext/SDBM_File/dbd.c
index df27d174a8..df27d174a8 100644
--- a/ext/SDBM_File/sdbm/dbd.c
+++ b/ext/SDBM_File/dbd.c
diff --git a/ext/SDBM_File/sdbm/dbe.1 b/ext/SDBM_File/dbe.1
index 3b32272684..3b32272684 100644
--- a/ext/SDBM_File/sdbm/dbe.1
+++ b/ext/SDBM_File/dbe.1
diff --git a/ext/SDBM_File/sdbm/dbe.c b/ext/SDBM_File/dbe.c
index 18ce54677e..18ce54677e 100644
--- a/ext/SDBM_File/sdbm/dbe.c
+++ b/ext/SDBM_File/dbe.c
diff --git a/ext/SDBM_File/sdbm/dbu.c b/ext/SDBM_File/dbu.c
index d861c0f1b1..d861c0f1b1 100644
--- a/ext/SDBM_File/sdbm/dbu.c
+++ b/ext/SDBM_File/dbu.c
diff --git a/ext/SDBM_File/sdbm/grind b/ext/SDBM_File/grind
index 23728b7d49..23728b7d49 100644
--- a/ext/SDBM_File/sdbm/grind
+++ b/ext/SDBM_File/grind
diff --git a/ext/SDBM_File/sdbm/hash.c b/ext/SDBM_File/hash.c
index f0115baa54..f0115baa54 100644
--- a/ext/SDBM_File/sdbm/hash.c
+++ b/ext/SDBM_File/hash.c
diff --git a/ext/SDBM_File/sdbm/linux.patches b/ext/SDBM_File/linux.patches
index cb7b1b7d8e..cb7b1b7d8e 100644
--- a/ext/SDBM_File/sdbm/linux.patches
+++ b/ext/SDBM_File/linux.patches
diff --git a/ext/SDBM_File/sdbm/makefile.sdbm b/ext/SDBM_File/makefile.sdbm
index c959c1fab5..c959c1fab5 100644
--- a/ext/SDBM_File/sdbm/makefile.sdbm
+++ b/ext/SDBM_File/makefile.sdbm
diff --git a/ext/SDBM_File/sdbm/pair.c b/ext/SDBM_File/pair.c
index 62045ec977..62045ec977 100644
--- a/ext/SDBM_File/sdbm/pair.c
+++ b/ext/SDBM_File/pair.c
diff --git a/ext/SDBM_File/sdbm/pair.h b/ext/SDBM_File/pair.h
index b6944edd07..b6944edd07 100644
--- a/ext/SDBM_File/sdbm/pair.h
+++ b/ext/SDBM_File/pair.h
diff --git a/ext/SDBM_File/sdbm/readme.ms b/ext/SDBM_File/readme.ms
index 5d2c526a7d..5d2c526a7d 100644
--- a/ext/SDBM_File/sdbm/readme.ms
+++ b/ext/SDBM_File/readme.ms
diff --git a/ext/SDBM_File/sdbm/sdbm.3 b/ext/SDBM_File/sdbm.3
index 25afcbe4fe..25afcbe4fe 100644
--- a/ext/SDBM_File/sdbm/sdbm.3
+++ b/ext/SDBM_File/sdbm.3
diff --git a/ext/SDBM_File/sdbm/sdbm.c b/ext/SDBM_File/sdbm.c
index 5241fea513..5241fea513 100644
--- a/ext/SDBM_File/sdbm/sdbm.c
+++ b/ext/SDBM_File/sdbm.c
diff --git a/ext/SDBM_File/sdbm/sdbm.h b/ext/SDBM_File/sdbm.h
index 2ada7a18ca..2ada7a18ca 100644
--- a/ext/SDBM_File/sdbm/sdbm.h
+++ b/ext/SDBM_File/sdbm.h
diff --git a/ext/SDBM_File/sdbm/.gitignore b/ext/SDBM_File/sdbm/.gitignore
deleted file mode 100644
index 289833e9b8..0000000000
--- a/ext/SDBM_File/sdbm/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-!*.c
-*.a
diff --git a/ext/SDBM_File/sdbm/Makefile.PL b/ext/SDBM_File/sdbm/Makefile.PL
deleted file mode 100644
index c02c75b865..0000000000
--- a/ext/SDBM_File/sdbm/Makefile.PL
+++ /dev/null
@@ -1,48 +0,0 @@
-use ExtUtils::MakeMaker;
-
-my $define = '-DSDBM -DDUFF';
-$define .= ' -DWIN32 -DPERL_STATIC_SYMS' if ($^O eq 'MSWin32');
-
-WriteMakefile(
-    NAME      => 'sdbm', # (doesn't matter what the name is here) oh yes it does
-#    LINKTYPE  => 'static',
-    DEFINE    => $define,
-    INC       => '-I$(PERL_INC)', # force PERL_INC dir ahead of system -I's
-    SKIP      => [qw(dynamic dynamic_lib dlsyms)],
-    OBJECT    => '$(O_FILES)',
-    clean     => {'FILES' => 'dbu libsdbm.a dbd dba dbe x-dbu *.dir *.pag'},
-    H         => [qw(tune.h sdbm.h pair.h $(PERL_INC)/config.h)],
-    C         => [qw(sdbm.c pair.c hash.c)]
-);
-
-sub MY::constants {
-    package MY;
-    my $self = shift;
-
-    $self->{INST_STATIC} = 'libsdbm$(LIB_EXT)';
-
-    return $self->SUPER::constants();
-}
-
-sub MY::top_targets {
-    my $r = '
-all :: static
-	$(NOECHO) $(NOOP)
-
-config ::
-	$(NOECHO) $(NOOP)
-
-lint:
-	lint -abchx $(LIBSRCS)
-
-';
-    $r .= '
-# This is a workaround, the problem is that our old GNU make exports
-# variables into the environment so $(MYEXTLIB) is set in here to this
-# value which can not be built.
-sdbm/libsdbm.a:
-	$(NOECHO) $(NOOP)
-' unless $^O eq 'VMS';
-
-    return $r;
-}
diff --git a/ext/SDBM_File/sdbm/tune.h b/ext/SDBM_File/tune.h
index b95c8c8634..b95c8c8634 100644
--- a/ext/SDBM_File/sdbm/tune.h
+++ b/ext/SDBM_File/tune.h
diff --git a/ext/SDBM_File/sdbm/util.c b/ext/SDBM_File/util.c
index a58085d559..a58085d559 100644
--- a/ext/SDBM_File/sdbm/util.c
+++ b/ext/SDBM_File/util.c