removing rake-compiler

2 files changed, 7 insertions, 11 deletions

diff --git a/ext/ffi_yajl/ext/encoder/Makefile b/ext/ffi_yajl/ext/encoder/Makefile
index 0b4b2ef..07fb934 100644
--- a/ext/ffi_yajl/ext/encoder/Makefile
+++ b/ext/ffi_yajl/ext/encoder/Makefile
@@ -78,12 +78,12 @@ optflags = -O3 -fno-fast-math
 debugflags = -ggdb3
 warnflags = -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration
 CCDLFLAGS = -fno-common
-CFLAGS   = $(CCDLFLAGS) -O3 -march=nocona -O2 -pipe -fno-common -Wall $(ARCH_FLAG)
+CFLAGS   = $(CCDLFLAGS) -I/Users/lamont/git/ffi-yajl/include -L/Users/lamont/git/ffi-yajl/lib -O3 -march=nocona -O2 -pipe -fno-common -Wall $(ARCH_FLAG)
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     = 
 CPPFLAGS =  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT -I/usr/local/opt/libyaml/include -I/usr/local/opt/readline/include -I/usr/local/opt/libksba/include -I/usr/local/opt/openssl/include $(DEFS) $(cppflags)
 CXXFLAGS = $(CCDLFLAGS) $(cxxflags) $(ARCH_FLAG)
-ldflags  = -L. -fstack-protector -L/usr/local/lib -L/usr/local/opt/libyaml/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libksba/lib -L/usr/local/opt/openssl/lib 
+ldflags  = -L/Users/lamont/git/ffi-yajl/lib -I/Users/lamont/git/ffi-yajl/include -L/Users/lamont/git/ffi-yajl/lib -O3 -march=nocona -O2 -pipe -fno-common -lyajl
 dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress -L/usr/local/opt/libyaml/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libksba/lib -L/usr/local/opt/openssl/lib  
 ARCH_FLAG = 
 DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
@@ -130,7 +130,7 @@ DISTCLEANDIRS =
 
 extout = 
 extout_prefix = 
-target_prefix = /encoder
+target_prefix = /ffi_yajl/ext
 LOCAL_LIBS = 
 LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lobjc 
 ORIG_SRCS = encoder.c
@@ -228,7 +228,7 @@ site-install-rb: install-rb
 	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
 
 $(DLLIB): $(OBJS) Makefile
-	$(ECHO) linking shared-object encoder/$(DLLIB)
+	$(ECHO) linking shared-object ffi_yajl/ext/$(DLLIB)
 	-$(Q)$(RM) $(@)
 	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
 	$(Q) test -z '$(RUBY_CODESIGN)' || codesign -s '$(RUBY_CODESIGN)' -f $@
diff --git a/ext/libyajl2/extconf.rb b/ext/libyajl2/extconf.rb
index 9d01081..c2785a1 100644
--- a/ext/libyajl2/extconf.rb
+++ b/ext/libyajl2/extconf.rb
@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
-
   require 'mkmf'
   require 'rbconfig'
 
@@ -20,9 +19,6 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
 
   # yajl_complete_parse is only in >= 2.0
   libyajl2_ok = have_library("yajl", "yajl_complete_parse", [ "yajl/yajl_parse.h" ])
-
-  create_makefile("dummy")
-
 else
   # always install libyajl2 on Jruby
   # FIXME: get the conditional mkmf stuff to work on Jruby
@@ -32,9 +28,9 @@ end
 prefix=File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
 
 unless libyajl2_ok
-#  ENV['CFLAGS'] = $CFLAGS
-#  ENV['LDFLAGS'] = $LDFLAGS
-#  ENV['CC'] = RbConfig::MAKEFILE_CONFIG['CC']
+  ENV['CFLAGS'] = $CFLAGS
+  ENV['LDFLAGS'] = $LDFLAGS
+  ENV['CC'] = RbConfig::MAKEFILE_CONFIG['CC']
   system "wget -O yajl-2.0.1.tar.gz http://github.com/lloyd/yajl/tarball/2.0.1" or raise "wget failed"
   system "tar xvf yajl-2.0.1.tar.gz" or raise "tar xvf failed"
   Dir.chdir "lloyd-yajl-f4b2b1a" or raise "chdir failed"