Remove white characters at begining and end of element values.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 55522724e17ee797d51caa57985460cd4cf954aa..1317d7358b9a5385f4bc6a18f90a6a462c804dbb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,6 +131,7 @@ HEADERS_include = \
        include/vlc_symbols.h \
        include/vlc_threads_funcs.h \
        include/vlc_threads.h \
+       include/vlc_update.h \
        include/vlc_video.h \
        include/vlc_vlm.h \
        include/vlc_vod.h \
@@ -466,13 +467,17 @@ SOURCES_libvlc_common = \
        src/misc/objects.c \
        src/misc/variables.c \
        src/misc/error.c \
+       src/misc/update.c \
        src/misc/vlm.c \
        src/misc/xml.c \
+       src/misc/hashtables.c \
        src/misc/version.c \
        src/extras/libc.c \
        src/control/core.c \
        src/control/playlist.c \
+       src/control/vlm.c \
        src/control/input.c \
+       src/control/video.c \
        src/control/mediacontrol_core.c \
        src/control/mediacontrol_util.c \
        src/control/mediacontrol_audio_video.c \
@@ -932,15 +937,15 @@ package-win32-base: package-win32-base-debug
 package-win32-base-exe:
 # Create package
        if makensis -VERSION >/dev/null 2>&1; then \
-           MAKENSIS=makensis; \
+           MAKENSIS="makensis -DVERSION=${VERSION}"; \
        elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
-           MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis"; \
+           MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=${VERSION}"; \
        elif wine --version >dev/null 2>&1; then \
-           MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe"; \
+           MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=${VERSION}"; \
        else \
            echo 'Error: cannot locate makensis tool'; exit 1; \
        fi; \
-       eval "$$MAKENSIS /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi"
+       eval "$$MAKENSIS $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi"
 
 package-win32-base-exe-cygwin: package-win32-base-exe
 # Create package