mv -> mv -f

[vlc] / activex / Makefile.am

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 6d72ab7d9f0cb8c2e860f5c73d340bd75725a8dc..7d88e355d3a2582a49c8a929bd8ab26023b951e0 100644 (file)
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -59,7 +59,11 @@ DIST_misc = \
     test.html \
     $(NULL)
 
-LIBRARIES_libvlc = $(top_builddir)/lib/libvlc.a
+if BUILD_SHARED
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc.dll.a
+else
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc.a
+endif
 
 if BUILD_ACTIVEX
 
@@ -78,7 +82,10 @@ axvlc$(LIBEXT): $(libaxvlc_a_OBJECTS) \
                      $(libaxvlc_a_DEPENDENCIES) stamp-pic
        $(CXXLINK) $(libaxvlc_a_OBJECTS) $(DATA_axvlc_rc) \
        -Wl,--enable-stdcall-fixup $(srcdir)/axvlc.def \
-         $(LIBRARIES_libvlc) -shared $(LDFLAGS_activex) $(LIBRARIES_libvlc) 
+         $(LIBRARIES_libvlc) -shared $(LIBRARIES_libvlc) $(LDFLAGS_activex) \
+         $(INCLUDED_LIBINTL)
+# Cygwin work-around
+       @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
 
 
 DATA_axvlc_tlb = $(axvlc_tlb_DATA)