more libtool updates, removed some ol' crust

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 47b79bbf50afec564a961a07e316fa8a0167365f..cbfae4c10b659c753bb428ab9aee5767eeb34356 100644 (file)
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -74,13 +74,13 @@ axvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags activex`
 axvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags activex`
 axvlc_la_DEPENDENCIES = axvlc.def $(DATA_axvlc_rc) $(LIBRARIES_libvlc)
 axvlc_la_LDFLAGS = $(srcdir)/axvlc.def -Wl,$(DATA_axvlc_rc) \
-    -no-undefined -avoid-version $(LIBRARIES_libvlc) \
-    `$(VLC_CONFIG) --libs activex libvlc` \
-       -module
+    -no-undefined -avoid-version -module \
+    `$(VLC_CONFIG) --libs activex libvlc`
+axvlc_la_LIBADD = $(LIBRARIES_libvlc)
 
 DATA_axvlc_rc = $(noinst_axvlc_rc_DATA)
 noinst_axvlc_rc_DATA = axvlc_rc.$(OBJEXT)
-noinst_axvlc_rcdir = $(libdir)
+noinst_axvlc_rcdir = 
 axvlc_rc.$(OBJEXT): axvlc_rc.rc inplace.bmp axvlc.tlb
        $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/[^0-9]*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir) -i $< -o $@
 

diff --git a/bootstrap b/bootstrap
index d019670af1fc7030c589624907b6c9b1bb53c145..739ce4b0a84d8dbe95ab501ec4d2025fd2baa281 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -255,7 +255,6 @@ _plugin.la_plugin\$(LIBEXT):
        esac ; \
        echo \$\$ld \$< \$\$ldfl ; \
        \$\$ld \$< \$\$ldfl
-       @if test -f "\$@.exe"; then mv -f -- "\$@.exe" "\$@"; fi
 
 if MAINTAINER_MODE
 \$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap

diff --git a/src/Makefile.am b/src/Makefile.am
index a0e342ae58033e285903be67fdebbf119ff89d15..8e674cba1974d665077fc1666966c0303b67ebb2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -122,15 +122,13 @@ libvlc_la_DEPENDENCIES = libvlc.sym
 libvlc_control_la_SOURCES = $(SOURCES_libvlc_control)
 libvlc_control_la_LIBADD = libvlc.la
 libvlc_control_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
-libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -export-symbols-regex '^_?(libvlc|mediacontrol)_.*' \
-       -version-info 0:0:0
+libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0
 if HAVE_COMPILER_EXPORT
 libvlc_control_la_LDFLAGS += -export-dynamic
 else
 libvlc_control_la_LDFLAGS += -export-symbols-regex '^_?(libvlc|mediacontrol)_.*'
 endif
 
-
 EXTRA_libvlc_la_SOURCES = \
        $(SOURCES_libvlc_beos) \
        $(SOURCES_libvlc_darwin) \