#15414: run swig directly from Android makefiles, handle deps
add script licence
diff --git a/README b/README
index ade6c48..47362c8 100644
--- a/README
+++ b/README
@@ -23,15 +23,13 @@
jni/sflphone/daemon/src/JavaJNI2CJNI_Load.py
make-swig.sh
-$ ./make-swig.sh
+$ ndk-build -j4
-Check that no errors occurred. Following files should have been generated:
+Check that no errors occurred. In particular, following files should have been generated by make-swig.sh:
sflphoneservice_loader.c
callmanager_wrap.cpp
sflphoneservice.java
sflphoneserviceJNI.java
ManagerImpl.java
-$ ndk-build -j4
-
Then build android project with your favorite JDK: eclipse or ant.
diff --git a/jni/sflphone b/jni/sflphone
index 75b7b90..3183151 160000
--- a/jni/sflphone
+++ b/jni/sflphone
@@ -1 +1 @@
-Subproject commit 75b7b90ea6eb2ab6c8abda0fb423c2a27ad97149
+Subproject commit 3183151b05feff145b2591d427f7f1f6186b31f1
diff --git a/make-swig.sh b/make-swig.sh
index f87093c..07c4ea6 100755
--- a/make-swig.sh
+++ b/make-swig.sh
@@ -1,21 +1,46 @@
-#!/bin/bash -
-#===============================================================================
+#!/bin/bash -
#
-# FILE: make-swig.sh
-#
-# USAGE: ./make-swig.sh
-#
-# DESCRIPTION:
+# Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
#
-#
-# AUTHOR: Emeric Vigier (), emeric.vigier@savoirfairelinux.com
-# COMPANY: Savoir-faire Linux
-# CREATED: 2012-09-11 18:44:34 EDT
-#===============================================================================
+# Author: Emeric Vigier <emeric.vigier@savoirfairelinux.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+# Additional permission under GNU GPL version 3 section 7:
+#
+# If you modify this program, or any covered work, by linking or
+# combining it with the OpenSSL project's OpenSSL library (or a
+# modified version of that library), containing parts covered by the
+# terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+# grants you additional permission to convey the resulting work.
+# Corresponding Source for a non-source form of such a combination
+# shall include the source code for the parts of OpenSSL used as well
+# as that of the covered work.
+#
+
+# input: jni/sflphone/daemon/src/dbus/callmanager.i
+# output: sflphoneservice_loader.c
+# callmanager_wrap.cpp
+# sflphoneservice.java
+# sflphoneserviceJNI.java
+# ManagerImpl.java
ROOT=`pwd`
echo "in $ROOT"
+# FIXME
echo "Generating callmanager_wrap.cpp..."
swig -v -debug-tmused -c++ -java \
-package com.savoirfairelinux.sflphone.client \