Moving stuff around to get ext to build properly

Author: David Troy

Makefile renamed to ext/Makefile

@@ -116,14 +116,8 @@ install-rb: pre-install-rb install-rb-default
 install-rb-default: pre-install-rb-default
 pre-install-rb: Makefile
 pre-install-rb-default: Makefile
-pre-install-rb-default: $(RUBYLIBDIR)
-install-rb-default: $(RUBYLIBDIR)/geohash.rb
-$(RUBYLIBDIR)/geohash.rb: $(srcdir)/lib/geohash.rb
-	$(INSTALL_DATA) $(srcdir)/lib/geohash.rb $(@D)
 $(RUBYARCHDIR):
 	$(MAKEDIRS) $@
-$(RUBYLIBDIR):
-	$(MAKEDIRS) $@
 
 site-install: site-install-so site-install-rb
 site-install-so: install-so

ext/extconf.rb

@@ -0,0 +1,3 @@
+require 'mkmf'
+dir_config("geohash_native")
+create_makefile("geohash_native")

geohash_native.c renamed to ext/geohash_native.c

@@ -10,13 +10,13 @@ Gem::Specification.new do |s|
   s.description = "Geohash provides support for manipulating GeoHash strings in Ruby. See http://geohash.org."
   s.has_rdoc = true
   s.authors  = ["David Troy"]
-  s.files    = ["extconf.rb", 
-		"geohash_native.c",
-		"lib/geohash.rb",
-		"Makefile"]
+  s.files    = ["ext/extconf.rb", 
+		"ext/geohash_native.c",
+		"ext/Makefile",
+		"lib/geohash.rb"]
   s.test_files = ["test/test_geohash.rb"]
   s.rdoc_options = ["--main", "README"]
-  s.extensions = 'extconf.rb'
-  s.require_paths = 'lib'
+  s.extensions = 'ext/extconf.rb'
+  s.require_paths = ['lib', 'ext']
   s.extra_rdoc_files = ["Manifest.txt", "README"]
 end

extconf.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-$LOAD_PATH << "#{File.dirname(__FILE__)}/.."
+$LOAD_PATH << "#{File.dirname(__FILE__)}/../ext"
 require "#{File.dirname(__FILE__)}/../lib/geohash"
 require 'test/unit'
 
@@ -65,13 +65,13 @@ def test_neighbors
     assert_equal 8, (["dqcw7", "dqctg", "dqcw4", "dqcwh", "dqcw6", "dqcwk", "dqctf", "dqctu"] & GeoHash.new("dqcw5").neighbors).size
   end
 
-  require 'benchmark'
-  def test_multiple
-    Benchmark.bmbm(30) do |bm|
-      bm.report("encoding") {30000.times { test_encoding }}
-      bm.report("decoding") {30000.times { test_decoding }}
-      #bm.report("neighbors") {30000.times { test_neighbors }}
-    end
-  end
+  # require 'benchmark'
+  # def test_multiple
+  #   Benchmark.bmbm(30) do |bm|
+  #     bm.report("encoding") {30000.times { test_encoding }}
+  #     bm.report("decoding") {30000.times { test_decoding }}
+  #     #bm.report("neighbors") {30000.times { test_neighbors }}
+  #   end
+  # end
 end