Commit 1a077e01 authored by Filippo Carone's avatar Filippo Carone

java compilation is javac friendly

parent cff71493
...@@ -50,8 +50,8 @@ export LIBJINCLUDES ...@@ -50,8 +50,8 @@ export LIBJINCLUDES
# Build targets # Build targets
%.class: %.java %.class: %.java
$(JAVAC) $? $(JAVAC) $?
VlcClient: $(OBJECTS) VlcClient: $(OBJECTS)
$(JAVAC) VlcClient.java $(JAVAC) VlcClient.java
...@@ -62,6 +62,6 @@ VLCExample: $(OBJECTS) ...@@ -62,6 +62,6 @@ VLCExample: $(OBJECTS)
all-am: VlcClient VLCExample all-am: VlcClient VLCExample
clean-local: clean-local:
rm -f *.class *~ org/videolan/jvlc/*.class org_videolan*.h src/*.o *.so *.o *.dll rm -f *.class *~ org/videolan/jvlc/*.class src/*.o *.so *.o *.dll
endif endif
...@@ -5584,6 +5584,10 @@ then ...@@ -5584,6 +5584,10 @@ then
AC_PROG_JAVAC AC_PROG_JAVAC
AC_PROG_JAVA AC_PROG_JAVA
PLUGINS_BINDINGS="${PLUGINS_BINDINGS} java" PLUGINS_BINDINGS="${PLUGINS_BINDINGS} java"
if test "${JAVAC}" == "javac"
then
JAVAC="javac -cp ./ "
fi
fi fi
AM_CONDITIONAL(BUILD_JAVA, [test "${enable_java_bindings}" = "yes"]) AM_CONDITIONAL(BUILD_JAVA, [test "${enable_java_bindings}" = "yes"])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment