Skip to content

Fix a bug on machine without jna cannot make clean #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danghvu merged 3 commits into from
Nov 28, 2013
Merged

Fix a bug on machine without jna cannot make clean #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
686fdf6
Fix a bug on machine without jna cannot make clean
danghvu Nov 28, 2013
4891dba
Merge remote-tracking branch 'upstream/master'
danghvu Nov 28, 2013
7545b9b
Correct main Makefile back
danghvu Nov 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ clean:
#cd bindings/ruby; $(MAKE) clean; rm -rf Makefile
$(MAKE) -C bindings/python clean
$(MAKE) -C bindings/csharp clean
#$(MAKE) -C bindings/java clean
$(MAKE) -C bindings/java clean
$(MAKE) -C bindings/ocaml clean
$(MAKE) -C tests clean

Expand Down
8 changes: 5 additions & 3 deletions bindings/java/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ else
JNA = /usr/share/java/jna.jar
else
JNA =
$(error Unable to find jna.jar)
endif
endif

Expand All @@ -20,11 +19,14 @@ all: capstone tests
capstone: capstone_class
jar cf capstone.jar capstone/*.class

capstone_class:
capstone_class: jna
cd capstone; javac -classpath $(JNA) $(CAPSTONE_JAVA)

tests:
tests: jna
javac -classpath "$(JNA):capstone.jar" Test.java TestArm.java TestArm64.java TestMips.java TestX86.java

jna:
@if [ ! $(JNA) ]; then echo "*** Unable to find JNA ***"; exit 1; fi

clean:
rm -rf *.class *.log *.jar