Tidy up android example makefiles and fix clean target

This commit is contained in:
William S Fulton 2013-04-12 22:27:04 +01:00
commit 19975300c7
3 changed files with 13 additions and 25 deletions

View file

@ -9,22 +9,18 @@ PROJECTNAME= SwigClass
TARGETID = 1 TARGETID = 1
#INSTALLOPTIONS = -s # To install on SD Card #INSTALLOPTIONS = -s # To install on SD Card
all:: android check:
android::
android update project --target $(TARGETID) --name $(PROJECTNAME) --path . android update project --target $(TARGETID) --name $(PROJECTNAME) --path .
$(SWIG) -c++ -java $(SWIGOPT) -o jni/$(TARGET)_wrap.cpp jni/$(INTERFACE) $(SWIG) -c++ -java $(SWIGOPT) -o jni/$(TARGET)_wrap.cpp jni/$(INTERFACE)
ndk-build ndk-build
ant debug ant debug
install:: install:
-adb uninstall $(PACKAGENAME) -adb uninstall $(PACKAGENAME)
adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk
clean:: clean:
ant clean ant clean
rm -f jni/$(TARGET)_wrap.cpp rm -f jni/$(TARGET)_wrap.cpp
rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java` rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java`
rm -rf obj
check: all

View file

@ -9,22 +9,18 @@ PROJECTNAME= SwigExtend
TARGETID = 1 TARGETID = 1
#INSTALLOPTIONS = -s # To install on SD Card #INSTALLOPTIONS = -s # To install on SD Card
all:: android check:
android::
android update project --target $(TARGETID) --name $(PROJECTNAME) --path . android update project --target $(TARGETID) --name $(PROJECTNAME) --path .
$(SWIG) -c++ -java $(SWIGOPT) -o jni/$(TARGET)_wrap.cpp jni/$(INTERFACE) $(SWIG) -c++ -java $(SWIGOPT) -o jni/$(TARGET)_wrap.cpp jni/$(INTERFACE)
ndk-build ndk-build
ant debug ant debug
install:: install:
-adb uninstall $(PACKAGENAME) -adb uninstall $(PACKAGENAME)
adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk
clean:: clean:
ant 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` rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java`
rm -rf obj
check: all

View file

@ -9,22 +9,18 @@ PROJECTNAME= SwigSimple
TARGETID = 1 TARGETID = 1
#INSTALLOPTIONS = -s # To install on SD Card #INSTALLOPTIONS = -s # To install on SD Card
all:: android check:
android::
android update project --target $(TARGETID) --name $(PROJECTNAME) --path . android update project --target $(TARGETID) --name $(PROJECTNAME) --path .
$(SWIG) -java $(SWIGOPT) -o jni/$(TARGET)_wrap.c jni/$(INTERFACE) $(SWIG) -java $(SWIGOPT) -o jni/$(TARGET)_wrap.c jni/$(INTERFACE)
ndk-build ndk-build
ant debug ant debug
install:: install:
-adb uninstall $(PACKAGENAME) -adb uninstall $(PACKAGENAME)
adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk
clean:: clean:
ant clean ant clean
rm -f jni/$(TARGET)_wrap.c rm -f jni/$(TARGET)_wrap.c
rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java` rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java`
rm -rf obj
check: all