* ./bootstrap, ./Makefile.am: we don't build static libraries if their only

    goal is to provide dependencies for shared libraries.

diff --git a/Makefile.am b/Makefile.am
index 2d7587ecebb9faf4c3427bbcbed65421892792de..52351af8a3abdadcf338a081659e796aaea78bb4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -446,25 +446,27 @@ SOURCES_mozilla_unix = mozilla/npunix.c
 endif
 
 if BUILD_MOZILLA
-noinst_LIBRARIES_mozilla = mozilla/libvlcplugin.a
-
-mozilla_libvlcplugin_a_SOURCES = $(SOURCES_mozilla) $(BUILT_SOURCES_mozilla) \
-                                 $(SOURCES_libgetopt)
-mozilla_libvlcplugin_a_CFLAGS = $(CPPFLAGS_pic) $(CFLAGS_pic) \
-                                $(CPPFLAGS_mozilla) $(CFLAGS_mozilla) \
-                                $(CPPFLAGS_mozilla_EXTRA)
-mozilla_libvlcplugin_a_CXXFLAGS = $(CPPFLAGS_pic) $(CXXFLAGS_pic) \
-                                  $(CPPFLAGS_mozilla) $(CXXFLAGS_mozilla) \
-                                  $(CPPFLAGS_mozilla_EXTRA)
-mozilla_libvlcplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(L_builtin_pic) $(DATA_npvlc_rc)
+if UNTRUE
+noinst_LIBRARIES_mozilla = mozilla/libplugin.a
+endif
+
+mozilla_libplugin_a_SOURCES = $(SOURCES_mozilla) $(BUILT_SOURCES_mozilla) \
+                              $(SOURCES_libgetopt)
+mozilla_libplugin_a_CFLAGS = $(CPPFLAGS_pic) $(CFLAGS_pic) \
+                             $(CPPFLAGS_mozilla) $(CFLAGS_mozilla) \
+                             $(CPPFLAGS_mozilla_EXTRA)
+mozilla_libplugin_a_CXXFLAGS = $(CPPFLAGS_pic) $(CXXFLAGS_pic) \
+                               $(CPPFLAGS_mozilla) $(CXXFLAGS_mozilla) \
+                               $(CPPFLAGS_mozilla_EXTRA)
+mozilla_libplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(L_builtin_pic) $(DATA_npvlc_rc)
 
 BUILT_SOURCES_mozilla = mozilla/vlcintf.h
 $(SOURCES_mozilla): mozilla/vlcintf.h
 
 mozilla_plugin_DATA = $(LIBRARIES_mozilla)
 mozilla_plugindir = $(libdir)/mozilla/plugins
-$(LIBRARIES_mozilla): mozilla/libvlcplugin.a $(L_builtin_pic)
-       $(CXXLINK) -o $@ $(mozilla_libvlcplugin_a_OBJECTS) $(DATA_npvlc_rc) \
+$(LIBRARIES_mozilla): $(mozilla_libplugin_a_OBJECTS) $(L_builtin_pic)
+       $(CXXLINK) -o $@ $(mozilla_libplugin_a_OBJECTS) $(DATA_npvlc_rc) \
                lib/libvlc_pic.a $(L_builtin_pic) -shared $(LDFLAGS) \
                $(LDFLAGS_vlc) $(LDFLAGS_mozilla) $(LDFLAGS_builtin_pic)
 

diff --git a/bootstrap b/bootstrap
index 07cba450cff3fe85a92c27067fb7b739d8c8a697..fa29a3ba3c0bd60c13db5b3773d2fb4dbf5d7719 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  bootstrap file for vlc, the VideoLAN Client
-##  $Id: bootstrap,v 1.19 2002/10/16 15:10:38 sam Exp $
+##  $Id: bootstrap,v 1.20 2002/10/25 09:24:29 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -107,7 +107,9 @@ EOF
 # The ${mod} plugin
 
 if ${mod}_plugin
+if UNTRUE
 L_${mod}_p = ${dir}/lib${mod}_plugin.a
+endif
 D_${mod}_p = ${dir}/lib${mod}_plugin\$(LIBEXT)
 ${NODIST}B_${mod}_p = \$(nodist_SOURCES_${mod})
 endif
@@ -160,6 +162,7 @@ EOF
   done
 done
 
+echo "AM_CONDITIONAL(UNTRUE, false)" >> configure.ac
 sed -n -e '/dnl do not touch this line/,//p' < configure.ac.in >> configure.ac
 
 echo "done."