Add mediacontrol_exception_cleanup() consistent with mediacontrol_exception_init().

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 43c0b59d3ba557a5475c31e2a1822680aa893c07..6b7ef7427b5eada4708d7341630005db0c8ea1aa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -246,10 +246,10 @@ vlc_SOURCES = src/vlc.c
 # Ugly kludge so that automake defines $(CXXLINK)
 nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m
 
-vlc_DEPENDENCIES = $(LIBVLC) $(DATA_win32_rc)
+vlc_DEPENDENCIES = $(DATA_win32_rc)
 
-vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL)
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
+vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc`
+vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
 if !HAVE_PLUGINS
 vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'`
 endif
@@ -268,13 +268,10 @@ nice:
 libvlc:
        cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
 
-core: libvlc
-       $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
+core: libvlc vlc$(EXEEXT)
 
 .PHONY: libvlc core
 
-src/$(LIB_libvlc): libvlc
-
 vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
        @rm -f vlc$(EXEEXT)
        @case `$(VLC_CONFIG) --linkage vlc builtin` in \
@@ -765,7 +762,7 @@ package-win32-base-exe: package-win32-base
            MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=${VERSION}"; \
        elif [ -x "${PROGRAMFILES}/NSIS/makensis" ]; then \
            MAKENSIS="${PROGRAMFILES}/NSIS/makensis -DVERSION=${VERSION}"; \
-       elif wine --version >dev/null 2>&1; then \
+       elif wine --version >/dev/null 2>&1; then \
            MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=${VERSION}"; \
        else \
            echo 'Error: cannot locate makensis tool'; exit 1; \