mkv.cpp: fix most memory leaks

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 58f743adcb530feb2ff5a1a8b8658313b1b1df58..739a95f77b3f33d39fcfee99d375f50d5dbffd43 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -417,15 +417,15 @@ bin_PROGRAMS = vlc
 
 vlc_SOURCES = src/vlc.c
 
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin`
-vlc_LDADD = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
-vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-
 # Work around a bug in the arm-wince-pe linker
 if HAVE_WINCE
-vlc_LDFLAGS += lib/libvlc.a
+vlc_WORKAROUNDLDFLAGS = lib/libvlc.a
 endif
 
+vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin` $(vlc_WORKAROUNDLDFLAGS)
+vlc_LDADD = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
+vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
+
 # We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
 # old automake-1.5 bug (automake/279).
 DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)