move ndk-clean tasks to clean target

sjlombardo · sjlombardo · commit 62f68831f7e1 · 2011-12-30T10:28:37.000-05:00
diff --git a/Makefile b/Makefile
@@ -6,38 +6,38 @@ init:
 	git submodule update --init
 	android update project -p .
 
-all: clean build-external build-jni build-java copy-libs
+all: build-external build-jni build-java copy-libs
 
 build-external:
 	cd external/ && \
 	make -f Android.mk build-local-hack && \
-	ndk-build clean && \
 	ndk-build && \
-  make -f Android.mk copy-libs-hack
+	make -f Android.mk copy-libs-hack
 
 build-jni:
 	cd jni/ && \
-	ndk-build clean && \
 	ndk-build
 
 build-java:
-	ant clean && \
 	ant release && \
 	cd bin/classes && \
 	jar -cvf sqlcipher.jar .
 
 clean:
+	ant clean
+	cd external/ && ndk-build clean 
+	cd jni/ && ndk-build clean 
 	-rm ${LIBRARY_ROOT}/armeabi/libsqlcipher_android.so
 	-rm ${LIBRARY_ROOT}/armeabi/libdatabase_sqlcipher.so
 	-rm ${LIBRARY_ROOT}/sqlcipher.jar
 
 copy-libs:
 	cp external/libs/armeabi/libsqlcipher_android.so \
 		 ${LIBRARY_ROOT}/armeabi  && \
-  cp jni/libs/armeabi/libdatabase_sqlcipher.so \
-     ${LIBRARY_ROOT}/armeabi && \
-  cp bin/classes/sqlcipher.jar ${LIBRARY_ROOT} && \
-  cp ${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/libs/armeabi/libstlport_shared.so \
+	cp jni/libs/armeabi/libdatabase_sqlcipher.so \
+		${LIBRARY_ROOT}/armeabi && \
+	cp bin/classes/sqlcipher.jar ${LIBRARY_ROOT} && \
+	cp ${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/libs/armeabi/libstlport_shared.so \
 		 ${LIBRARY_ROOT}/armeabi
 
 copy-libs-dist:
