Generate the main Android.mk, so the version number is not hardcoded.

We include the generated file in the distribution, so users won't
have run configure if they are building for Android.

diff --git a/Android.mk b/Android.mk.in
similarity index 97%
rename from Android.mk
rename to Android.mk.in
index cf89a0b6a366908a21d447f0687244a5fe0a58be..723f9e5ccf781a9687895d323c302dba256e7cad 100644 (file)
--- a/Android.mk
+++ b/Android.mk.in
@@ -37,7 +37,7 @@ strongswan_CFLAGS := \
        -DUSE_VSTR \
        -DROUTING_TABLE=0 \
        -DROUTING_TABLE_PRIO=220 \
-       -DVERSION=\"4.4.0\" \
+       -DVERSION=\"@PACKAGE_VERSION@\" \
        -DPLUGINS='"$(strongswan_PLUGINS)"' \
        -DIPSEC_DIR=\"/system/bin\" \
        -DIPSEC_PIDDIR=\"/data/misc/vpn\" \

diff --git a/Makefile.am b/Makefile.am
index 53b14593e921301132db15aee7272c65e6eca665..da79e557c756ec4a0b8b66b64051b3bf2a64c0d1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,8 +6,15 @@ endif
 
 ACLOCAL_AMFLAGS = -I m4/config
 
-EXTRA_DIST = Doxyfile.in CREDITS Android.mk
+EXTRA_DIST = Doxyfile.in CREDITS Android.mk.in Android.mk
 CLEANFILES = apidoc Doxyfile
+BUILT_SOURCES = Android.mk
+MAINTAINERCLEANFILES = Android.mk
+
+Android.mk :   Android.mk.in
+               sed \
+               -e "s:\@PACKAGE_VERSION\@:$(PACKAGE_VERSION):" \
+               $(srcdir)/$@.in > $@
 
 Doxyfile :     Doxyfile.in
                sed \