Revert "Call XInitThreads early enough"

[vlc] / bin / Makefile.am

diff --git a/bin/Makefile.am b/bin/Makefile.am
index eb92663503afddc43e3cc33ee070b026161b225b..db5aaaecc458eb2101f8e2884dd636eb79824492 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -24,18 +24,21 @@ endif
 
 vlc_wrapper_SOURCES = rootwrap.c
 
-vlc_DEPENDENCIES = ../src/libvlc.la
-
+vlc_DEPENDENCIES = ../src/libvlc.sym
 vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
 vlc_LDADD = ../src/libvlc.la `$(VLC_CONFIG) -libs vlc`
 
 vlc_static_SOURCES = $(vlc_SOURCES)
+vlc_static_CFLAGS = $(AM_CFLAGS) \
+       -DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" \
+       -DTOP_SRCDIR=\"$$(cd "$(top_srcdir)"; pwd)\" \
+       $(NULL)
 vlc_static_DEPENDENCIES = $(vlc_DEPENDENCIES)
 vlc_static_LDADD = $(vlc_LDADD)
 vlc_static_LDFLAGS = $(vlc_LDFLAGS) -no-install -static
 
 if HAVE_WIN32
-vlc_LDADD += vlc_win32_rc.$(OBJEXT)
+vlc_LDADD += -lwininet vlc_win32_rc.$(OBJEXT)
 vlc_DEPENDENCIES += vlc_win32_rc.$(OBJEXT)
 endif