From d2b5d5ad05a40db8848bca2fed781749661e2d21 Mon Sep 17 00:00:00 2001
From: Lucas Baudin <lucas.baudin@ens.fr>
Date: Thu, 25 Feb 2016 19:38:36 +0100
Subject: [PATCH] [android] auto-download jpeglib

---
 android/Makefile       | 6 +++++-
 android/readme.android | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/android/Makefile b/android/Makefile
index e4a703e02..dfdaa8b21 100644
--- a/android/Makefile
+++ b/android/Makefile
@@ -5,7 +5,7 @@ export PATH :=$(shell pwd)/obj/bin:${PATH}
 all: build apk
 
 # target: build - Build the native code
-build: obj/freetype.stamp jni/ifaddrs/ifaddrs.h
+build: obj/freetype.stamp jni/ifaddrs/ifaddrs.h jni/jpeglib/jpeglib.h
 	NDK_CCACHE=ccache ${NDK_PATH}/ndk-build -j3
 
 # target: apk - Make a debug APK
@@ -38,4 +38,8 @@ obj/freetype.stamp:
 jni/ifaddrs/ifaddrs.h:
 	cd jni && git clone https://github.com/morristech/android-ifaddrs.git ifaddrs
 
+jni/jpeglib/jpeglib.h:
+	git clone https://github.com/folecr/jpeg8d jni/jpeglib
+
+
 #wget http://mirror6.layerjet.com/nongnu//freetype/freetype-2.6.tar.gz
diff --git a/android/readme.android b/android/readme.android
index 6382792b1..571f017c1 100644
--- a/android/readme.android
+++ b/android/readme.android
@@ -4,8 +4,8 @@ The android sdk must be installed in /opt.
 
 ant is also needed.
 
-Download a suitable jpeglib
-===========================
+[not needed anymore] Download a suitable jpeglib (done automatically by the Makefile)
+================================================================
 > git clone https://github.com/folecr/jpeg8d jni/jpeglib
 
 Build an apk