diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2013-02-06 23:08:05 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2013-02-06 23:08:05 +0100 |
| commit | 7be925aefc0114f5174dff36fa7b9b5ac32305c8 (patch) | |
| tree | 8510dfe989e34099de1b12aafc97484869834a61 | |
| parent | 611ec0a19021ef04dc273df543b40a6352543cbb (diff) | |
build: move Android.mk to packages/Android/
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | docs/INSTALL | 2 | ||||
| -rw-r--r-- | packages/Android/Android.mk (renamed from Android.mk) | 0 | ||||
| -rw-r--r-- | packages/Makefile.am | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index cbe983ffd..3ea73a480 100644 --- 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 def3ce81e..c13a66094 100644 --- 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 index 2c0064fac..2c0064fac 100644 --- a/Android.mk +++ b/packages/Android/Android.mk diff --git a/packages/Makefile.am b/packages/Makefile.am index 75c774d70..bef04f3c2 100644 --- 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 |