build: move Android.mk to packages/Android/

diff --git a/Makefile.am b/Makefile.am
index cbe983ffda0d0db6f035c4185295c409125fcd78..3ea73a480a62406149bc2c0da7a05a04da8fb19f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,8 +35,7 @@ winbuild/MakefileBuild.vc winbuild/Makefile.vc
 
 EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in      \
  RELEASE-NOTES buildconf libcurl.pc.in vc6curl.dsw MacOSX-Framework    \
- Android.mk $(CMAKE_DIST) Makefile.msvc.names $(WINBUILD_DIST)         \
- lib/libcurl.vers.in
+ $(CMAKE_DIST) Makefile.msvc.names $(WINBUILD_DIST) lib/libcurl.vers.in
 
 bin_SCRIPTS = curl-config
 

diff --git a/docs/INSTALL b/docs/INSTALL
index def3ce81e4f054d5a1f385d1ccbd809845b21c24..c13a660942ec9006362d41fdee01cfa7cff9001c 100644 (file)
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -876,7 +876,7 @@ VxWorks
 Android
 =======
    Method using the static makefile:
-      - see the build notes in the Android.mk file.
+      - see the build notes in the packages/Android/Android.mk file.
 
    Method using a configure cross-compile (tested with Android NDK r7c, r8):
       - prepare the toolchain of the Android NDK for standalone use; this can

diff --git a/Android.mk b/packages/Android/Android.mk
similarity index 100%
rename from Android.mk
rename to packages/Android/Android.mk

diff --git a/packages/Makefile.am b/packages/Makefile.am
index 75c774d7035bbfd9d573d10f19c7054b3cb06ab7..bef04f3c2e5c5415bf697b71659f5cdec3734dad 100644 (file)
--- a/packages/Makefile.am
+++ b/packages/Makefile.am
@@ -29,5 +29,5 @@ EXTRA_DIST = README                   \
        Symbian/readme.txt              \
        TPF/curl.mak                    \
        TPF/maketpf.env_curl            \
-       TPF/maketpf.env_curllib
-
+       TPF/maketpf.env_curllib         \
+       Android/Android.mk