X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bindings%2Fjava%2FMakefile.am;h=d3afc037a7362c14aca697db12742304f76ab6fc;hb=4713a3672c79e4f681f196caf66a541855d86fba;hp=47ddccd0f215150515c84b1a40c064a2267412a0;hpb=d56de48889887ee8ce6a914acda14eb514a950c1;p=vlc

diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index 47ddccd0f2..d3afc037a7 100644
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -2,8 +2,7 @@
 # VLC Java Bindings
 #######################################################################
 
-SUBDIRS= src
-DIST_SUBDIRS = $(SUBDIRS)
+SUBDIRS= . src
 
 EXTRA_DIST= \
 	    FAQ \
@@ -14,7 +13,6 @@ EXTRA_DIST= \
 	    VlcClient.java \
 	    VLCExample.java
 
-
 EXTRA_DIST+= \
 	org/videolan/jvlc/AudioIntf.java \
 	org/videolan/jvlc/Audio.java \
@@ -31,45 +29,30 @@ EXTRA_DIST+= \
 	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
+	org/videolan/jvlc/VLM.java \
+	org/videolan/jvlc/listener/VolumeListener.java 
 
+if BUILD_JAVA
 
-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
+OBJECTS = org/videolan/jvlc/VLM.class 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/JVLCCanvas.class org/videolan/jvlc/Video.class org/videolan/jvlc/JLibVLC.class org/videolan/jvlc/JVLC.class  org/videolan/jvlc/JVLCPanel.class org/videolan/jvlc/VLMIntf.class org/videolan/jvlc/GenericVideoWidget.class org/videolan/jvlc/listener/VolumeListener.class
 
-if BUILD_JAVA
-# Include some JAVA stuff
 PROCESSOR_FAMILY = `uname -m | sed -e 's/^i.86/i386/' | sed -e 's/^x86_64/amd64/'`
 
 if HAVE_WIN32
 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
 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`
 endif
 
 export JINCLUDES
+export LIBJINCLUDES
 
 # Build targets
-all: libjvlc.so VlcClient VLCExample
 
-if HAVE_WIN32
-libjvlc.so: $(OBJECTS)
-	$(MAKE) -C src
-	$(CXX) -shared $(COBJECTS) $(LIBJINCLUDES) $(LDFLAGS) $(JAVALDFLAGS) -o jvlc.dll
-else
-libjvlc.so: $(OBJECTS) 	
-	$(MAKE) -C src
-	$(CXX) -shared $(COBJECTS) $(LIBJINCLUDES) $(LDFLAGS) $(JAVALDFLAGS) -o libjvlc.so
-endif
+%.class: %.java
+	$(JAVAC) $?
 
 VlcClient: $(OBJECTS)
 	$(JAVAC) VlcClient.java
@@ -77,11 +60,9 @@ VlcClient: $(OBJECTS)
 VLCExample: $(OBJECTS)
 	$(JAVAC) VLCExample.java
 
-.java.class:
-	$(JAVAC) $?
-	$(JCH) org/videolan/jvlc/$$(basename $*) -o includes/$$(basename $*).h
+all-am: VlcClient VLCExample
 
 clean-local:
-	rm -f *.class *~ org/videolan/jvlc/*.class org_videolan*.h *.so *.o *.dll
+	rm -f *.class *~ org/videolan/jvlc/*.class src/*.o *.so *.o *.dll
 
 endif