Win32 crashdump: typo

[vlc] / bin / Makefile.am

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 33491a7a4c35d5bd946a3fccbb7d6c58baefdda0..db5aaaecc458eb2101f8e2884dd636eb79824492 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,33 +1,44 @@
 # Building vlc
 #
 bin_PROGRAMS = vlc
+noinst_PROGRAMS = vlc-static
 EXTRA_PROGRAMS = vlc-wrapper
 
+AM_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
+
+
 if !HAVE_WIN32
+if !HAVE_WINCE
 bin_PROGRAMS += vlc-wrapper
+vlc_SOURCES = vlc.c
+endif
 endif
 
 EXTRA_vlc_SOURCES = vlc.c winvlc.c
-if !HAVE_WIN32
-vlc_SOURCES = vlc.c
-else
+if HAVE_WIN32
+vlc_SOURCES = winvlc.c
+endif
+if HAVE_WINCE
 vlc_SOURCES = winvlc.c
 endif
-vlc_wrapper_SOURCES = rootwrap.c
 
-vlc_DEPENDENCIES = ../src/libvlc.la
+vlc_wrapper_SOURCES = rootwrap.c
 
-vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
+vlc_DEPENDENCIES = ../src/libvlc.sym
 vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
-# vlc needs libvlccore for locale conversion
-vlc_LDADD = ../src/libvlc.la ../src/libvlccore.la $(LTLIBINTL) \
-       `$(VLC_CONFIG) -libs vlc`
+vlc_LDADD = ../src/libvlc.la `$(VLC_CONFIG) -libs vlc`
 
-#vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
-#      $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)
+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