* 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.

diff --git a/Makefile.am b/Makefile.am
index 6a6485bb460a0dd14be591f76b14ff6585855323..12010f09744b33451ca58035cedaeeefdc1e606e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
 

diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index fa1144baf66b59398cfce5ee3e25f3769af35037..06c7e188baaf04f710506187894c51c5a5145712 100644 (file)
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -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

diff --git a/configure.ac b/configure.ac
index 06e2abcf7db50d17e03959e0b72ad7526c40b871..074fed336c8f119e4a39938133a5f87a64385164 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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