X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=5d3ae03b86ebe1bd47a7b881f6a13acd9af29ff3;hb=2eb7e0f4674bb6393bf9c913f8896dbf67d9cd91;hp=a2aeadc89ba98bfd349145db5d25a5d668429544;hpb=8dc4f35af4a1b633fa8d23a100f9ed5d288a276d;p=vlc

diff --git a/Makefile.am b/Makefile.am
index a2aeadc89b..5d3ae03b86 100644
--- 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,16 @@ 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/input.c \
+	src/control/video.c \
 	src/control/mediacontrol_core.c \
 	src/control/mediacontrol_util.c \
 	src/control/mediacontrol_audio_video.c \
@@ -817,7 +821,7 @@ remove_distdir_woody = \
 # XXX: this rule is probably only useful to you if you have exactly
 # the same setup as me. Contact sam@zoy.org if you need to use it.
 #
-package-win32-base:
+package-win32-base-debug:
 # Check that tmp isn't in the way
 	@if test -e "$(top_builddir)/vlc-${VERSION}"; then \
 	  echo "Error: please remove $(top_builddir)/vlc-${VERSION}, it is in the way"; \
@@ -843,9 +847,6 @@ package-win32-base:
             "$(top_builddir)/vlc-${VERSION}/plugins/" ; \
 	  fi ; done
 
-	for i in "" $(top_builddir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \
-	  do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
-
 	mkdir $(top_builddir)/vlc-${VERSION}/locale
 	for i in $(ALL_LINGUAS); do \
 	  mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \
@@ -923,22 +924,27 @@ if BUILD_ACTIVEX
 	$(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
 endif
 # Rebase all those DLLs to speed up loading (need cygwin rebase)
-	if [ -x rebase ]; then \
+	if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \
 		find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
 	fi
 
+package-win32-base: package-win32-base-debug
+	for i in "" $(top_builddir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \
+	  do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
+
+
 package-win32-base-exe:
 # Create package
-	if [ -x makensis ]; then \
-	    MAKENSIS=makensis; \
+	if makensis -VERSION >/dev/null 2>&1; then \
+	    MAKENSIS="makensis -DVERSION=${VERSION}"; \
 	elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
-	    MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis"; \
-	elif [ -x wine ]; then \
-	    MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe"; \
+	    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 /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
@@ -1043,7 +1049,7 @@ if BUILD_ACTIVEX
 	$(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
 endif
 # Rebase all those DLLs to speed up loading (need cygwin rebase)
-	if [ -x rebase ]; then \
+	if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \
 		find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
 	fi