Commit cf6397c8 authored by Sam Hocevar's avatar Sam Hocevar

* bindings/java/Makefile.am: use JAVACXXFLAGS and JAVALDFLAGS instead of

    the reserved words CXXFLAGS and LDFLAGS.
  * configure.ac: remove spaces inside parentheses that confuse automake.
  * Makefile.am: do not use both = and += inside conditionals.
parent 5eda7773
......@@ -307,13 +307,11 @@ MOSTLYCLEANFILES = $(DATA_noinst_libvlc)
CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin
DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
lib_LIBRARIES = lib/libvlc.a $(lib_PICLIBRARIES)
if HAVE_WIN32
lib_LIBRARIES = lib/libvlc.a
else
lib_LIBRARIES = lib/libvlc.a
if BUILD_PIC
lib_LIBRARIES += lib/libvlc_pic.a
else
lib_PICLIBRARIES = lib/libvlc_pic.a
endif
endif
......
......@@ -10,8 +10,8 @@ JNIHEADERS = org/videolan/jvlc/JVLCNoSuchVariableNameException.h org_videolan_jv
# Include some JAVA stuff
PROCESSOR_FAMILY = `uname -m | sed -e 's/^i.86/i386/' | sed -e 's/^x86_64/amd64/'`
JINCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux
LIBJINCLUDES = -L${JAVA_HOME}/jre/lib/${PROCESSOR_FAMILY} -ljawt
JINCLUDES = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
LIBJINCLUDES = -L$(JAVA_HOME)/jre/lib/$(PROCESSOR_FAMILY) -ljawt
# Binaries
......@@ -19,20 +19,20 @@ JCC = gcj -g
JCH = gcjh -jni
# 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`
JAVACXXFLAGS = `top_builddir=../.. ../../vlc-config --cflags pic` -I../../ -I ../../include $(JINCLUDES)
JAVALDFLAGS = -L../../lib -lvlc_pic `top_builddir=../.. ../../vlc-config --libs builtin vlc pic`
# Build targets
all: libjvlc.so VlcClient
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
$(CXX) -shared vlc-glue-jni.o vlc-graphics-jni.o $(LIBJINCLUDES) $(LDFLAGS) $(JAVALDFLAGS) -o libjvlc.so
vlc-graphics-jni.o: VlcClient
$(CXX) -c vlc-graphics-jni.cc $(CXXFLAGS)
$(CXX) -c vlc-graphics-jni.cc $(CXXFLAGS) $(JAVACXXFLAGS)
vlc-glue-jni.o: VlcClient
$(CXX) -c vlc-glue-jni.cc $(CXXFLAGS)
$(CXX) -c vlc-glue-jni.cc $(CXXFLAGS) $(JAVACXXFLAGS)
VlcClient: $(OBJECTS)
$(JCC) -C VlcClient.java
......
......@@ -4903,7 +4903,7 @@ dnl
AC_ARG_ENABLE(python-bindings,
[ --enable-python-bindings Enable Python bindings (default disabled)])
dnl TODO: look for python dev headers
AM_CONDITIONAL( BUILD_PYTHON, [test "${enable_python_bindings}" = "yes"] )
AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_python_bindings}" = "yes"])
if test "${enable_python_bindings}" = "yes"
then
build_pic=yes
......@@ -4914,7 +4914,7 @@ dnl Java bindings
dnl
AC_ARG_ENABLE(java-bindings,
[ --enable-java-bindings Enable Java bindings (default disabled)])
AM_CONDITIONAL( BUILD_JAVA, [test "${enable_java_bindings}" = "yes"] )
AM_CONDITIONAL(BUILD_JAVA, [test "${enable_java_bindings}" = "yes"])
if test "${enable_java_bindings}" = "yes"
then
build_pic=yes
......
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