also link libvlc-control in java bindings

[vlc] / bindings / java / Makefile.am

diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index 2fc5ee2ef5ba96fb878df5718f1a9bc19f862c1e..1c515372a23b2eb127755b59b03dc2548f427cbe 100644 (file)
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -2,12 +2,43 @@
 # VLC Java Bindings
 #######################################################################
 
-if BUILD_JAVA
+#SUBDIRS= src
+DIST_SUBDIRS = src
+
+EXTRA_DIST= \
+           FAQ \
+           TODO \
+           README \
+           THANKS \
+           javadoc.xml \
+           VlcClient.java \
+           VLCExample.java
+
+
+EXTRA_DIST+= \
+       org/videolan/jvlc/AudioIntf.java \
+       org/videolan/jvlc/Audio.java \
+       org/videolan/jvlc/GenericVideoWidget.java \
+       org/videolan/jvlc/InputIntf.java \
+       org/videolan/jvlc/Input.java \
+       org/videolan/jvlc/JLibVLC.java \
+       org/videolan/jvlc/JVLCCanvas.java \
+       org/videolan/jvlc/JVLC.java \
+       org/videolan/jvlc/JVLCPanel.java \
+       org/videolan/jvlc/PlaylistIntf.java \
+       org/videolan/jvlc/Playlist.java \
+       org/videolan/jvlc/VideoIntf.java \
+       org/videolan/jvlc/Video.java \
+       org/videolan/jvlc/VLCException.java \
+       org/videolan/jvlc/VLMIntf.java \
+       org/videolan/jvlc/VLM.java 
 
 OBJECTS = org/videolan/jvlc/VLCException.class org/videolan/jvlc/Playlist.class org/videolan/jvlc/AudioIntf.class org/videolan/jvlc/Audio.class org/videolan/jvlc/InputIntf.class org/videolan/jvlc/Input.class org/videolan/jvlc/PlaylistIntf.class org/videolan/jvlc/VideoIntf.class org/videolan/jvlc/Video.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/VLM.class  org/videolan/jvlc/GenericVideoWidget.class
 
+
 COBJECTS = src/utils.o src/video-jni.o src/audio-jni.o src/input-jni.o src/playlist-jni.o src/vlm-jni.o src/core-jni.o src/graphics-jni.o
 
+if BUILD_JAVA
 # Include some JAVA stuff
 PROCESSOR_FAMILY = `uname -m | sed -e 's/^i.86/i386/' | sed -e 's/^x86_64/amd64/'`
 
@@ -16,13 +47,13 @@ JINCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32
 LIBJINCLUDES = -L${JAVA_HOME}/lib -ljawt
 JCH = javah
 JAVACXXFLAGS = `top_builddir=../.. ../../vlc-config --cflags pic` -I../../ -I ../../include $(JINCLUDES)
-JAVALDFLAGS = -mno-cygwin -L../../src -lvlc `top_builddir=../.. ../../vlc-config --libs builtin vlc pic` -Wl,--kill-at
+JAVALDFLAGS = -mno-cygwin -L../../src -lvlc -lvlc-control `top_builddir=../.. ../../vlc-config --libs builtin vlc pic external` -Wl,--kill-at
 else
 JINCLUDES = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
 LIBJINCLUDES = -L$(JAVA_HOME)/jre/lib/$(PROCESSOR_FAMILY) -ljawt
 JCH = gcjh -jni
 JAVACXXFLAGS = `top_builddir=../.. ../../vlc-config --cflags pic` -I../../ -I ../../include $(JINCLUDES)
-JAVALDFLAGS = -L../../src -lvlc `top_builddir=../.. ../../vlc-config --libs builtin vlc pic`
+JAVALDFLAGS = -L../../src -lvlc -lvlc-control `top_builddir=../.. ../../vlc-config --libs builtin vlc pic external`
 endif
 
 export JINCLUDES
@@ -46,11 +77,17 @@ VlcClient: $(OBJECTS)
 VLCExample: $(OBJECTS)
        $(JAVAC) VLCExample.java
 
-.java.class:
+if HAVE_WIN32
+%.class: %.java 
+       $(JAVAC) $? 
+       $(JCH) org.videolan.jvlc.$(*F)
+else
+%.class: %.java
        $(JAVAC) $?
-       $(JCH) org/videolan/jvlc/$$(basename $*) -o includes/$$(basename $*).h
+       $(JCH) $(@D)/$(*F) -o includes/$(*F).h
+endif
 
 clean-local:
-       rm -f *.class *~ org/videolan/jvlc/*.class org_videolan*.h *.so *.o *.dll
+       rm -f *.class *~ org/videolan/jvlc/*.class org_videolan*.h includes/*.h src/*.o *.so *.o *.dll
 
 endif