X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=6306d6604085518dfd4250777cb01d41331ed43b;hb=67d1feb22b415343372c5ab100b9fd17aaf0c8dc;hp=bc807bb904f89f7565c88b9c6285d0b91fa9502c;hpb=55f877f08dfd49f95ae5fd916d0a9162adcb59d4;p=vlc diff --git a/Makefile.am b/Makefile.am index bc807bb904..6306d66040 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,9 +33,10 @@ EXTRA_DIST = \ src/misc/modules_builtin.h.in \ $(NULL) -BUILT_SOURCES_distclean = vlc-config +BUILT_SOURCES_distclean = vlc-config compile BUILT_SOURCES_clean = \ stamp-api \ + macosx-sdk \ src/misc/modules_builtin.h \ src/misc/version.c \ $(NULL) @@ -62,14 +63,15 @@ pkgincludedir = $(includedir)/vlc dist_pkginclude_HEADERS = \ include/vlc/vlc.h \ + include/vlc/libvlc.h \ include/vlc/aout.h \ include/vlc/vout.h \ include/vlc/sout.h \ include/vlc/decoder.h \ include/vlc/input.h \ include/vlc/intf.h \ - include/vlc/control.h \ - include/vlc/control_structures.h \ + include/vlc/mediacontrol.h \ + include/vlc/mediacontrol_structures.h \ $(NULL) noinst_HEADERS = $(HEADERS_include) @@ -135,6 +137,8 @@ HEADERS_include = \ include/vlc_xml.h \ include/vout_synchro.h \ include/win32_specific.h \ + include/libvlc_internal.h \ + include/mediacontrol_internal.h $(NULL) src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in vlc-config @@ -252,7 +256,6 @@ EXTRA_DIST += \ extras/MacOSX/Resources/vlc.scriptTerminology \ extras/MacOSX/Resources/README \ extras/MacOSX/vlc.pbproj/project.pbxproj \ - extras/MacOSX/macosx-dmg \ extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \ extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \ extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet \ @@ -304,13 +307,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 @@ -454,6 +455,7 @@ SOURCES_libvlc_common = \ src/misc/block.c \ src/misc/modules.c \ src/misc/threads.c \ + src/misc/stats.c \ src/misc/unicode.c \ src/misc/cpu.c \ src/misc/configuration.c \ @@ -469,12 +471,15 @@ SOURCES_libvlc_common = \ src/misc/version.c \ src/extras/libc.c \ src/control/core.c \ - src/control/util.c \ - src/control/audio_video.c \ + src/control/playlist.c \ + src/control/input.c \ + src/control/mediacontrol_core.c \ + src/control/mediacontrol_util.c \ + src/control/mediacontrol_audio_video.c \ $(NULL) # These should be distributed, but not compiled -EXTRA_DIST += src/control/init.c src/control/plugin.c +EXTRA_DIST += src/control/mediacontrol_init.c src/control/mediacontrol_plugin.c SOURCES_libvlc = \ $(SOURCES_libvlc_common) \ @@ -812,7 +817,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"; \ @@ -838,9 +843,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" ; \ @@ -871,17 +873,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 $(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}/ ; mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla" @@ -901,22 +920,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 @@ -974,17 +998,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 @@ -1004,7 +1045,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 @@ -1053,23 +1094,28 @@ package-beos: rm -Rf $(srcdir)/tmp ; package-macosx: -# Check that tmp isn't in the way - @if test -e "$(top_builddir)/tmp"; then \ - echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \ - false; \ - else \ - echo "OK."; mkdir -p "$(top_builddir)/tmp"; \ +# Check that the temporary location isn't in the way + @if test -e "$(top_builddir)/vlc-${VERSION}/"; then \ + rm -Rf "$(top_builddir)/vlc-${VERSION}/" ; \ fi + echo "Create package directory: vlc-${VERSION}/"; + mkdir -p "$(top_builddir)/vlc-${VERSION}/"; + # Copy relevant files - cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/tmp/VLC.app" - cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/ && cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/tmp/ + cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app" + cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/vlc-${VERSION}/ && cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/vlc-${VERSION}/ # Create disk image - $(srcdir)/extras/MacOSX/macosx-dmg "vlc-${VERSION}" $(top_builddir)/tmp + echo "Creating disk image" ; + rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ; + hdiutil create -srcfolder "$(top_builddir)/vlc-${VERSION}" \ + "$(top_builddir)/vlc-${VERSION}.dmg" -format UDZO -quiet ; + echo; echo "Disk image creation completed:" ; + ls -la "$(top_builddir)/vlc-${VERSION}.dmg" ; echo ; # Clean up - rm -Rf $(top_builddir)/tmp + rm -Rf "$(top_builddir)/vlc-${VERSION}" ; package-translations: @if test -e "$(srcdir)/vlc-translations-${VERSION}"; then \ @@ -1142,6 +1188,12 @@ stamp-api: Makefile.in $(HEADERS_include) vlc-config vlc-api.pl top_srcdir="$(top_srcdir)" perl $(top_srcdir)/vlc-api.pl touch stamp-api +############################################################################### +# Enforce Mac OS X deployment target environment variable +############################################################################### +macosx-sdk: Makefile.in $(HEADERS_include) vlc-config vlc-api.pl + export MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) + ############################################################################### # Force rule ###############################################################################