Automatically keep Android.mk in sync with source lists from Makefile.am

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/Android.mk b/Android.mk
index e7dbcb2..1fbda91 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,12 +1,15 @@
 LOCAL_PATH := $(call my-dir)
 
 
-# This list comes from the following variables in the normal Makefile.am:
-# $(openconnect_SOURCES) $(libopenconnect_la_SOURCES) $(noinst_HEADERS)
-common_SRC_FILES := \
-       xml.c main.c dtls.c cstp.c mainloop.c tun.c compat.c \
-       ssl.c http.c version.c auth.c library.c openssl.c \
-       openconnect-internal.h openconnect.h
+# These lists come from the same variables in Makefile.am:
+openconnect_SOURCES = xml.c main.c dtls.c cstp.c mainloop.c tun.c
+library_srcs = ssl.c http.c auth.c library.c compat.c
+lib_srcs_openssl = openssl.c
+noinst_HEADERS = openconnect-internal.h openconnect.h
+
+
+common_SRC_FILES := $(openconnect_SOURCES) $(library_srcs) $(lib_srcs_openssl) \
+       $(noinst_HEADERS) version.c
 
 common_CFLAGS += -DANDROID -DANDROID_KEYSTORE -DIF_TUN_HDR="<linux/if_tun.h>" \
        -DDEFAULT_VPNCSCRIPT=NULL -DHAVE_ASPRINTF -DOPENCONNECT_OPENSSL

diff --git a/Makefile.am b/Makefile.am
index 7e7c5de..6adec81 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,7 @@ endif
 
 pkgconfig_DATA = openconnect.pc
 
-EXTRA_DIST = version.sh COPYING.LGPL $(lib_srcs_openssl) $(lib_srcs_gnutls)
+EXTRA_DIST = version.sh COPYING.LGPL $(lib_srcs_openssl) $(lib_srcs_gnutls) Android.mk
 
 DISTCLEANFILES = $(pkgconfig_DATA)
 
@@ -120,3 +120,9 @@ po/$(PACKAGE).pot: $(POTFILES) Makefile
          --package-name="@PACKAGE@" --package-version="@VERSION@" \
          --msgid-bugs-address=openconnect-devel@lists.infradead.org \
          -o $@ $(POTFILES)
+
+Android.mk: Makefile.am
+       @for a in openconnect_SOURCES library_srcs lib_srcs_openssl noinst_HEADERS; do \
+               FILES=`grep "^$$a = " $(top_srcdir)/Makefile.am`; \
+               sed "s/^$$a = .*/$$FILES/" -i $(top_srcdir)/Android.mk;  \
+       done