moar bleh

4 files changed, 11 insertions, 7 deletions

diff --git a/.travis.sh b/.travis.sh
index 64cfb8e..454c4d5 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -2,6 +2,8 @@
 
 set -e -x
 
+MAKEOPTS="-j`nproc` ${MAKEOPTS}"
+
 case "$1" in
   before_install)
     sudo service postgresql stop
@@ -18,8 +20,6 @@ case "$1" in
     mv *.rpyc unrpyc
     ;;
   install)
-    MAKEOPTS="-j`nproc` ${MAKEOPTS}"
-
     sudo apt-get install -q libtheora-dev libvpx-dev libx264-dev yasm
 
     cd libwebp-0.4.0
@@ -34,8 +34,9 @@ case "$1" in
 
     cd node-v*
     ./configure --openssl-use-sys --shared-zlib
-    make V= $MAKEOPTS
-    sudo make V= $MAKEOPTS install
+    # TO NODE DEVS: "quiet" DOESN'T MEAN WHAT YOU THINK IT MEANS
+    make $MAKEOPTS >/dev/null
+    sudo make $MAKEOPTS install >/dev/null
     cd ..
 
     sudo npm install -g uglify-js
@@ -61,6 +62,9 @@ case "$1" in
     curl https://raw.github.com/Lattyware/unrpa/master/unrpa | python2 - -p www/dump -m data.rpa
     rm data.rpa
     ;;
+  script)
+    exec make
+    ;;
   *)
     exit 1
 esac
diff --git a/.travis.yml b/.travis.yml
index bcbd8bf..b45d720 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ node_js: "0.11"
 env: MINIMAL=1 CFLAGS="-O2 -march=native -pipe" CXXFLAGS="-O2 -march=native -pipe" MAKEOPTS="-s"
 before_install: ./.travis.sh before_install
 install: ./.travis.sh install
-script: make
+script: ./.travis.sh script
 notifications:
   email:
 #    - alex_y_xu@yahoo.ca
diff --git a/LICENSE.rst b/LICENSE.rst
index 8a012c0..3013bdb 100644
--- a/LICENSE.rst
+++ b/LICENSE.rst
@@ -7,7 +7,7 @@ The "Playtime With Hot Toddies" font is not licensed, but was found on `Font Squ
 
     It is our opinion that if the unlicensed font is freely available for download from either the original source or from multiple free-font sites then we assume it to be safe to use the font commercially. This is no guarantee of such freedom, but there are so many unlicensed free fonts distributed by primary sources that the intentions must be read that the font is free to use how you like.
 
-Ren'Py (unrpyc/renpy) is distributed under the MIT license, in unrpyc/renpy/LICENSE.txt.
+Ren'Py (``unrpyc/renpy``) is distributed under the MIT license, in ``unrpyc/renpy/LICENSE.txt``.
 
 Git submodules are not included as part of the source, and are licensed separately. See their respective subdirectories for more information.
 
diff --git a/Makefile b/Makefile
index 6047e70..5b2c251 100644
--- a/Makefile
+++ b/Makefile
@@ -177,7 +177,7 @@ watch:
 	done
 
 # disable default rules, increases `make` speed by 3 seconds
-.SUFFIXES:
+MAKEFLAGS=-r
 
 .INTERMEDIATE: $(Y4M) $(CTC_ANIM_TMP) $(CTC_ANIM_TMP_WEBP)
 .PHONY: video audio images js jshint clean space watch