Skip to content

V
vlc
Commit cab9f4b0 authored by Filippo Carone's avatar Filippo Carone
Browse files
Options

Use the right libvlc library extension in java makefile

parent 07330d2b
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
bindings/java/src/Makefile.am
View file @ cab9f4b0
...@@ -13,8 +13,6 @@ libjvlc_la_LIBADD = ../../../src/libvlc-control.la $(LIBJINCLUDES) ...@@ -13,8 +13,6 @@ libjvlc_la_LIBADD = ../../../src/libvlc-control.la $(LIBJINCLUDES)
libjvlc_a_SOURCES=$(libjvlc_la_SOURCES) libjvlc_a_SOURCES=$(libjvlc_la_SOURCES)
libjvlc_a_CPPFLAGS = `$(VLC_CONFIG) --cflags pic` $(JINCLUDES) libjvlc_a_CPPFLAGS = `$(VLC_CONFIG) --cflags pic` $(JINCLUDES)
libjvlc_a_LIBADD = ../../../src/libvlc.a
if BUILD_JAVA if BUILD_JAVA
...@@ -30,6 +28,7 @@ LIBRARIES_libvlc = $(top_builddir)/src/libvlc.dll.a ...@@ -30,6 +28,7 @@ LIBRARIES_libvlc = $(top_builddir)/src/libvlc.dll.a
libjvlc_a_DEPENDENCIES = libjvlc.def $(LIBRARIES_libvlc) libjvlc_a_DEPENDENCIES = libjvlc.def $(LIBRARIES_libvlc)
LDFLAGS_jvlc = `$(VLC_CONFIG) --libs libvlc` LDFLAGS_jvlc = `$(VLC_CONFIG) --libs libvlc`
libjvlc_DATA = jvlc$(LIBEXT) libjvlc_DATA = jvlc$(LIBEXT)
libjvlc_a_LIBADD = ../../../src/libvlc.dll.a
libjvlcdir=$(srcdir) libjvlcdir=$(srcdir)
...@@ -47,6 +46,10 @@ jvlc$(LIBEXT): $(libjvlc_a_OBJECTS) \ ...@@ -47,6 +46,10 @@ jvlc$(LIBEXT): $(libjvlc_a_OBJECTS) \
all: libjvlc.dll.a all: libjvlc.dll.a
else
libjvlc_a_LIBADD = ../../../src/libvlc.a
endif endif
.PHONY: clean-local .PHONY: clean-local
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment