Browse Source

build: move Android.mk to packages/Android/

tags/curl-7_30_0
Daniel Stenberg 6 years ago
parent
commit
7be925aefc
4 changed files with 4 additions and 5 deletions
  1. 1
    2
      Makefile.am
  2. 1
    1
      docs/INSTALL
  3. 0
    0
      packages/Android/Android.mk
  4. 2
    2
      packages/Makefile.am

+ 1
- 2
Makefile.am View File

@@ -35,8 +35,7 @@ winbuild/MakefileBuild.vc winbuild/Makefile.vc
35 35
 
36 36
 EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in	\
37 37
  RELEASE-NOTES buildconf libcurl.pc.in vc6curl.dsw MacOSX-Framework	\
38
- Android.mk $(CMAKE_DIST) Makefile.msvc.names $(WINBUILD_DIST)		\
39
- lib/libcurl.vers.in
38
+ $(CMAKE_DIST) Makefile.msvc.names $(WINBUILD_DIST) lib/libcurl.vers.in
40 39
 
41 40
 bin_SCRIPTS = curl-config
42 41
 

+ 1
- 1
docs/INSTALL View File

@@ -876,7 +876,7 @@ VxWorks
876 876
 Android
877 877
 =======
878 878
    Method using the static makefile:
879
-      - see the build notes in the Android.mk file.
879
+      - see the build notes in the packages/Android/Android.mk file.
880 880
 
881 881
    Method using a configure cross-compile (tested with Android NDK r7c, r8):
882 882
       - prepare the toolchain of the Android NDK for standalone use; this can

Android.mk → packages/Android/Android.mk View File


+ 2
- 2
packages/Makefile.am View File

@@ -29,5 +29,5 @@ EXTRA_DIST = README 			\
29 29
 	Symbian/readme.txt 		\
30 30
 	TPF/curl.mak 			\
31 31
 	TPF/maketpf.env_curl 		\
32
-	TPF/maketpf.env_curllib
33
-
32
+	TPF/maketpf.env_curllib         \
33
+	Android/Android.mk

Loading…
Cancel
Save