From: Tobias Brunner Date: Fri, 5 Mar 2010 12:11:58 +0000 (+0100) Subject: Generate the main Android.mk, so the version number is not hardcoded. X-Git-Tag: 4.4.0~247 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=807c12ce669b8e00188a60ce8ea448f8b05b9167;p=thirdparty%2Fstrongswan.git 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 cf89a0b6a3..723f9e5ccf 100644 --- 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 53b14593e9..da79e557c7 100644 --- 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 \