X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=fb76cd21fb18d2fe8f48c96ba7b74567ead08442;hb=775ebb8f00a51d6599cb2595d9a7a0bf28155002;hp=d0f728936cd5a656e4910dab5e05e0bd97fb7c21;hpb=44ab7b524359f1e495af8b8ffdb14071baf4fb8d;p=vlc diff --git a/Makefile.am b/Makefile.am index d0f728936c..fb76cd21fb 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 \ @@ -143,7 +144,7 @@ HEADERS_include = \ src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in vlc-config srcdir=$(srcdir) $(srcdir)/toolbox --update-includes - touch src/misc/modules_builtin.h + touch $@ src/misc/modules.c: src/misc/modules_builtin.h @@ -193,6 +194,9 @@ EXTRA_DIST += \ extras/MacOSX/Resources/English.lproj/SFilters.nib/classes.nib \ extras/MacOSX/Resources/English.lproj/SFilters.nib/info.nib \ extras/MacOSX/Resources/English.lproj/SFilters.nib/keyedobjects.nib \ + extras/MacOSX/Resources/English.lproj/Update.nib/classes.nib \ + extras/MacOSX/Resources/English.lproj/Update.nib/info.nib \ + extras/MacOSX/Resources/English.lproj/Update.nib/keyedobjects.nib \ extras/MacOSX/Resources/English.lproj/InfoPlist.strings \ extras/MacOSX/Resources/a52.icns \ extras/MacOSX/Resources/aac.icns \ @@ -297,8 +301,8 @@ dist-hook: bin_SCRIPTS = vlc-config vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in - $(SHELL) ./config.status --file=vlc-config - chmod 0755 vlc-config + $(SHELL) ./config.status --file=$@ + chmod 0755 $@ vlc-config.in: vlc-config.in.in ./config.status --recheck @@ -307,13 +311,11 @@ MOSTLYCLEANFILES = $(DATA_noinst_libvlc) CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile +lib_LIBRARIES = lib/libvlc.a $(lib_PICLIBRARIES) if HAVE_WIN32 -lib_LIBRARIES = lib/libvlc.a else -lib_LIBRARIES = lib/libvlc.a if BUILD_PIC -lib_LIBRARIES += lib/libvlc_pic.a -else +lib_PICLIBRARIES = lib/libvlc_pic.a endif endif @@ -468,13 +470,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 \ @@ -819,7 +825,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"; \ @@ -845,9 +851,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" ; \ @@ -878,17 +881,34 @@ package-win32-base: mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images" mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/js" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/dialogs" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/vlm" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin" cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ; cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ; cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-${VERSION}/http/js/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/js/*.js ; + cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-${VERSION}/http/dialogs/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/* ; cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ; cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/ cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ; + cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ; + cp $(srcdir)/share/http/old/*.ico $(top_builddir)/vlc-${VERSION}/http/old/ ; + cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ; + cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ; + cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ; + cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http/old/admin/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/old/admin/*.html ; + cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ; mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla" @@ -908,22 +928,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 @@ -981,17 +1006,34 @@ package-wince-base: mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images" mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/js" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/dialogs" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/vlm" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin" cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ; cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ; - cp $(srcdir)/share/http/*.js $(top_builddir)/vlc-${VERSION}/http/ ; - unix2dos $(top_builddir)/vlc-${VERSION}/http/*.js ; + cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-${VERSION}/http/js/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/js/*.js ; + cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-${VERSION}/http/dialogs/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/* ; cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ; cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/ cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ; + cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ; + cp $(srcdir)/share/http/old/*.ico $(top_builddir)/vlc-${VERSION}/http/old/ ; + cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ; + cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ; + cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ; + cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http/old/admin/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/old/admin/*.html ; + cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ; if BUILD_MOZILLA @@ -1011,7 +1053,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