all: renamed DLL import library as libvlc.dll.a, as this is what mingw/cygwin ld...

diff --git a/Makefile.am b/Makefile.am
index ba4aaa2e4c549578c72226f63fec138b45281401..17dff0dd98fabf437d35a0fc902891b491cc74d8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -230,12 +230,12 @@ vlc_LDADD = $(DATA_win32_rc) $(INCLUDED_LIBINTL)
 DEPENDENCIES_vlc = $(LIB_libvlc) $(DATA_win32_rc)
 
 if BUILD_SHARED
+vlc_LDFLAGS += `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -L$(top_builddir)/src -lvlc
 if HAVE_WIN32
-vlc_LDFLAGS += `$(VLC_CONFIG) --libs vlc` -L$(top_builddir)/src -lvlc-dll
+LIB_libvlc = src/libvlc.dll.a
 else
-vlc_LDFLAGS += `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -Lsrc -lvlc
-endif
 LIB_libvlc = src/libvlc$(LIBEXT)
+endif
 else
 vlc_LDFLAGS += `$(VLC_CONFIG) --libs vlc builtin`
 vlc_LDADD += $(LIB_libvlc)

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 505d8fd2c632d1c2cb44ccad7566e3b9d804c04a..1fa2bf6959db1683459ee7c8fc8c15b7d122a68d 100644 (file)
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -60,7 +60,7 @@ DIST_misc = \
     $(NULL)
 
 if BUILD_SHARED
-LIBRARIES_libvlc = $(top_builddir)/src/libvlc-dll.a
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc.dll.a
 else
 LIBRARIES_libvlc = $(top_builddir)/src/libvlc.a
 endif

diff --git a/src/Makefile.am b/src/Makefile.am
index f1e527bc8b1a7883846ba3c287ed5dd66ad9cfdf..855022f5992718760f72a9f92943619740eb8085 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -188,7 +188,7 @@ if BUILD_SHARED
 DATA_noinst_libvlc = libvlc$(LIBEXT)
 if HAVE_WIN32
 OBJECTS_libvlc_so = $(libvlc_a_OBJECTS)
-LDFLAGS_libvlc_so = -Wl,--out-implib,$(top_builddir)/lib/libvlc-dll.a
+LDFLAGS_libvlc_so = -Wl,--out-implib,$(top_builddir)/src/libvlc.dll.a
 else
 OBJECTS_libvlc_so = $(libvlc_pic_a_OBJECTS)
 endif