Work-around libtool's work-around which adds .exe on Cygwin

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 758ba6aa3555f3f8796c668ae333622364ccd4b7..cf605b545c76bb5f806fee2d3ee7f1e41507e4e1 100644 (file)
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -84,6 +84,8 @@ axvlc$(LIBEXT): $(libaxvlc_a_OBJECTS) \
        -Wl,--enable-stdcall-fixup $(srcdir)/axvlc.def \
          $(LIBRARIES_libvlc) -shared $(LIBRARIES_libvlc) $(LDFLAGS_activex) \
          $(INCLUDED_LIBINTL)
+# Cygwin work-around
+       @if test -f "$@.exe"; then mv "$@.exe" "$@"; fi
 
 
 DATA_axvlc_tlb = $(axvlc_tlb_DATA)

diff --git a/bootstrap b/bootstrap
index 7cb2ce94c9ad3be6907ab83be2eac56ac212159f..72acfcd242a6f709a569c972200aaaebc8861834 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -259,6 +259,10 @@ _plugin.a_plugin\$(LIBEXT):
        esac ; \
        echo \$\$ld \$< \$\$ldfl ; \
        \$\$ld \$< \$\$ldfl
+#ifneq (,\$(findstring cygwin,\$(host)))
+#      mv "$@.exe" "$@"
+#endif
+       @if test -f "$@.exe"; then mv "$@.exe" $@; fi
 
 if MAINTAINER_MODE
 \$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap

diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am
index d61b6ae9b90f739f5dff169da37b16de49722b1d..8581f894b3c9c3789fa87915af515dc8e77f3dfd 100644 (file)
--- a/mozilla/Makefile.am
+++ b/mozilla/Makefile.am
@@ -128,6 +128,8 @@ libnpvlc_a_DEPENDENCIES = $(DATA_npvlc_rc)
 $(npvlc): $(libnpvlc_a_OBJECTS) $(libnpvlc_a_DEPENDENCIES) stamp-pic
        $(CXXLINK) $(libnpvlc_a_OBJECTS) $(DATA_npvlc_rc) \
         $(LDFLAGS_libnpvlc)
+# Cygwin work-around
+       @if test -f "$@.exe"; then mv "$@.exe" "$@"; fi
 
 vlcintf_xptdir = $(libdir)/mozilla/components
 vlcintf.xpt: vlcintf.idl

diff --git a/src/Makefile.am b/src/Makefile.am
index 9e1092aad3e71f408386b960ee715199dee0b401..4d174c2ce3a8445e31581ef9c16190773dab559f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -212,6 +212,8 @@ libvlc$(LIBEXT): $(OBJECTS_libvlc_so) stamp-builtins
 # on non-PIC OSes, otherwise ld will favor builtins-less libvlc.a over
 # libvlc$(LIBEXT)
        rm -f libvlc.a
+# Cygwin work-around
+       @if test -f "$@.exe"; then mv "$@.exe" "$@"; fi
 endif
 
 EXTRA_DIST += \