X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=17e242ff5924155155ef0686f919da5318dd8d31;hb=a58afe8e62c672b06e047f2475e69977908dbb7d;hp=6306d6604085518dfd4250777cb01d41331ed43b;hpb=04a605b1119a3e21c784e757f6c51113cc0fcf56;p=vlc diff --git a/Makefile.am b/Makefile.am index 6306d66040..3d099306b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,18 +2,15 @@ # Automake targets and declarations ############################################################################### -NULL = - # SUBDIRS stores the directories where a "make" is required when building # something. DIST_SUBDIRS stores the directories where nothing is built but # 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 -# - 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 +# - intl (gettext) is needed by src and modules +# - src (libvlc) is nedeed by modules, mozilla and bindings +# - libs/* are needed by modules +SUBDIRS = intl po libs/loader libs/srtp src modules \ + mozilla bindings activex share doc +DIST_SUBDIRS = $(SUBDIRS) m4 ipkg EXTRA_DIST = \ HACKING \ @@ -22,148 +19,31 @@ EXTRA_DIST = \ vlc.exe.manifest \ 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 \ - $(NULL) - -BUILT_SOURCES_distclean = vlc-config compile -BUILT_SOURCES_clean = \ - stamp-api \ - macosx-sdk \ - src/misc/modules_builtin.h \ - src/misc/version.c \ - $(NULL) + vlc.fedora.spec \ + vlc.mandriva.spec \ + vlc.altlinux.spec \ + vlc.win32.nsi.in + +dist_noinst_SCRIPTS = bootstrap toolbox + +BUILT_SOURCES_distclean = vlc-config compile vlc.win32.nsi +if HAVE_DARWIN +BUILT_SOURCES_clean = macosx-sdk +else +BUILT_SOURCES_clean = +endif BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean) SUFFIXES = DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \ - --disable-ffmpeg --disable-faad --disable-skins2 + --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 # 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 +73,15 @@ 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/InteractionErrorPanel.nib/classes.nib \ + extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \ + extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \ extras/MacOSX/Resources/English.lproj/InfoPlist.strings \ extras/MacOSX/Resources/a52.icns \ extras/MacOSX/Resources/aac.icns \ @@ -252,10 +141,54 @@ 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 \ - extras/MacOSX/vlc.pbproj/project.pbxproj \ + extras/MacOSX/Resources/add_embedded.png \ + extras/MacOSX/Resources/add_embedded_blue.png \ + extras/MacOSX/Resources/repeat_embedded.png \ + extras/MacOSX/Resources/repeat_embedded_blue.png \ + extras/MacOSX/Resources/repeat_single_embedded_blue.png \ + extras/MacOSX/Resources/shuffle_embedded.png \ + extras/MacOSX/Resources/shuffle_embedded_blue.png \ + extras/MacOSX/Resources/fs_volume_slider_knob_highlight.png \ + extras/MacOSX/Resources/fs_volume_slider_knob.png \ + extras/MacOSX/Resources/fs_volume_slider_bar.png \ + extras/MacOSX/Resources/fs_volume_mute_highlight.png \ + extras/MacOSX/Resources/fs_volume_mute.png \ + extras/MacOSX/Resources/fs_volume_max_highlight.png \ + extras/MacOSX/Resources/fs_volume_max.png \ + extras/MacOSX/Resources/fs_time_slider_knob_highlight.png \ + extras/MacOSX/Resources/fs_time_slider_knob.png \ + extras/MacOSX/Resources/fs_time_slider.png \ + extras/MacOSX/Resources/fs_stop_highlight.png \ + extras/MacOSX/Resources/fs_stop.png \ + extras/MacOSX/Resources/fs_skip_previous_highlight.png \ + extras/MacOSX/Resources/fs_skip_previous.png \ + extras/MacOSX/Resources/fs_skip_next_highlight.png \ + extras/MacOSX/Resources/fs_skip_next.png \ + extras/MacOSX/Resources/fs_rewind_highlight.png \ + extras/MacOSX/Resources/fs_rewind.png \ + extras/MacOSX/Resources/fs_play_highlight.png \ + extras/MacOSX/Resources/fs_play.png \ + extras/MacOSX/Resources/fs_pause_highlight.png \ + extras/MacOSX/Resources/fs_pause.png \ + extras/MacOSX/Resources/fs_forward_highlight.png \ + extras/MacOSX/Resources/fs_forward.png \ + extras/MacOSX/Resources/fs_exit_fullscreen_highlight.png \ + extras/MacOSX/Resources/fs_exit_fullscreen.png \ + extras/MacOSX/Resources/fs_background.png \ + extras/MacOSX/fullscreen_panel.svg \ + extras/MacOSX/ub.sh \ + extras/MacOSX/vlc.xcodeproj/project.pbxproj \ extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \ extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \ extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet \ @@ -263,32 +196,27 @@ 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/Makefile \ - extras/zsh.cpp \ - $(NULL) + 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 ############################################################################### -# MS Visual Studio and eMbedded Visual Studio projects -############################################################################### - +# Various utilities ( editor syntax files, D-Bus controller ... ) +############################################################################## EXTRA_DIST += \ - msvc/vlc.dsw \ - msvc/libvlc.dsp.in \ - msvc/plugins.dsp.in \ - msvc/vlc.dsp.in \ - msvc/config.h.in \ - msvc/modules_builtin_msvc.h \ - evc/vlc.vcw \ - evc/libvlc.vcp.in \ - evc/vlc.vcp.in \ - evc/plugins.vcp.in \ - evc/errno.h \ - evc/config.h.in \ - evc/modules_builtin_evc.h \ - $(NULL) + extras/Makefile \ + extras/zsh.cpp \ + extras/emacs.init \ + extras/vlc.vim \ + extras/make.pl \ + extras/valgrind.suppressions \ + extras/m4/autoconf260.m4 \ + extras/mpris.py \ + extras/mpris.glade dist-hook: - cd $(distdir) && srcdir=. $(SHELL) ./toolbox --update-vc distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib ############################################################################### @@ -297,198 +225,24 @@ 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 -lib_LIBRARIES = lib/libvlc.a $(lib_PICLIBRARIES) -if HAVE_WIN32 -else -if BUILD_PIC -lib_PICLIBRARIES = lib/libvlc_pic.a -endif -endif +# 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 +libvlc: + cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc) -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) +.PHONY: libvlc ############################################################################### # Building vlc @@ -497,43 +251,42 @@ SOURCES_libvlc = \ bin_PROGRAMS = vlc vlc_SOURCES = src/vlc.c +# Ugly kludge so that automake defines $(CXXLINK) +nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m -# Work around a bug in the arm-wince-pe linker -if HAVE_WINCE -vlc_WORKAROUNDLDFLAGS = $(LIB_libvlc) -endif +vlc_DEPENDENCIES = $(DATA_win32_rc) -if BUILD_SHARED -### libvlc.so cannot be created into lib/ -LIB_libvlc = libvlc$(LIBEXT) -LDFLAGS_libvlc = -#-Wl,-rpath $(libdir) -else -LIB_libvlc = lib/libvlc.a -LDFLAGS_libvlc = `$(VLC_CONFIG) --libs vlc builtin` +vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc` +vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc` +if !HAVE_PLUGINS +vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'` endif -vlc_LDFLAGS = $(LDFLAGS_libvlc) $(vlc_WORKAROUNDLDFLAGS) -vlc_LDADD = $(LIB_libvlc) $(DATA_win32_rc) $(LIB_intl) vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` +LIB_libvlc = libvlc.la +LIBVLC = src/$(LIB_libvlc) -# 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) +#To get some nice output +nice: + $(top_builddir)/compile -vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin +core: libvlc vlc$(EXEEXT) + +.PHONY: core + +vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES) @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/ @@ -550,7 +303,7 @@ vlc-bundle: vlc cp $$i $(top_builddir)/vlc-bundle/lib/ ; \ done ; \ fi - for i in $(ALL_LINGUAS); do \ + cat $(top_srcdir)/po/LINGUAS | while read i; do \ mkdir -p "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \ cp "$(top_builddir)/po/$$i.gmo" \ "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \ @@ -558,20 +311,35 @@ vlc-bundle: vlc find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \; endif -# Install the symlinks and shared libvlc -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)" +############################################################################### +# Building aliases +############################################################################### + +ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc +bin_SCRIPTS += $(ALIASES) +EXTRA_SCRIPTS = $(ALL_ALIASES) + +dist_noinst_SCRIPTS += make-alias + +MKALIAS = bindir="$(bindir)" transform="$(transform)" $(top_srcdir)/make-alias $@ + +cvlc: make-alias + $(MKALIAS) dummy + +rvlc: make-alias + $(MKALIAS) rc + +svlc: make-alias + $(MKALIAS) skins2 + +wxvlc: make-alias + $(MKALIAS) wx + +qvlc: make-alias + $(MKALIAS) qt4 + +nvlc: make-alias + $(MKALIAS) ncurses if HAVE_DARWIN # Create the MacOS X app @@ -593,6 +361,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 \ @@ -629,48 +399,132 @@ VLC-release.app: vlc bookmarks.m \ sfilters.h \ sfilters.m \ + update.h \ + update.m \ + interaction.h \ + interaction.m \ + embeddedwindow.h \ + embeddedwindow.m \ + fspanel.h \ + fspanel.m \ vout.m; do \ cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - case $(target_triplet) in \ - *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ - cd ../../../; \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ - $(top_builddir)/VLC-release.app;; \ - *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ - cd ../../../; \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ - $(top_builddir)/VLC-release.app;; \ - *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ - cd ../../../; \ + cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ + cd ../../../ && \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ - $(top_builddir)/VLC-release.app;; \ - esac + $(top_builddir)/VLC-release.app; \ rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS - $(INSTALL) $(top_builddir)/vlc \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/lib + $(INSTALL) $(top_builddir)/.libs/vlc \ $(top_builddir)/VLC-release.app/Contents/MacOS/VLC + $(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \ + $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc.dylib + $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.1.dylib \ + $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib + install_name_tool -change /usr/local/lib/libvlc.1.dylib \ + @executable_path/lib/libvlc.dylib \ + $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib + install_name_tool -change /usr/local/lib/libvlc.1.dylib \ + @executable_path/lib/libvlc.dylib \ + $(top_builddir)/VLC-release.app/Contents/MacOS/VLC ln -sf ./VLC $(top_builddir)/VLC-release.app/Contents/MacOS/clivlc $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/modules - for i in "" `$(VLC_CONFIG) --target plugin` ; do \ + for i in `$(VLC_CONFIG) --target plugin` ; do \ if test -n "$$i" ; \ - then $(INSTALL) "$$i$(LIBEXT)" \ + then $(INSTALL) "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \ "$(top_builddir)/VLC-release.app/Contents/MacOS/modules" ; \ fi ; done 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/luaplaylist + for i in $(srcdir)/share/luaplaylist/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist/`basename $${i}` ; \ + done ; \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta + for i in $(srcdir)/share/luameta/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta/`basename $${i}` ; \ + done ; \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf + for i in $(srcdir)/share/luaintf/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/`basename $${i}` ; \ + done ; \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/modules + for i in $(srcdir)/share/luaintf/modules/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/modules/`basename $${i}` ; \ + done ; \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests + for i in $(srcdir)/share/http-lua/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/`basename $${i}` ; \ + done ; \ + for i in $(srcdir)/share/http-lua/dialogs/* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs/`basename $${i}` ; \ + done ; \ + for i in $(srcdir)/share/http-lua/js/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js/`basename $${i}` ; \ + done ; \ + for i in $(srcdir)/share/http-lua/old/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/`basename $${i}` ; \ + done ; \ + for i in $(srcdir)/share/http-lua/old/admin/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin/`basename $${i}` ; \ + done ; \ + for i in $(srcdir)/share/http-lua/old/vlm/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm/`basename $${i}` ; \ + done ; \ + for i in $(srcdir)/share/http-lua/images/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images/`basename $${i}` ; \ + done ; \ + for i in $(srcdir)/share/http-lua/requests/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/`basename $${i}` ; \ + done ; \ + $(INSTALL) -m 644 $(srcdir)/share/http-lua/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/readme.txt + $(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 \ + cat $(top_srcdir)/po/LINGUAS | while read i; do \ mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ mkdir -p $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ @@ -678,10 +532,10 @@ VLC-release.app: vlc $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ ln -sf ../English.lproj/MainMenu.nib \ $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ - ln -sf ../English.lproj/vlc.scriptTerminology \ - $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ done printf "APPLVLC#" >| $(top_builddir)/VLC-release.app/Contents/PkgInfo + find $(top_builddir)/VLC-release.app -type d -exec chmod ugo+rx '{}' \; + find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \; VLC.app: vlc @if test -e "$(top_builddir)/tmp"; then \ @@ -698,6 +552,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 \ @@ -734,44 +590,57 @@ VLC.app: vlc bookmarks.m \ sfilters.h \ sfilters.m \ + update.h \ + update.m \ + interaction.h \ + interaction.m \ + embeddedwindow.h \ + embeddedwindow.m \ + fspanel.h \ + fspanel.m \ vout.m; do \ cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - case $(target_triplet) in \ - *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ - cd ../../../; \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ - $(top_builddir)/VLC.app;; \ - *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ - cd ../../../; \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ - $(top_builddir)/VLC.app;; \ - *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ - cd ../../../; \ + cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ + cd ../../../ && \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ - $(top_builddir)/VLC.app;; \ - esac + $(top_builddir)/VLC.app; \ rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS - $(INSTALL) $(top_builddir)/vlc \ + $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/lib + $(INSTALL) $(top_builddir)/.libs/vlc \ $(top_builddir)/VLC.app/Contents/MacOS/VLC + $(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \ + $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc.dylib + $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.1.dylib \ + $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc-control.dylib + install_name_tool -change /usr/local/lib/libvlc.1.dylib \ + @executable_path/lib/libvlc.dylib \ + $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc-control.dylib + install_name_tool -change /usr/local/lib/libvlc.1.dylib \ + @executable_path/lib/libvlc.dylib \ + $(top_builddir)/VLC.app/Contents/MacOS/VLC ln -sf ./VLC $(top_builddir)/VLC.app/Contents/MacOS/clivlc $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules - for i in "" `$(VLC_CONFIG) --target plugin` ; do \ + for i in `$(VLC_CONFIG) --target plugin` ; do \ if test -n "$$i" ; \ - then ln -sfn "`pwd`/$$i$(LIBEXT)" \ + then install_name_tool -change /usr/local/lib/libvlc.1.dylib \ + @executable_path/lib/libvlc.dylib \ + "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)"; \ + ln -sfn "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \ "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \ fi ; done 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}` ; \ + install_name_tool -change /usr/local/lib/libvlc.1.dylib @executable_path/lib/libvlc.dylib $${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/ + ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/ $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale - for i in $(ALL_LINGUAS); do \ + cat $(top_srcdir)/po/LINGUAS | while read i; do \ mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ ln -sfn `pwd`/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ @@ -792,32 +661,15 @@ share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc endif -############################################################################### -# Building specific source packages -############################################################################### - -dist-woody: distdir - $(remove_distdir_woody) - mv $(distdir) $(PACKAGE)-woody-$(VERSION) - $(srcdir)/toolbox --make-woody $(PACKAGE)-woody-$(VERSION) - $(AMTAR) chof - $(PACKAGE)-woody-$(VERSION) \ - | GZIP=$(GZIP_ENV) gzip -c >$(PACKAGE)-woody-$(VERSION).tar.gz - $(remove_distdir_woody) - -remove_distdir_woody = \ - { test ! -d $(PACKAGE)-woody-$(VERSION) \ - || { find $(PACKAGE)-woody-$(VERSION) -type d ! -perm -200 \ - -exec chmod u+w {} ';' \ - && rm -fr $(PACKAGE)-woody-$(VERSION); }; } - ############################################################################### # Building architecture-specific binary packages ############################################################################### # 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. +# the same setup as the maintaner(s). # -package-win32-base-debug: + +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"; \ @@ -827,49 +679,61 @@ package-win32-base-debug: fi # Copy relevant files - cp "$(srcdir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/" - cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/" + cp "$(top_builddir)/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/" cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/" - $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)" + cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-${VERSION}/" + cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-${VERSION}/" - 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 file in AUTHORS MAINTAINERS THANKS ; \ + do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done; + for file in NEWS COPYING README; \ + do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-${VERSION}/$${file}.txt"; done + unix2dos "$(top_builddir)/vlc-${VERSION}/"*.txt mkdir $(top_builddir)/vlc-${VERSION}/locale - for i in $(ALL_LINGUAS); do \ + cat $(top_srcdir)/po/LINGUAS | while read i; 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}/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-lua/images" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/requests" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/js" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/dialogs" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/old" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/old/vlm" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/old/admin" + cp $(srcdir)/share/http-lua/*.html $(top_builddir)/vlc-${VERSION}/http-lua/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/*.html ; + cp $(srcdir)/share/http-lua/.hosts $(top_builddir)/vlc-${VERSION}/http-lua/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/.hosts ; + cp $(srcdir)/share/http-lua/*.css $(top_builddir)/vlc-${VERSION}/http-lua/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/*.css ; + cp $(srcdir)/share/http-lua/js/*.js $(top_builddir)/vlc-${VERSION}/http-lua/js/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/js/*.js ; + cp $(srcdir)/share/http-lua/dialogs/* $(top_builddir)/vlc-${VERSION}/http-lua/dialogs/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/dialogs/* ; + cp $(srcdir)/share/http-lua/dialogs/.hosts $(top_builddir)/vlc-${VERSION}/http-lua/dialogs/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/dialogs/.hosts ; + cp $(srcdir)/share/http-lua/*.ico $(top_builddir)/vlc-${VERSION}/http-lua/ ; + cp $(srcdir)/share/http-lua/images/*.png $(top_builddir)/vlc-${VERSION}/http-lua/images/ + cp $(srcdir)/share/http-lua/requests/*.xml $(top_builddir)/vlc-${VERSION}/http-lua/requests/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/requests/*.xml ; + cp $(srcdir)/share/http-lua/requests/readme $(top_builddir)/vlc-${VERSION}/http-lua/requests/readme.txt ; + unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/requests/readme.txt ; + + cp $(srcdir)/share/http-lua/old/*.html $(top_builddir)/vlc-${VERSION}/http-lua/old/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/old/*.html ; + cp $(srcdir)/share/http-lua/old/*.css $(top_builddir)/vlc-${VERSION}/http-lua/old/ ; + cp $(srcdir)/share/http-lua/old/.hosts $(top_builddir)/vlc-${VERSION}/http-lua/old/ ; + cp $(srcdir)/share/http-lua/old/*.png $(top_builddir)/vlc-${VERSION}/http-lua/old/ ; + cp $(srcdir)/share/http-lua/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http-lua/old/vlm/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/old/vlm/*.html ; + cp $(srcdir)/share/http-lua/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http-lua/old/admin/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/old/admin/*.html ; + cp $(srcdir)/share/http-lua/old/admin/.access $(top_builddir)/vlc-${VERSION}/http-lua/old/admin/ ; mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images" mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests" @@ -880,62 +744,130 @@ package-win32-base-debug: 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/.hosts $(top_builddir)/vlc-${VERSION}/http/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/.hosts ; 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/dialogs/.hosts $(top_builddir)/vlc-${VERSION}/http/dialogs/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/.hosts ; 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/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/*.ico $(top_builddir)/vlc-${VERSION}/http/old/ ; cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ; + cp $(srcdir)/share/http/old/.hosts $(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/http/old/admin/.access $(top_builddir)/vlc-${VERSION}/http/old/admin/ ; cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ; - mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla" if BUILD_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/ ; + mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla" + cp $(top_builddir)/mozilla/.libs/npvlc$(LIBEXT) $(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); + cp $(top_builddir)/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ; endif # Rebase all those DLLs to speed up loading (need cygwin rebase) 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 +package-win-common-strip: + $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)" + $(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)" + $(STRIP) "vlc-${VERSION}/libvlc-control$(LIBEXT)" +if BUILD_MOZILLA + $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/npvlc$(LIBEXT); +endif +if BUILD_ACTIVEX + $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/axvlc$(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)/`dirname $$i`/.libs/`basename $$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 + + $(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luaplaylist + for i in $(srcdir)/share/luaplaylist/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luaplaylist/`basename $${i}` ; \ + done ; + $(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luameta + for i in $(srcdir)/share/luameta/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luameta/`basename $${i}` ; \ + done ; + $(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luaintf + for i in $(srcdir)/share/luaintf/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luaintf/`basename $${i}` ; \ + done ; + $(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luaintf/modules + for i in $(srcdir)/share/luaintf/modules/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luaintf/modules/`basename $${i}` ; \ + 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 minimal;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; + for file in $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg; do \ + if sed 's%share/osdmenu%osdmenu%g' $$file >$$file.tmp; then :; else exit 1; fi; \ + if sed 's%/%\\%g' $$file.tmp >$$file; then :; else exit 1; fi; \ + rm -f $$file.tmp; \ + done + + +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-exe: package-win32-base # Create package 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 /DVERSION=${VERSION}"; \ - elif wine --version >dev/null 2>&1; then \ + elif [ -x "${PROGRAMFILES}/NSIS/makensis" ]; then \ + MAKENSIS="${PROGRAMFILES}/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; \ @@ -949,9 +881,13 @@ 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 -9 vlc-${VERSION}-win32.zip vlc-${VERSION} + +package-win32-base-7zip: package-win32-base # Create package - zip -r vlc-${VERSION}-win32.zip vlc-${VERSION} + 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 @@ -961,93 +897,21 @@ 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" - 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}/ ; +package-win32-no-clean: package-win32-base-exe package-win32-base-zip package-win32-base-7zip -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 +package-win32: package-win32-no-clean +# Clean up + rm -Rf $(top_builddir)/vlc-${VERSION} -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 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-wince-base: package-win-common package-win-common-strip package-wince-base-zip: # Create package @@ -1076,7 +940,7 @@ package-beos: xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ; find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ; mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ; - (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} ) + (cd $(srcdir)/tmp && zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} ) mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ ; mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ; @@ -1087,7 +951,7 @@ package-beos: xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ; find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ; mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ; - (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} ) + (cd $(srcdir)/tmp && zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} ) mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/ ; # Clean up @@ -1102,21 +966,86 @@ package-macosx: echo "Create package directory: vlc-${VERSION}/"; mkdir -p "$(top_builddir)/vlc-${VERSION}/"; +# For now, export the framework for third parties, from here + (cd $(top_builddir)/extras/MacOSX/Framework && xcodebuild); + cp -r $(top_builddir)/extras/MacOSX/Framework/build/Release/VLC.framework $(top_builddir)/vlc-${VERSION}/VLC.framework + # Copy relevant files - 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}/ + @if test -e "$(top_builddir)/VLC-release.app/"; then \ + cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \ + else \ + cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \ + fi + cd "$(srcdir)" && mkdir -p $(top_builddir)/vlc-${VERSION}/Goodies/ && \ + mkdir -p $(top_builddir)/vlc-${VERSION}/.background/ && \ + cp AUTHORS COPYING ChangeLog README THANKS NEWS $(top_builddir)/vlc-${VERSION}/Goodies/ && \ + cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/vlc-${VERSION}/Goodies/Delete\ VLC\ Preferences.app && \ + cp README.MacOSX.rtf $(top_builddir)/vlc-${VERSION}/Read\ Me.rtf && \ + cp extras/MacOSX/Resources/about_bg.png $(top_builddir)/vlc-${VERSION}/.background/background.png ; + +# Place a link to the application folder + ln -s /Applications $(top_builddir)/vlc-${VERSION}/Applications ; # Create disk image 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 UDRW \ + -scrub -imagekey zlib-level=9 ; + +# Make sure the root window of the dmg will pop up when the dmg is mounted. +# Note: We dont mount in /Volumes to be sure we won't collide with an other +# finder mounted dmg with the same name. + echo "Make sure the root window of the dmg will pop up when the dmg is mounted" ; + mkdir -p $(top_builddir)/vlcmnt ; + hdiutil attach -readwrite -noverify -noautoopen "$(top_builddir)/vlc-${VERSION}.dmg" -mountpoint "$(top_builddir)/vlcmnt/vlc-${VERSION}" ; + bless --folder "$(top_builddir)/vlcmnt/vlc-${VERSION}/" --openfolder "$(top_builddir)/vlcmnt/vlc-${VERSION}" ; + sleep 1 # Make sure operation completes + cd "$(srcdir)" + +# Unmount the image now + hdiutil detach "$(top_builddir)/vlcmnt/vlc-${VERSION}" ; + rm -R $(top_builddir)/vlcmnt ; + +# Make sure the image is not writable +# Note: We can't directly create a read only dmg as we do the bless stuff + echo "Make the disk image read-only" ; + mv "$(top_builddir)/vlc-${VERSION}.dmg" "$(top_builddir)/vlc-${VERSION}-rw.dmg" ; + hdiutil convert "$(top_builddir)/vlc-${VERSION}-rw.dmg" -format UDZO -o "$(top_builddir)/vlc-${VERSION}.dmg" ; + rm "$(top_builddir)/vlc-${VERSION}-rw.dmg" ; + +# We are done + 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" + PATH=/Developer/usr/bin:/Developer/Tools:$$PATH 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"; \ @@ -1125,7 +1054,7 @@ package-translations: echo "OK."; mkdir -p "$(srcdir)/vlc-translations-${VERSION}"; \ fi # Copy translations - for i in $(ALL_LINGUAS); do \ + cat $(top_srcdir)/po/LINGUAS | while read i; do \ cp "$(srcdir)/po/$${i}.po" \ "$(srcdir)/vlc-translations-${VERSION}/$${i}.po" \ || true ; \ @@ -1147,23 +1076,28 @@ package-translations: ############################################################################### # PO translation files update +# Generate po/POTFILES.in which lists all the files containing translatable +# strings. Find all source files and remove the generated files ############################################################################### .PHONY: update-po update-po: rm -f $(top_srcdir)/po/POTFILES.in { \ - cd $(top_srcdir) ; \ + cd $(top_srcdir) && \ echo "# automatically created by make update-po" ; \ echo "" ; \ echo "# main sources" ; \ find include src -name '*.[chm]' -o -name '*.[ch]pp' \ - | grep -v '\(vlc_symbols\|misc/modules_\|src/misc/version.c\)' \ + | grep -v '\(misc/modules_\|src/misc/revision.c\|modules/builtin.h\|include/vlc_about.h\)' \ | sort ; \ echo "" ; \ echo "# modules" ; \ - find modules -name '*.[chm]' -o -name '*.[ch]pp' \ + find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name '*.ui' \ | grep -v '\(\.moc\.\|gui/gtk2/\)' \ + | grep -vE 'qt4/ui/.*.h' \ + | grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \ + | grep -v 'gui/opie' \ | sort ; \ } > $(top_srcdir)/po/POTFILES.in rm -f $(top_srcdir)/po/vlc.pot @@ -1174,27 +1108,18 @@ update-po: ############################################################################### # Stamp rules ############################################################################### -stamp-builtin: FORCE - @for dep in "" `$(VLC_CONFIG) --target builtin`; do \ - if test "$${dep}" -nt "$(top_builddir)/vlc$(EXEEXT)"; then \ - rm -f $@; \ +stamp-builtin: + @for dep in "" `$(VLC_CONFIG) --target plugin`; do \ + if test "$${dep}.la" -nt "$(top_builddir)/vlc$(EXEEXT)"; then \ + touch "$@"; \ break; \ fi; \ 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 +.PHONY: stamp-builtin ############################################################################### # Enforce Mac OS X deployment target environment variable ############################################################################### -macosx-sdk: Makefile.in $(HEADERS_include) vlc-config vlc-api.pl +macosx-sdk: Makefile.in $(HEADERS_include) vlc-config export MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) - -############################################################################### -# Force rule -############################################################################### -FORCE: