Permalink
Browse files

Merge pull request #14 from avsej/master

Add new targets to Makefile.ruby console, clean
  • Loading branch information...
2 parents 081b2b7 + a08ed5d commit b5272d106dbcaee0f875331f9ebf9751e2c7c46d @trondn committed Feb 14, 2013
Showing with 14 additions and 2 deletions.
  1. +14 −2 Makefile.ruby
View
@@ -24,7 +24,9 @@ client.bundled: client/Gemfile
(cd client; rbenv each -v bundle install --no-color)
touch $@
-libcouchbase: libcouchbase/libcouchbase.la
+libcouchbase: $(PREFIX)/lib/libcouchbase.so
+
+$(PREFIX)/lib/libcouchbase.so: libcouchbase/libcouchbase.la
(cd libcouchbase; $(MAKE) install)
libcouchbase/libcouchbase.la: libcouchbase/Makefile $(LCBSOURCE)
@@ -61,4 +63,14 @@ $(RBENVDIR)/.done:
git clone git://github.com/sstephenson/rbenv.git $(RBENVDIR)
touch $@
-.PHONY: all check install-rubies
+clean:
+ repo forall -c 'git clean -dfxq'
+ rm -rf install
+
+client/lib/couchbase_ext.so: client.bundled $(RUBYSOURCE) $(PREFIX)/lib/libcouchbase.so
+ (cd client; bundle exec rake compile with_libcouchbase_dir=$(PREFIX))
+
+console: client/lib/couchbase_ext.so
+ (cd client; bundle exec rake console)
+
+.PHONY: all check install-rubies clean console

0 comments on commit b5272d1

Please sign in to comment.