Java bindings Makefile tested and working on both GNU and Windows.

diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index 73b0f920cdb43bc6838eff9ec0fd89ea5be7241e..6b8f518594564a88a9c3f0c6441abef3c92c07d9 100644 (file)
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -4,7 +4,7 @@
 
 if BUILD_JAVA
 
-OBJECTS = org/videolan/jvlc/AudioIntf.class org/videolan/jvlc/InputIntf.class org/videolan/jvlc/PlaylistIntf.class org/videolan/jvlc/VideoIntf.class org/videolan/jvlc/JLibVLC.class org/videolan/jvlc/JVLC.class org/videolan/jvlc/JVLCCanvas.class org/videolan/jvlc/JVLCPanel.class org/videolan/jvlc/VLMIntf.class org/videolan/jvlc/Playlist.class org/videolan/jvlc/GenericVideoWidget.class
+OBJECTS = org/videolan/jvlc/Playlist.class org/videolan/jvlc/AudioIntf.class org/videolan/jvlc/InputIntf.class org/videolan/jvlc/PlaylistIntf.class org/videolan/jvlc/VideoIntf.class org/videolan/jvlc/JLibVLC.class org/videolan/jvlc/JVLC.class org/videolan/jvlc/JVLCCanvas.class org/videolan/jvlc/JVLCPanel.class org/videolan/jvlc/VLMIntf.class org/videolan/jvlc/GenericVideoWidget.class
 
 # Include some JAVA stuff
 PROCESSOR_FAMILY = `uname -m | sed -e 's/^i.86/i386/' | sed -e 's/^x86_64/amd64/'`
@@ -53,11 +53,17 @@ VlcClient: $(OBJECTS)
 VLCExample: $(OBJECTS)
        $(JCC) $(JCC_FLAGS) VLCExample.java
 
+if HAVE_WIN32
+%.class: %.java
+       $(JCC) $(JCC_FLAGS) $?
+       $(JCH) org.videolan.jvlc.$(*F)
+else
 %.class: %.java
        $(JCC) $(JCC_FLAGS) $?
        $(JCH) org/videolan/jvlc/$(*F)
+endif
 
 clean:
-       rm -f *.class *~ org/videolan/jvlc/*.class org_videolan*.h *.so *.o
+       rm -f *.class *~ org/videolan/jvlc/*.class org_videolan*.h *.so *.o *.dll
 
 endif
\ No newline at end of file