make the java bindings compile again (use --disable-libtool in configure)

diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index cde2ba88ac3e6d3d4fc31d583ad2ee8e28f9d2d4..5941caed6d317a362edee5f91ffde0000670337f 100644 (file)
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -2,7 +2,7 @@
 # VLC Java Bindings
 #######################################################################
 
-SUBDIRS= src
+#SUBDIRS= src
 DIST_SUBDIRS = $(SUBDIRS)
 
 EXTRA_DIST= \
@@ -77,11 +77,12 @@ VlcClient: $(OBJECTS)
 VLCExample: $(OBJECTS)
        $(JAVAC) VLCExample.java
 
-.class:
+class: %.java
        $(JAVAC) $?
-       $(JCH) org/videolan/jvlc/$$(basename $*) -o includes/$$(basename $*).h
+       $(JCH) $(@D)/$(*F) -o includes/$(*F).h
+
 
 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

diff --git a/bindings/java/src/Makefile.am b/bindings/java/src/Makefile.am
index 95187505f81e13b01e9f9c7d4bb48fa59656bb4e..2e213874742cc6aeb4a1fe750f9f974021cdde5f 100644 (file)
--- a/bindings/java/src/Makefile.am
+++ b/bindings/java/src/Makefile.am
@@ -13,7 +13,7 @@ EXTRA_DIST= \
 
 if BUILD_JAVA
 
-JAVACXXFLAGS = `top_builddir=../../.. ../../../vlc-config --cflags pic` -I../../ -I ../../include $(JINCLUDES) -c
+JAVACXXFLAGS = `top_builddir=../../.. ../../../vlc-config --cflags pic` -I. -Isrc -I../../ -I ../../include $(JINCLUDES) -c
 
 
 all: $(COBJECTS)

diff --git a/bindings/java/src/core-jni.cc b/bindings/java/src/core-jni.cc
index ee0ba575771341e31bc76170c3d51e32f87c7276..608d3159162a9f8c2e48cc39b5ebda9d1dba6242 100644 (file)
--- a/bindings/java/src/core-jni.cc
+++ b/bindings/java/src/core-jni.cc
@@ -83,7 +83,7 @@ JNIEXPORT void JNICALL Java_org_videolan_jvlc_JVLC__1destroy (JNIEnv *env, jobje
     
     instance = getClassInstance( env, _this );
 
-    libvlc_destroy( (libvlc_instance_t *) instance, NULL );
+    libvlc_destroy( (libvlc_instance_t *) instance, NULL);
 
     return;
 }