X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=e946adec013ff2efe168e444f8e8cfecf5dd271a;hb=71148dd9141b229f48a987ec653a89c2b3566af8;hp=6a6485bb460a0dd14be591f76b14ff6585855323;hpb=869a316dc5c746439a35d3aed909be8817d9ee7e;p=vlc diff --git a/Makefile.am b/Makefile.am index 6a6485bb46..e946adec01 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,11 +9,11 @@ NULL = # which have makefiles with distribution information. # - intl should come before modules and . because all the code uses gettext # - modules should come before . because vlc needs the builtins -# - . should come before mozilla/bindings because the plugin needs libvlc_pic.a +# - . should come before mozilla/bindings because the plugin needs libvlc.a # - po should come before . because VLC.app needs the pofiles # - loader should come before modules because some plugins need it -SUBDIRS = intl loader modules po . mozilla bindings activex share m4 doc -DIST_SUBDIRS = $(SUBDIRS) debian ipkg lib +SUBDIRS = intl loader src modules po . mozilla bindings activex share m4 doc +DIST_SUBDIRS = $(SUBDIRS) ipkg EXTRA_DIST = \ HACKING \ @@ -23,23 +23,16 @@ EXTRA_DIST = \ MAINTAINERS \ README.MacOSX.rtf \ bootstrap \ - src/extras/COPYING \ toolbox \ vlc-api.pl \ vlc-config.in.in \ vlc.spec \ vlc.spec.mdk \ - vlc.win32.nsi \ - src/misc/modules_builtin.h.in \ + vlc.win32.nsi.in \ $(NULL) -BUILT_SOURCES_distclean = vlc-config compile -BUILT_SOURCES_clean = \ - stamp-api \ - macosx-sdk \ - src/misc/modules_builtin.h \ - src/misc/version.c \ - $(NULL) +BUILT_SOURCES_distclean = vlc-config compile vlc.win32.nsi +BUILT_SOURCES_clean = macosx-sdk BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean) @@ -47,123 +40,13 @@ SUFFIXES = DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \ --disable-ffmpeg --disable-faad --disable-skins2 +if USE_LIBTOOL +DISTCHECK_CONFIGURE_FLAGS += --enable-libtool +endif # Tell aclocal to use -I m4. Wonder if it really works. ACLOCAL_AMFLAGS = -I m4 -# XXX: these flags could be set in configure.ac, but we set them here -# because old versions of automake don't support them in configure.ac. -AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects - -############################################################################### -# Headers -############################################################################### - -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/mediacontrol.h \ - include/vlc/mediacontrol_structures.h \ - $(NULL) - -noinst_HEADERS = $(HEADERS_include) -noinst_DATA = $(DATA_noinst_beos) $(DATA_noinst_libvlc) - -HEADERS_include = \ - include/aout_internal.h \ - include/audio_output.h \ - include/beos_specific.h \ - include/charset.h \ - include/codecs.h \ - include/configuration.h \ - include/darwin_specific.h \ - include/intf_eject.h \ - include/iso_lang.h \ - include/main.h \ - include/mmx.h \ - include/modules.h \ - include/modules_inner.h \ - include/mtime.h \ - include/network.h \ - include/os_specific.h \ - include/snapshot.h \ - include/stream_output.h \ - include/variables.h \ - include/video_output.h \ - include/vlc_access.h \ - include/vlc_acl.h \ - include/vlc_bits.h \ - include/vlc_block.h \ - include/vlc_block_helper.h \ - include/vlc_codec.h \ - include/vlc_common.h \ - include/vlc_config.h \ - include/vlc_cpu.h \ - include/vlc_demux.h \ - include/vlc_error.h \ - include/vlc_es.h \ - include/vlc_es_out.h \ - include/vlc_filter.h \ - include/vlc_config_cat.h \ - include/vlc_httpd.h \ - include/vlc_tls.h \ - include/vlc_md5.h \ - include/vlc_image.h \ - include/vlc_input.h \ - include/vlc_interaction.h \ - include/vlc_interface.h \ - include/vlc_keys.h \ - include/vlc_messages.h \ - include/vlc_meta.h \ - include/vlc_objects.h \ - include/vlc_osd.h \ - include/vlc_playlist.h \ - include/vlc_spu.h \ - include/vlc_stream.h \ - include/vlc_symbols.h \ - include/vlc_threads_funcs.h \ - include/vlc_threads.h \ - include/vlc_video.h \ - include/vlc_vlm.h \ - include/vlc_vod.h \ - 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 - srcdir=$(srcdir) $(srcdir)/toolbox --update-includes - touch src/misc/modules_builtin.h - -src/misc/modules.c: src/misc/modules_builtin.h - -src/misc/version.c: FORCE - srcdir=$(srcdir) $(srcdir)/toolbox --update-version - -# These dependencies are mandatory -$(SOURCES_libvlc): $(LIB_intl) - -############################################################################### -# Optional libintl - FIXME, bad dependencies -############################################################################### - -intl/libintl.a: FORCE - cd $(top_builddir)/intl && $(MAKE) $(AM_MAKEFLAGS) - -if BUILD_INTL -LIB_intl = intl/libintl.a -endif - ############################################################################### # MacOS X project ############################################################################### @@ -193,6 +76,12 @@ 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/Interaction.nib/classes.nib \ + extras/MacOSX/Resources/English.lproj/Interaction.nib/info.nib \ + extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib \ extras/MacOSX/Resources/English.lproj/InfoPlist.strings \ extras/MacOSX/Resources/a52.icns \ extras/MacOSX/Resources/aac.icns \ @@ -252,6 +141,14 @@ EXTRA_DIST += \ extras/MacOSX/Resources/volumeslider_normal.png \ extras/MacOSX/Resources/volumetrack.png \ extras/MacOSX/Resources/about_bg.png \ + extras/MacOSX/Resources/skip_forward_active_embedded.png \ + extras/MacOSX/Resources/play_embedded.png \ + extras/MacOSX/Resources/pause_embedded.png \ + extras/MacOSX/Resources/skip_previous_active_embedded.png \ + extras/MacOSX/Resources/pause_embedded_blue.png \ + extras/MacOSX/Resources/play_embedded_blue.png \ + extras/MacOSX/Resources/skip_forward_embedded_blue.png \ + extras/MacOSX/Resources/skip_previous_embedded_blue.png \ extras/MacOSX/Resources/vlc.scriptSuite \ extras/MacOSX/Resources/vlc.scriptTerminology \ extras/MacOSX/Resources/README \ @@ -263,8 +160,23 @@ EXTRA_DIST += \ extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.icns \ extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.rsrc \ extras/MacOSX/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \ + extras/MacOSX/plugin/Info.plist \ + extras/MacOSX/plugin/InstallerInfo.plist \ + extras/MacOSX/plugin/InstallerDescription.plist \ + extras/MacOSX/plugin/pbdevelopment.plist \ + extras/MacOSX/plugin/English.lproj/InfoPlist.strings \ + $(NULL) + +############################################################################### +# Various utilities ( editor syntax files, ... ) +############################################################################## +EXTRA_DIST += \ extras/Makefile \ extras/zsh.cpp \ + extras/emacs.init \ + extras/vlc.vim \ + extras/make.pl \ + extras/valgrind.suppressions \ $(NULL) ############################################################################### @@ -297,201 +209,17 @@ 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 $@ + touch $@ vlc-config.in: vlc-config.in.in ./config.status --recheck + touch $@ -MOSTLYCLEANFILES = $(DATA_noinst_libvlc) CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile -if HAVE_WIN32 -lib_LIBRARIES = lib/libvlc.a -else -lib_LIBRARIES = lib/libvlc.a -if BUILD_PIC -lib_LIBRARIES += lib/libvlc_pic.a -else -endif -endif - -lib_libvlc_a_SOURCES = $(SOURCES_libvlc) -lib_libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc` -lib_libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc` -lib_libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc` - -lib_libvlc_pic_a_SOURCES = $(SOURCES_libvlc) -lib_libvlc_pic_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc pic` -lib_libvlc_pic_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic` -lib_libvlc_pic_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic` - -if HAVE_BEOS -OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos) -endif -if HAVE_DARWIN -OPT_SOURCES_libvlc_darwin = $(SOURCES_libvlc_darwin) -endif -if HAVE_WIN32 -OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32) -endif -if HAVE_WINCE -OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32) -endif -if BUILD_DIRENT -OPT_SOURCES_libvlc_dirent = $(SOURCES_libvlc_dirent) -endif -if BUILD_GETOPT -OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt) -endif - -# Build libvlc as a shared library -if BUILD_SHARED -DATA_noinst_libvlc = libvlc$(LIBEXT) -if HAVE_WIN32 -OBJECTS_libvlc_so = $(lib_libvlc_a_OBJECTS) -else -OBJECTS_libvlc_so = $(lib_libvlc_pic_a_OBJECTS) -endif -endif - -libvlc$(LIBEXT): $(OBJECTS_libvlc_so) - @ldfl="`$(VLC_CONFIG) --libs plugin vlc $(pic) builtin`" ; \ - case `$(VLC_CONFIG) --linkage vlc` in \ - c++) ld="$(CXXLINK)" ;; \ - objc) ld="$(OBJCLINK)" ;; \ - c|*) ld="$(LINK)" ;; \ - esac ; \ - echo $$ld $(OBJECTS_libvlc_so) $$ldfl ; \ - $$ld $(OBJECTS_libvlc_so) $$ldfl - -EXTRA_DIST += \ - $(SOURCES_libvlc_beos) \ - $(SOURCES_libvlc_darwin) \ - $(SOURCES_libvlc_win32) \ - $(SOURCES_libvlc_dirent) \ - $(SOURCES_libvlc_getopt) \ - $(NULL) - -SOURCES_libvlc_beos = \ - src/misc/beos_specific.cpp \ - $(NULL) - -SOURCES_libvlc_darwin = \ - src/misc/darwin_specific.m \ - $(NULL) - -SOURCES_libvlc_win32 = \ - src/misc/win32_specific.c \ - $(NULL) - -SOURCES_libvlc_dirent = \ - src/extras/dirent.c \ - $(NULL) - -SOURCES_libvlc_getopt = \ - src/extras/getopt.c \ - src/extras/getopt.h \ - src/extras/getopt1.c \ - $(NULL) - -SOURCES_libvlc_common = \ - src/libvlc.c \ - src/libvlc.h \ - src/interface/interface.c \ - src/interface/intf_eject.c \ - src/interface/interaction.c \ - src/playlist/playlist.c \ - src/playlist/sort.c \ - src/playlist/loadsave.c \ - src/playlist/view.c \ - src/playlist/item.c \ - src/playlist/item-ext.c \ - src/playlist/services_discovery.c \ - src/input/access.c \ - src/input/clock.c \ - src/input/control.c \ - src/input/decoder.c \ - src/input/demux.c \ - src/input/es_out.c \ - src/input/input.c \ - src/input/input_internal.h \ - src/input/stream.c \ - src/input/mem_stream.c \ - src/input/subtitles.c \ - src/input/var.c \ - src/video_output/video_output.c \ - src/video_output/vout_pictures.c \ - src/video_output/vout_pictures.h \ - src/video_output/video_text.c \ - src/video_output/video_widgets.c \ - src/video_output/vout_subpictures.c \ - src/video_output/vout_synchro.c \ - src/video_output/vout_intf.c \ - src/audio_output/common.c \ - src/audio_output/dec.c \ - src/audio_output/filters.c \ - src/audio_output/input.c \ - src/audio_output/mixer.c \ - src/audio_output/output.c \ - src/audio_output/intf.c \ - src/stream_output/stream_output.c \ - src/stream_output/announce.c \ - src/stream_output/sap.c \ - src/osd/osd.c \ - src/osd/osd_parser.c \ - src/osd/osd_text.c \ - src/osd/osd_widgets.c \ - src/network/acl.c \ - src/network/getaddrinfo.c \ - src/network/io.c \ - src/network/tcp.c \ - src/network/udp.c \ - src/network/httpd.c \ - src/network/rootwrap.c \ - src/network/tls.c \ - src/misc/charset.c \ - src/misc/md5.c \ - src/misc/mtime.c \ - 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 \ - src/misc/image.c \ - src/misc/iso_lang.c \ - src/misc/iso-639_def.h \ - src/misc/messages.c \ - src/misc/objects.c \ - src/misc/variables.c \ - src/misc/error.c \ - src/misc/vlm.c \ - src/misc/xml.c \ - src/misc/version.c \ - src/extras/libc.c \ - src/control/core.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/mediacontrol_init.c src/control/mediacontrol_plugin.c - -SOURCES_libvlc = \ - $(SOURCES_libvlc_common) \ - $(OPT_SOURCES_libvlc_beos) \ - $(OPT_SOURCES_libvlc_darwin) \ - $(OPT_SOURCES_libvlc_win32) \ - $(OPT_SOURCES_libvlc_dirent) \ - $(OPT_SOURCES_libvlc_getopt) \ - $(NULL) - ############################################################################### # Building vlc ############################################################################### @@ -499,43 +227,68 @@ SOURCES_libvlc = \ bin_PROGRAMS = vlc vlc_SOURCES = src/vlc.c +# Ugly kludge so that automake defines $(CXXLINK) +EXTRA_vlc_SOURCES = extras/zsh.cpp # Work around a bug in the arm-wince-pe linker if HAVE_WINCE -vlc_WORKAROUNDLDFLAGS = $(LIB_libvlc) +vlc_WORKAROUNDLDFLAGS = $(LIBVLC) endif +# We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an +# old automake-1.5 bug (automake/279). +DEPENDENCIES_vlc = src/$(LIB_libvlc) $(DATA_win32_rc) + +vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) + +vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` +if USE_LIBTOOL +vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` +LIB_libvlc = libvlc.la +LIBVLC = src/$(LIB_libvlc) +else if BUILD_SHARED -### libvlc.so cannot be created into lib/ +vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -L$(top_builddir)/src -lvlc +if HAVE_WIN32 +LIB_libvlc = libvlc.dll.a +else LIB_libvlc = libvlc$(LIBEXT) -LDFLAGS_libvlc = -#-Wl,-rpath $(libdir) +endif +LIBVLC = else -LIB_libvlc = lib/libvlc.a -LDFLAGS_libvlc = `$(VLC_CONFIG) --libs vlc builtin` +vlc_LDFLAGS = $(vlc_WORKAROUNDLFDLAGS) `$(VLC_CONFIG) --libs vlc builtin` +LIB_libvlc = libvlc.a +LIBVLC = src/$(LIB_libvlc) +DEPENDENCIES_vlc += stamp-builtin +endif +vlc_LDADD += $(INCLUDED_LIBINTL) endif -vlc_LDFLAGS = $(LDFLAGS_libvlc) $(vlc_WORKAROUNDLDFLAGS) -vlc_LDADD = $(LIB_libvlc) $(DATA_win32_rc) $(LIB_intl) -vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` +# Shortcut for developpers to rebuild the core (libvlc + vlc) +# Don't use it if you don't know what it is about. +# Don't complain if it doesn't work. -- Courmisch +core: + rm -f src/$(LIB_libvlc) + $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) -# We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an -# old automake-1.5 bug (automake/279). -DEPENDENCIES_vlc = $(LIB_libvlc) $(DATA_win32_rc) $(LIB_intl) +.PHONY: core -vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin +src/$(LIB_libvlc): + cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc) + +vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) @rm -f vlc$(EXEEXT) @case `$(VLC_CONFIG) --linkage vlc builtin` in \ c++) cmd="$(CXXLINK)" ;; \ objc) cmd="$(OBJCLINK)" ;; \ c|*) cmd="$(LINK)" ;; \ esac ; \ - cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS)" ; \ + cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \ echo $$cmd ; \ eval $$cmd if HAVE_BEOS -DATA_noinst_beos = vlc-bundle +noinst_DATA = vlc-bundle vlc-bundle: vlc rm -Rf $(top_builddir)/vlc-bundle ; mkdir -p $(top_builddir)/vlc-bundle cp $(top_builddir)/vlc $(top_builddir)/vlc-bundle/ @@ -560,20 +313,18 @@ vlc-bundle: vlc find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \; endif -# Install the symlinks and shared libvlc +# Install the symlinks install-exec-local: for i in "" $(ALIASES) ; do if test -n "$$i" ; then \ rm -f "$(DESTDIR)$(bindir)/$$i" && \ ln -sf vlc "$(DESTDIR)$(bindir)/$$i" ; \ fi ; done - test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)" # the opposite of install-{data,exec}-local uninstall-local: for i in "" $(ALIASES) ; do if test -n "$$i" ; then \ rm -f "$(DESTDIR)$(bindir)/$$i" ; \ fi ; done - test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)" if HAVE_DARWIN # Create the MacOS X app @@ -595,6 +346,8 @@ VLC-release.app: vlc mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ + AppleRemote.h \ + AppleRemote.m \ about.h \ about.m \ applescript.h \ @@ -631,6 +384,12 @@ VLC-release.app: vlc bookmarks.m \ sfilters.h \ sfilters.m \ + update.h \ + update.m \ + interaction.h \ + interaction.m \ + embeddedwindow.h \ + embeddedwindow.m \ vout.m; do \ cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ @@ -663,14 +422,41 @@ VLC-release.app: vlc if test -d $(srcdir)/extras/contrib/vlc-lib; then \ mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \ for i in $(srcdir)/extras/contrib/vlc-lib/*.dylib ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/vlc_`basename $${i}` ; \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \ done ; \ fi - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http - for i in $(srcdir)/share/http/* ; do \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests + for i in $(srcdir)/share/http/*.* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \ done ; \ + for i in $(srcdir)/share/http/dialogs/* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs/`basename $${i}` ; \ + done ; \ + for i in $(srcdir)/share/http/js/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js/`basename $${i}` ; \ + done ; \ + for i in $(srcdir)/share/http/old/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/`basename $${i}` ; \ + done ; \ + for i in $(srcdir)/share/http/old/admin/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin/`basename $${i}` ; \ + done ; \ + for i in $(srcdir)/share/http/old/vlm/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm/`basename $${i}` ; \ + done ; \ + for i in $(srcdir)/share/http/images/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images/`basename $${i}` ; \ + done ; \ + for i in $(srcdir)/share/http/requests/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/`basename $${i}` ; \ + done ; \ + $(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale for i in $(ALL_LINGUAS); do \ mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ @@ -700,6 +486,8 @@ VLC.app: vlc mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ + AppleRemote.h \ + AppleRemote.m \ about.h \ about.m \ applescript.h \ @@ -736,6 +524,12 @@ VLC.app: vlc bookmarks.m \ sfilters.h \ sfilters.m \ + update.h \ + update.m \ + interaction.h \ + interaction.m \ + embeddedwindow.h \ + embeddedwindow.m \ vout.m; do \ cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ @@ -768,7 +562,7 @@ VLC.app: vlc if test -d $(srcdir)/extras/contrib/vlc-lib; then \ mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/lib ; \ for i in $(srcdir)/extras/contrib/vlc-lib/*.dylib ; do \ - ln -sfn `pwd`/$${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/vlc_`basename $${i}` ; \ + ln -sfn `pwd`/$${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/`basename $${i}` ; \ done ; \ fi ln -sfn `pwd`/share $(top_builddir)/VLC.app/Contents/MacOS/ @@ -819,7 +613,8 @@ 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-win-common: # 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"; \ @@ -829,25 +624,16 @@ package-win32-base: fi # Copy relevant files - cp "$(srcdir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/" cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/" cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/" - $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)" +if BUILD_SHARED + cp "src/libvlc$(LIBEXT)" "vlc-${VERSION}/" +endif for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \ unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done - mkdir -p "$(top_builddir)/vlc-${VERSION}/plugins" - for i in "" `$(VLC_CONFIG) --target plugin` ; do \ - if test -n "$$i" ; then \ - $(INSTALL) "$(top_builddir)/$$i$(LIBEXT)" \ - "$(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" ; \ @@ -856,30 +642,13 @@ package-win32-base: || true ; \ done - mkdir -p $(top_builddir)/vlc-${VERSION}/skins/fonts - for i in $(srcdir)/share/skins2/fonts/*.*; do \ - cp $$i $(top_builddir)/vlc-${VERSION}/skins/fonts/ || true ; \ - done - for i in $(srcdir)/share/skins2/*.*; do \ - cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \ - done - - mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu" - cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu" - for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume;do \ - mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir"; \ - for file in $(srcdir)/share/osdmenu/$${dir}/*.*;do \ - cp $$file "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir" || true; \ - done; \ - done - unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg; - sed -i 's%share/osdmenu%osdmenu%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg - sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg - 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/ ; @@ -892,42 +661,99 @@ package-win32-base: 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/requests/readme $(top_builddir)/vlc-${VERSION}/http/requests/readme.txt ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/readme.txt ; + + 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/*.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" if BUILD_MOZILLA + mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla" cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ; - $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT); cp $(top_builddir)/mozilla/vlcintf.xpt $(top_builddir)/vlc-${VERSION}/mozilla/ ; endif - mkdir -p "$(top_builddir)/vlc-${VERSION}/activex" if BUILD_ACTIVEX + mkdir -p "$(top_builddir)/vlc-${VERSION}/activex" cp $(srcdir)/activex/README.TXT $(top_builddir)/vlc-${VERSION}/activex/ ; cp $(srcdir)/activex/test.html $(top_builddir)/vlc-${VERSION}/activex/ ; unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ; cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/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-exe: +package-win-common-strip: + $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)" +if BUILD_SHARED + $(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)" +endif +if BUILD_MOZILLA + $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT); +endif +if BUILD_ACTIVEX + $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT); +endif + +package-win32-base-debug: package-win-common +# Copy relevant files + cp "$(top_builddir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/" + + mkdir -p "$(top_builddir)/vlc-${VERSION}/plugins" + for i in "" `$(VLC_CONFIG) --target plugin` ; do \ + if test -n "$$i" ; then \ + $(INSTALL) "$(top_builddir)/$$i$(LIBEXT)" \ + "$(top_builddir)/vlc-${VERSION}/plugins/" ; \ + fi ; done + + mkdir -p $(top_builddir)/vlc-${VERSION}/skins/fonts + for i in $(srcdir)/share/skins2/fonts/*.*; do \ + cp $$i $(top_builddir)/vlc-${VERSION}/skins/fonts/ || true ; \ + done + for i in $(srcdir)/share/skins2/*.*; do \ + cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \ + done + + mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu" + cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu" + for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume;do \ + mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir"; \ + for file in $(srcdir)/share/osdmenu/$${dir}/*.*;do \ + cp $$file "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir" || true; \ + done; \ + done + unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg; + sed -i 's%share/osdmenu%osdmenu%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg + sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg + + +package-win32-base: package-win32-base-debug package-win-common-strip + for i in "" $(top_builddir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \ + do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done + +package-win32-base-exe: package-win32-base # 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 @@ -936,10 +762,14 @@ package-win32-base-exe-linux: # Create package makensis -DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi -package-win32-base-zip: +package-win32-base-zip: package-win32-base # Create package zip -r vlc-${VERSION}-win32.zip vlc-${VERSION} +package-win32-base-7zip: package-win32-base +# Create package + 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-${VERSION}-win32.7z vlc-${VERSION} + package-win32-exe: package-win32-base package-win32-base-exe # Clean up rm -Rf $(top_builddir)/vlc-${VERSION} @@ -948,80 +778,19 @@ package-win32-exe-linux: package-win32-base package-win32-base-exe-linux # Clean up rm -Rf $(top_builddir)/vlc-${VERSION} -package-win32-zip: package-win32-base package-win32-base-zip +package-win32-zip: package-win32-base-zip # Clean up rm -Rf $(top_builddir)/vlc-${VERSION} -package-win32: package-win32-base package-win32-base-exe package-win32-base-zip +package-win32-7zip: package-win32-base-7zip # Clean up rm -Rf $(top_builddir)/vlc-${VERSION} -package-wince-base: -# 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"; \ - false; \ - else \ - echo "OK."; mkdir -p "$(top_builddir)/vlc-${VERSION}"; \ - fi - -# Copy relevant files - cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/" - cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/" - $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)" - - for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ - do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \ - unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done - - mkdir $(top_builddir)/vlc-${VERSION}/locale - for i in $(ALL_LINGUAS); do \ - mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \ - cp "$(srcdir)/po/$${i}.gmo" \ - "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \ - || true ; \ - done - - - 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" - 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/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ; - -if BUILD_MOZILLA - mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla" - cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ; - $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT); - cp $(top_builddir)/mozilla/vlcintf.xpt $(top_builddir)/vlc-${VERSION}/mozilla/ ; -endif - -if BUILD_ACTIVEX - mkdir -p "$(top_builddir)/vlc-${VERSION}/activex" - cp $(srcdir)/activex/README.TXT $(top_builddir)/vlc-${VERSION}/activex/ ; - cp $(srcdir)/activex/test.html $(top_builddir)/vlc-${VERSION}/activex/ ; - unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ; +package-win32: package-win32-base-exe package-win32-base-zip +# Clean up + rm -Rf $(top_builddir)/vlc-${VERSION} - cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ; - $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT); -endif -# Rebase all those DLLs to speed up loading (need cygwin rebase) - if [ -x rebase ]; then \ - find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \ - fi +package-wince-base: package-win-common package-win-common-strip package-wince-base-zip: # Create package @@ -1084,13 +853,39 @@ package-macosx: 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:" ; + "$(top_builddir)/vlc-${VERSION}.dmg" -format UDZO \ + -scrub -imagekey zlib-level=9 ; + echo "Disk image creation completed:" ; ls -la "$(top_builddir)/vlc-${VERSION}.dmg" ; echo ; # Clean up rm -Rf "$(top_builddir)/vlc-${VERSION}" ; +package-macosx-plugin: +if BUILD_MOZILLA +# Create Installer + rm -rf "$(top_builddir)/macosx-plugin-instdata/"; true + mkdir -p "$(top_builddir)/macosx-plugin-instdata" + cp -R "$(top_builddir)/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata" + rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg" + /Developer/Tools/packagemaker -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \ + -f "$(top_builddir)/macosx-plugin-instdata" \ + -i "$(srcdir)/extras/MacOSX/plugin/InstallerInfo.plist" \ + -d "$(srcdir)/extras/MacOSX/plugin/InstallerDescription.plist"; true + rm -rf "$(top_builddir)/macosx-plugin-instdata/" + +# Create disk image + rm -f "$(top_builddir)/vlc-plugin-${VERSION}.dmg"; true + rm -rf "$(top_builddir)/vlc-plugin-${VERSION}/"; true + mkdir -p "$(top_builddir)/vlc-plugin-${VERSION}/" + mv "$(top_builddir)/VLC Internet Plug-In.pkg" "$(top_builddir)/vlc-plugin-${VERSION}/" + hdiutil create -srcfolder "$(top_builddir)/vlc-plugin-${VERSION}" \ + "$(top_builddir)/vlc-plugin-${VERSION}.dmg" -format UDZO \ + -scrub -imagekey zlib-level=9 ; + echo "Disk image creation completed:" + rm -rf "$(top_builddir)/vlc-plugin-${VERSION}" +endif + package-translations: @if test -e "$(srcdir)/vlc-translations-${VERSION}"; then \ echo "Error: please remove $(srcdir)/vlc-translations-${VERSION}, it is in the way"; \ @@ -1157,11 +952,6 @@ stamp-builtin: FORCE done @if test ! -f $@; then printf "" > $@; fi -stamp-api: Makefile.in $(HEADERS_include) vlc-config vlc-api.pl - ( cd $(srcdir) && cat $(HEADERS_include) ) | \ - top_srcdir="$(top_srcdir)" perl $(top_srcdir)/vlc-api.pl - touch stamp-api - ############################################################################### # Enforce Mac OS X deployment target environment variable ###############################################################################