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

diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index 13f6428204..d3afc037a7 100644
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -2,44 +2,67 @@
 # VLC Java Bindings
 #######################################################################
 
-if BUILD_JAVA
+SUBDIRS= . src
 
-OBJECTS = org/videolan/jvlc/JVLCNoSuchVariableNameException.class org/videolan/jvlc/JVLCBoolVariable.class org/videolan/jvlc/JVLCIntVariable.class org/videolan/jvlc/JVLCTimeVariable.class org/videolan/jvlc/JVLCVarValue.class org/videolan/jvlc/JVLCVariable.class org/videolan/jvlc/JVLCFloatVariable.class org/videolan/jvlc/JVLCStringVariable.class org/videolan/jvlc/JVLCVarVariable.class org/videolan/jvlc/JVLC.class org/videolan/jvlc/JVLCCanvas.class
+EXTRA_DIST= \
+	    FAQ \
+	    TODO \
+	    README \
+	    THANKS \
+	    javadoc.xml \
+	    VlcClient.java \
+	    VLCExample.java
 
-JNIHEADERS = org/videolan/jvlc/JVLCNoSuchVariableNameException.h org_videolan_jvlc_JVLCBoolVariable.h org_videolan_jvlc_JVLCFloatVariable.h org_videolan_jvlc_JVLC.h org_videolan_jvlc_JVLCIntVariable.h org_videolan_jvlc_JVLCStringVariable.h org_videolan_jvlc_JVLCTimeVariable.h org_videolan_jvlc_JVLCVariable.h org_videolan_jvlc_JVLCVarValue.h org_videolan_jvlc_JVLCVarVariable.h org_videolan_jvlc_JVLCCanvas.h
+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 \
+	org/videolan/jvlc/listener/VolumeListener.java 
 
-# Include some JAVA stuff
-JINCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux
-LIBJINCLUDES = -L${JAVA_HOME}/jre/lib/i386 -ljawt
+if BUILD_JAVA
 
-# Binaries
-JCC = gcj -g
-JCH = gcjh -jni
+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
 
-# Compile flags
-CXXFLAGS += `top_builddir=../.. ../../vlc-config --cflags pic` -I../../ -I ../../include ${JINCLUDES}
-LDFLAGS += -L../../lib -lvlc_pic `top_builddir=../.. ../../vlc-config --libs builtin vlc pic`
+PROCESSOR_FAMILY = `uname -m | sed -e 's/^i.86/i386/' | sed -e 's/^x86_64/amd64/'`
 
-# Build targets
-all: libjvlc.so VlcClient
+if HAVE_WIN32
+JINCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32
+LIBJINCLUDES = -L${JAVA_HOME}/lib -ljawt
+else
+JINCLUDES = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+LIBJINCLUDES = -L$(JAVA_HOME)/jre/lib/$(PROCESSOR_FAMILY) -ljawt
+endif
 
-libjvlc.so: vlc-glue-jni.o vlc-graphics-jni.o
-	$(CXX) -shared vlc-glue-jni.o vlc-graphics-jni.o $(LIBJINCLUDES) ${LDFLAGS} -o libjvlc.so
+export JINCLUDES
+export LIBJINCLUDES
 
-vlc-graphics-jni.o: VlcClient
-	$(CXX) -c vlc-graphics-jni.cc $(CXXFLAGS)
+# Build targets
 
-vlc-glue-jni.o: VlcClient
-	$(CXX) -c vlc-glue-jni.cc $(CXXFLAGS)
+%.class: %.java
+	$(JAVAC) $?
 
 VlcClient: $(OBJECTS)
-	$(JCC) -C VlcClient.java
+	$(JAVAC) VlcClient.java
 
-%.class: %.java
-	$(JCC) -C $?
-	$(JCH) org/videolan/jvlc/$(*F)
+VLCExample: $(OBJECTS)
+	$(JAVAC) VLCExample.java
+
+all-am: VlcClient VLCExample
 
-clean:
-	rm -f *.class *~ org/videolan/jvlc/*.class org_videolan*.h *.so *.o
+clean-local:
+	rm -f *.class *~ org/videolan/jvlc/*.class src/*.o *.so *.o *.dll
 
 endif