From a0fb646ab981b00d6d59eae67d86613eeeaf54b6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org>
Date: Mon, 27 Feb 2006 20:59:08 +0000
Subject: [PATCH] Work-around libtool's work-around which adds .exe on Cygwin

---
 activex/Makefile.am | 2 ++
 bootstrap           | 4 ++++
 mozilla/Makefile.am | 2 ++
 src/Makefile.am     | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 758ba6aa35..cf605b545c 100644
--- 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 7cb2ce94c9..72acfcd242 100755
--- 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 d61b6ae9b9..8581f894b3 100644
--- 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 9e1092aad3..4d174c2ce3 100644
--- 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 += \
-- 
2.39.2