diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2013-04-12 22:27:04 +0100 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2013-04-19 22:47:27 +0100 |
| commit | 19975300c70a3e5d62507daf8882066dd5195f45 (patch) | |
| tree | 40b940cc3cb76833895f87adef449151d55a047b | |
| parent | 6a48eb5e4705c49f5004ed669c0c953351eaaf77 (diff) | |
| download | swig-19975300c70a3e5d62507daf8882066dd5195f45.tar.gz | |
Tidy up android example makefiles and fix clean target
| -rw-r--r-- | Examples/android/class/Makefile | 12 | ||||
| -rw-r--r-- | Examples/android/extend/Makefile | 14 | ||||
| -rw-r--r-- | Examples/android/simple/Makefile | 12 |
3 files changed, 13 insertions, 25 deletions
diff --git a/Examples/android/class/Makefile b/Examples/android/class/Makefile index 2a3f0ec2d..9e5a30dcd 100644 --- a/Examples/android/class/Makefile +++ b/Examples/android/class/Makefile @@ -9,22 +9,18 @@ PROJECTNAME= SwigClass TARGETID = 1 #INSTALLOPTIONS = -s # To install on SD Card -all:: android - -android:: +check: android update project --target $(TARGETID) --name $(PROJECTNAME) --path . $(SWIG) -c++ -java $(SWIGOPT) -o jni/$(TARGET)_wrap.cpp jni/$(INTERFACE) ndk-build ant debug -install:: +install: -adb uninstall $(PACKAGENAME) adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk -clean:: +clean: ant clean rm -f jni/$(TARGET)_wrap.cpp rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java` - - -check: all + rm -rf obj diff --git a/Examples/android/extend/Makefile b/Examples/android/extend/Makefile index e8c1b5e16..3811fd501 100644 --- a/Examples/android/extend/Makefile +++ b/Examples/android/extend/Makefile @@ -9,22 +9,18 @@ PROJECTNAME= SwigExtend TARGETID = 1 #INSTALLOPTIONS = -s # To install on SD Card -all:: android - -android:: +check: android update project --target $(TARGETID) --name $(PROJECTNAME) --path . $(SWIG) -c++ -java $(SWIGOPT) -o jni/$(TARGET)_wrap.cpp jni/$(INTERFACE) ndk-build ant debug -install:: +install: -adb uninstall $(PACKAGENAME) adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk -clean:: +clean: ant clean - rm -f jni/$(TARGET)_wrap.cpp + rm -f jni/$(TARGET)_wrap.h jni/$(TARGET)_wrap.cpp rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java` - - -check: all + rm -rf obj diff --git a/Examples/android/simple/Makefile b/Examples/android/simple/Makefile index 9aeb0c80d..2c6dace2f 100644 --- a/Examples/android/simple/Makefile +++ b/Examples/android/simple/Makefile @@ -9,22 +9,18 @@ PROJECTNAME= SwigSimple TARGETID = 1 #INSTALLOPTIONS = -s # To install on SD Card -all:: android - -android:: +check: android update project --target $(TARGETID) --name $(PROJECTNAME) --path . $(SWIG) -java $(SWIGOPT) -o jni/$(TARGET)_wrap.c jni/$(INTERFACE) ndk-build ant debug -install:: +install: -adb uninstall $(PACKAGENAME) adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk -clean:: +clean: ant clean rm -f jni/$(TARGET)_wrap.c rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java` - - -check: all + rm -rf obj |