From b8241217349ed3bc1e8bc921cb676a36eb3f40c2 Mon Sep 17 00:00:00 2001
From: Filippo Carone <littlejohn@videolan.org>
Date: Fri, 9 Mar 2007 22:31:24 +0000
Subject: [PATCH] libjvlc.dll is created when crosscompiling

---
 bindings/java/Makefile.am     |  2 +-
 bindings/java/src/Makefile.am | 20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index ce6bf54df2..d9afa2f1ff 100644
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -39,7 +39,7 @@ 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}/jre/bin -lawt
+LIBJINCLUDES = -L${JAVA_HOME}/lib -ljawt
 JCH = javah
 else
 JINCLUDES = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
diff --git a/bindings/java/src/Makefile.am b/bindings/java/src/Makefile.am
index 2a2d254afc..c05ac9ec85 100644
--- a/bindings/java/src/Makefile.am
+++ b/bindings/java/src/Makefile.am
@@ -26,11 +26,25 @@ endif
 
 if HAVE_WIN32
 DATA_noinst_libjvlc = libjvlc$(LIBEXT) libjvlc$(LIBEXT).a
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc.dll.a
+libjvlc_a_DEPENDENCIES = libjvlc.def $(LIBRARIES_libvlc)
+LDFLAGS_jvlc = `$(VLC_CONFIG) --libs libvlc`
+libjvlc_DATA = libjvlc$(LIBEXT)
 
-libjvlc.dll.a libjvlc.def: libjvlc$(LIBEXT)
-	$(DLLTOOL) -z libjvlc.def -l libjvlc.dll.a -D $< $(libjvlc_a_OBJECTS)
+libjvlcdir=$(srcdir)
+
+#libjvlc.dll.a libjvlc.def: libjvlc$(LIBEXT)
+#	$(DLLTOOL) -z libjvlc.def -l libjvlc.dll.a -D $< $(libjvlc_a_OBJECTS)
+
+libjvlc$(LIBEXT): $(libjvlc_a_OBJECTS) \
+                      $(libjvlc_a_DEPENDENCIES)
+		  $(CXXLINK) $(libjvlc_a_OBJECTS) \
+		        $(srcdir)/libjvlc.def \
+		        $(LIBRARIES_libvlc) -shared $(LIBRARIES_libvlc) $(LIBJINCLUDES) $(LDFLAGS_jvlc) \
+		        $(INCLUDED_LIBINTL)
+# Cygwin work-around, copied by other makefiles
+			@if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
 
-libjvlc$(LIBEXT): $(libjvlc_a_OBJECTS)
 
 all: libjvlc.dll.a
 endif
-- 
2.39.2