Merge pull request #64 from ozkriff/master

.travis.yml: Download rustc from rust-lang.org

.travis.yml

@@ -17,16 +17,16 @@ env:
   global:
     - secure: N41M4QTWbez7FRMh2HQqB3Z051FcruoRGLTdMdQJNMaZRqJiAfUBTO5NGXS5XGjIofknE4r/+WLv7KED2rTf6nvLFOHmGY2pL+agABcyD0DU0ltRLckjONWTxFN+SMTB0l38v3XIXxXX5y977Hl6wk3++kYZgCNVG3OTkJwWzQg=
 before_install:
-  - yes | sudo add-apt-repository ppa:hansjorg/rust
   - sudo apt-get update
 install:
-  - sudo apt-get install rust-nightly
+  - wget http://static.rust-lang.org/dist/rust-nightly-x86_64-unknown-linux-gnu.tar.gz
+  - tar xzf rust-nightly-x86_64-unknown-linux-gnu.tar.gz
+  - export PATH=$PATH:$(pwd)/rust-nightly-x86_64-unknown-linux-gnu/bin
+  - rustc -v
 script:
   - make
 #  - make check     # bench is too slow
   - make test
-  - sudo make install
-  - sudo make uninstall
   - make clean
   - make doc
 after_script:

Makefile

@@ -34,7 +34,7 @@ LIB_INSTALL_DIR     = $(INSTALL_PREFIX)/lib
 
 all: lib doc
 
-lib:
+lib: $(LIB_FILE)
 	mkdir -p $(LIB_DIR)
 	$(RUSTC) --out-dir=$(LIB_DIR) -O $(LIB_FILE)
 
@@ -54,17 +54,6 @@ doc:
 	mkdir -p $(DOC_DIR)
 	$(RUSTDOC) -o $(DOC_DIR) $(LIB_FILE)
 
-install: lib
-	@ $(foreach crate, $(CRATE_FILES), \
-		cp $(LIB_DIR)/$(crate) $(LIB_INSTALL_DIR)/$(crate) && \
-		echo "Installed $(crate) to $(LIB_INSTALL_DIR)" ; \
-	)
-
-uninstall:
-	@-rm -f $(LIB_INSTALL_DIR)/lib$(CRATE_NAME)-*.rlib ||:
-	@-rm -f $(LIB_INSTALL_DIR)/lib$(CRATE_NAME)-*.so ||:
-	@-rm -f $(LIB_INSTALL_DIR)/lib$(CRATE_NAME)-*.dylib ||:
-
 clean:
 	rm -rf $(LIB_DIR)
 	rm -rf $(TEST_DIR)
@@ -78,6 +67,4 @@ clean:
 	bench \
 	check \
 	doc \
-	install \
-	uninstall \
 	clean