X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=e366e9a516b4f828304ccb4cb22cf9b9077d2aa5;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=49e38dc7bb40b3a61458e6fc6e258e61d05ea5b7;hpb=8442f8adddbb55bd66a9155512fef5c0ab70ad4c;p=vlc diff --git a/Makefile.am b/Makefile.am index 49e38dc7bb..e366e9a516 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,29 +5,83 @@ # 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 (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 +BASE_SUBDIRS = po compat src bin modules share doc test +EXTRA_SUBDIRS = m4 \ + libs/loader libs/srtp libs/unzip \ + projects/mozilla projects/activex +DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS) + +SUBDIRS = po compat src +if LOADER +SUBDIRS += libs/loader +endif +if HAVE_GCRYPT +SUBDIRS += libs/srtp +endif +if HAVE_ZLIB +if !HAVE_MINIZIP +SUBDIRS += libs/unzip +endif +endif +if BUILD_VLC +SUBDIRS += bin +endif +SUBDIRS += modules share doc test +if BUILD_MOZILLA +SUBDIRS += projects/mozilla +endif +if BUILD_ACTIVEX +SUBDIRS += projects/activex +endif EXTRA_DIST = \ HACKING \ INSTALL.win32 \ - INSTALL.wince \ - vlc.exe.manifest \ - MAINTAINERS \ - README.MacOSX.rtf \ + extras/package/win32/vlc.exe.manifest \ + extras/package/win32/libvlc.dll.manifest \ + extras/package/macosx/README.MacOSX.rtf \ vlc-config.in.in \ - 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 + extras/package/rpm/vlc.fedora.spec \ + extras/package/rpm/vlc.altlinux.spec \ + extras/package/win32/vlc.win32.nsi.in \ + extras/package/win32/spad.nsi.in \ + extras/package/win32/UAC.nsh \ + extras/package/win32/UAC.dll \ + extras/package/win32/languages/declaration.nsh \ + extras/package/win32/languages/bengali.nsh \ + extras/package/win32/languages/brazilian_portuguese.nsh \ + extras/package/win32/languages/bulgarian.nsh \ + extras/package/win32/languages/catalan.nsh \ + extras/package/win32/languages/danish.nsh \ + extras/package/win32/languages/dutch.nsh \ + extras/package/win32/languages/english.nsh \ + extras/package/win32/languages/estonian.nsh \ + extras/package/win32/languages/finnish.nsh \ + extras/package/win32/languages/french.nsh \ + extras/package/win32/languages/german.nsh \ + extras/package/win32/languages/hungarian.nsh \ + extras/package/win32/languages/italian.nsh \ + extras/package/win32/languages/japanese.nsh \ + extras/package/win32/languages/occitan.nsh \ + extras/package/win32/languages/polish.nsh \ + extras/package/win32/languages/punjabi.nsh \ + extras/package/win32/languages/romanian.nsh \ + extras/package/win32/languages/schinese.nsh \ + extras/package/win32/languages/slovak.nsh \ + extras/package/win32/languages/slovenian.nsh \ + extras/package/win32/languages/sorani.nsh \ + extras/package/win32/languages/spanish.nsh + +dist_noinst_SCRIPTS = bootstrap +nodist_noinst_SCRIPTS = compile + +BUILT_SOURCES_distclean = vlc-config +if HAVE_WIN32 +BUILT_SOURCES_distclean += \ + extras/package/win32/vlc.win32.nsi extras/package/win32/spad.nsi +endif if HAVE_DARWIN BUILT_SOURCES_clean = macosx-sdk else @@ -38,192 +92,246 @@ BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean) SUFFIXES = -DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \ - --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 +DISTCHECK_CONFIGURE_FLAGS = \ + --enable-fast-install \ + --disable-a52 \ + --disable-avcodec --disable-avformat \ + --disable-postproc --disable-swscale \ + --disable-dbus \ + --disable-mad --disable-libmpeg2 \ + --disable-faad --disable-skins2 \ + --disable-live555 \ + --disable-fribidi --disable-glx \ + --with-kde-solid='$${datadir}/kde4/apps' -# Tell aclocal to use -I m4. Wonder if it really works. ACLOCAL_AMFLAGS = -I m4 +AUTOMAKE_OPTIONS = \ + 1.11 \ + -Wall \ + check-news \ + dist-xz \ + no-dist-gzip +# std-options + +ChangeLog: Makefile.am + rm -f -- "$@" + cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs + ln -sf doc/ChangeLog-2009 "$@" ############################################################################### # MacOS X project ############################################################################### EXTRA_DIST += \ - extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib \ - extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib \ - extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \ - extras/MacOSX/Resources/English.lproj/About.nib/classes.nib \ - extras/MacOSX/Resources/English.lproj/About.nib/info.nib \ - extras/MacOSX/Resources/English.lproj/About.nib/keyedobjects.nib \ - extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib \ - extras/MacOSX/Resources/English.lproj/Open.nib/info.nib \ - extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib \ - extras/MacOSX/Resources/English.lproj/Preferences.nib/classes.nib \ - extras/MacOSX/Resources/English.lproj/Preferences.nib/info.nib \ - extras/MacOSX/Resources/English.lproj/Preferences.nib/keyedobjects.nib \ - extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib \ - extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib \ - extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib \ - extras/MacOSX/Resources/English.lproj/Bookmarks.nib/classes.nib \ - extras/MacOSX/Resources/English.lproj/Bookmarks.nib/info.nib \ - extras/MacOSX/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \ - extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib \ - extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib \ - extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib \ - 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 \ - extras/MacOSX/Resources/asf.icns \ - extras/MacOSX/Resources/asx.icns \ - extras/MacOSX/Resources/avi.icns \ - extras/MacOSX/Resources/bin.icns \ - extras/MacOSX/Resources/cue.icns \ - extras/MacOSX/Resources/dat.icns \ - extras/MacOSX/Resources/divx.icns \ - extras/MacOSX/Resources/dv.icns \ - extras/MacOSX/Resources/generic.icns \ - extras/MacOSX/Resources/m3u.icns \ - extras/MacOSX/Resources/mov.icns \ - extras/MacOSX/Resources/mp3.icns \ - extras/MacOSX/Resources/mp4.icns \ - extras/MacOSX/Resources/mpeg.icns \ - extras/MacOSX/Resources/mpeg1.icns \ - extras/MacOSX/Resources/mpeg2.icns \ - extras/MacOSX/Resources/mpeg4.icns \ - extras/MacOSX/Resources/mpg.icns \ - extras/MacOSX/Resources/ogg.icns \ - extras/MacOSX/Resources/ogm.icns \ - extras/MacOSX/Resources/pls.icns \ - extras/MacOSX/Resources/srt.icns \ - extras/MacOSX/Resources/sub.icns \ - extras/MacOSX/Resources/vlc.icns \ - extras/MacOSX/Resources/vob.icns \ - extras/MacOSX/Resources/wma.icns \ - extras/MacOSX/Resources/wmv.icns \ - extras/MacOSX/Resources/pause.png \ - extras/MacOSX/Resources/pause_blue.png \ - extras/MacOSX/Resources/play.png \ - extras/MacOSX/Resources/play_blue.png \ - extras/MacOSX/Resources/stop.png \ - extras/MacOSX/Resources/stop_blue.png \ - extras/MacOSX/Resources/display.png \ - extras/MacOSX/Resources/display_slider.png \ - extras/MacOSX/Resources/display_track.png \ - extras/MacOSX/Resources/equalizerdrawer_active.png \ - extras/MacOSX/Resources/equalizerdrawer_blue.png \ - extras/MacOSX/Resources/fullscreen_active.png \ - extras/MacOSX/Resources/fullscreen_blue.png \ - extras/MacOSX/Resources/next_active.png \ - extras/MacOSX/Resources/next_blue.png \ - extras/MacOSX/Resources/playlistdrawer_active.png \ - extras/MacOSX/Resources/playlistdrawer_blue.png \ - extras/MacOSX/Resources/previous_active.png \ - extras/MacOSX/Resources/previous_blue.png \ - extras/MacOSX/Resources/skip_forward_active.png \ - extras/MacOSX/Resources/skip_forward_blue.png \ - extras/MacOSX/Resources/skip_previous_active.png \ - extras/MacOSX/Resources/skip_previous_blue.png \ - extras/MacOSX/Resources/volume_high.png \ - extras/MacOSX/Resources/volume_low.png \ - extras/MacOSX/Resources/volumeslider_blue.png \ - 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/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 \ - extras/MacOSX/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf \ - 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 + extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/MediaInfo.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/MediaInfo.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/About.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/About.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/Open.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/Wizard.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/Wizard.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/Bookmarks.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/Extended.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/Extended.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \ + extras/package/macosx/Resources/dsa_pub.pem \ + extras/package/macosx/Resources/aiff.icns \ + extras/package/macosx/Resources/audio.icns \ + extras/package/macosx/Resources/avi.icns \ + extras/package/macosx/Resources/flv.icns \ + extras/package/macosx/Resources/generic.icns \ + extras/package/macosx/Resources/m4a.icns \ + extras/package/macosx/Resources/m4v.icns \ + extras/package/macosx/Resources/mkv.icns \ + extras/package/macosx/Resources/mov.icns \ + extras/package/macosx/Resources/movie.icns \ + extras/package/macosx/Resources/mp3.icns \ + extras/package/macosx/Resources/mpeg.icns \ + extras/package/macosx/Resources/ogg.icns \ + extras/package/macosx/Resources/playlist.icns \ + extras/package/macosx/Resources/rm.icns \ + extras/package/macosx/Resources/subtitle.icns \ + extras/package/macosx/Resources/vob.icns \ + extras/package/macosx/Resources/wav.icns \ + extras/package/macosx/Resources/vlc.icns \ + extras/package/macosx/Resources/wma.icns \ + extras/package/macosx/Resources/wmv.icns \ + extras/package/macosx/Resources/pause.png \ + extras/package/macosx/Resources/pause_blue.png \ + extras/package/macosx/Resources/play.png \ + extras/package/macosx/Resources/play_blue.png \ + extras/package/macosx/Resources/stop.png \ + extras/package/macosx/Resources/stop_blue.png \ + extras/package/macosx/Resources/display_left.png \ + extras/package/macosx/Resources/display_middle.png \ + extras/package/macosx/Resources/display_right.png \ + extras/package/macosx/Resources/display_slider.png \ + extras/package/macosx/Resources/display_track.png \ + extras/package/macosx/Resources/equalizerdrawer_active.png \ + extras/package/macosx/Resources/equalizerdrawer_blue.png \ + extras/package/macosx/Resources/fullscreen_active.png \ + extras/package/macosx/Resources/fullscreen_blue.png \ + extras/package/macosx/Resources/next_active.png \ + extras/package/macosx/Resources/next_blue.png \ + extras/package/macosx/Resources/playlistdrawer_active.png \ + extras/package/macosx/Resources/playlistdrawer_blue.png \ + extras/package/macosx/Resources/previous_active.png \ + extras/package/macosx/Resources/previous_blue.png \ + extras/package/macosx/Resources/skip_forward_active.png \ + extras/package/macosx/Resources/skip_forward_blue.png \ + extras/package/macosx/Resources/skip_previous_active.png \ + extras/package/macosx/Resources/skip_previous_blue.png \ + extras/package/macosx/Resources/volume_high.png \ + extras/package/macosx/Resources/volume_low.png \ + extras/package/macosx/Resources/volumeslider_blue.png \ + extras/package/macosx/Resources/volumeslider_normal.png \ + extras/package/macosx/Resources/volumetrack.png \ + extras/package/macosx/Resources/about_bg.png \ + extras/package/macosx/Resources/skip_forward_active_embedded.png \ + extras/package/macosx/Resources/play_embedded.png \ + extras/package/macosx/Resources/pause_embedded.png \ + extras/package/macosx/Resources/skip_previous_active_embedded.png \ + extras/package/macosx/Resources/pause_embedded_blue.png \ + extras/package/macosx/Resources/play_embedded_blue.png \ + extras/package/macosx/Resources/skip_forward_embedded_blue.png \ + extras/package/macosx/Resources/skip_previous_embedded_blue.png \ + extras/package/macosx/Resources/vlc.scriptSuite \ + extras/package/macosx/Resources/vlc.scriptTerminology \ + extras/package/macosx/Resources/README \ + extras/package/macosx/Resources/add_embedded.png \ + extras/package/macosx/Resources/add_embedded_blue.png \ + extras/package/macosx/Resources/repeat_embedded.png \ + extras/package/macosx/Resources/repeat_embedded_blue.png \ + extras/package/macosx/Resources/repeat_single_embedded_blue.png \ + extras/package/macosx/Resources/shuffle_embedded.png \ + extras/package/macosx/Resources/shuffle_embedded_blue.png \ + extras/package/macosx/Resources/fs_volume_slider_knob_highlight.png \ + extras/package/macosx/Resources/fs_volume_slider_knob.png \ + extras/package/macosx/Resources/fs_volume_slider_bar.png \ + extras/package/macosx/Resources/fs_volume_mute_highlight.png \ + extras/package/macosx/Resources/fs_volume_mute.png \ + extras/package/macosx/Resources/fs_volume_max_highlight.png \ + extras/package/macosx/Resources/fs_volume_max.png \ + extras/package/macosx/Resources/fs_time_slider_knob_highlight.png \ + extras/package/macosx/Resources/fs_time_slider_knob.png \ + extras/package/macosx/Resources/fs_time_slider.png \ + extras/package/macosx/Resources/fs_stop_highlight.png \ + extras/package/macosx/Resources/fs_stop.png \ + extras/package/macosx/Resources/fs_skip_previous_highlight.png \ + extras/package/macosx/Resources/fs_skip_previous.png \ + extras/package/macosx/Resources/fs_skip_next_highlight.png \ + extras/package/macosx/Resources/fs_skip_next.png \ + extras/package/macosx/Resources/fs_rewind_highlight.png \ + extras/package/macosx/Resources/fs_rewind.png \ + extras/package/macosx/Resources/fs_play_highlight.png \ + extras/package/macosx/Resources/fs_play.png \ + extras/package/macosx/Resources/fs_pause_highlight.png \ + extras/package/macosx/Resources/fs_pause.png \ + extras/package/macosx/Resources/fs_forward_highlight.png \ + extras/package/macosx/Resources/fs_forward.png \ + extras/package/macosx/Resources/fs_exit_fullscreen_highlight.png \ + extras/package/macosx/Resources/fs_exit_fullscreen.png \ + extras/package/macosx/Resources/fs_background.png \ + extras/package/macosx/Resources/add_embedded_graphite.png \ + extras/package/macosx/Resources/equalizerdrawer_graphite.png \ + extras/package/macosx/Resources/fullscreen_graphite.png \ + extras/package/macosx/Resources/next_graphite.png \ + extras/package/macosx/Resources/pause_embedded_graphite.png \ + extras/package/macosx/Resources/pause_graphite.png \ + extras/package/macosx/Resources/play_embedded_graphite.png \ + extras/package/macosx/Resources/play_graphite.png \ + extras/package/macosx/Resources/playlistdrawer_graphite.png \ + extras/package/macosx/Resources/previous_graphite.png \ + extras/package/macosx/Resources/repeat_embedded_graphite.png \ + extras/package/macosx/Resources/repeat_single_embedded_graphite.png \ + extras/package/macosx/Resources/shuffle_embedded_graphite.png \ + extras/package/macosx/Resources/skip_forward_embedded_graphite.png \ + extras/package/macosx/Resources/skip_forward_graphite.png \ + extras/package/macosx/Resources/skip_previous_embedded_graphite.png \ + extras/package/macosx/Resources/skip_previous_graphite.png \ + extras/package/macosx/Resources/stop_graphite.png \ + extras/package/macosx/Resources/volumeslider_graphite.png \ + extras/package/macosx/Resources/backward_big_down.png \ + extras/package/macosx/Resources/backward_big.png \ + extras/package/macosx/Resources/eq_sm.pdf \ + extras/package/macosx/Resources/forward_big_down.png \ + extras/package/macosx/Resources/forward_big.png \ + extras/package/macosx/Resources/fs_sm.pdf \ + extras/package/macosx/Resources/list_sm.pdf \ + extras/package/macosx/Resources/next_sm.pdf \ + extras/package/macosx/Resources/pause_big_down.png \ + extras/package/macosx/Resources/pause_big.png \ + extras/package/macosx/Resources/play_big_down.png \ + extras/package/macosx/Resources/play_big.png \ + extras/package/macosx/Resources/prev_sm.pdf \ + extras/package/macosx/Resources/sidebarAdd.png \ + extras/package/macosx/Resources/sidebarRepeat.png \ + extras/package/macosx/Resources/sidebarRepeatOn.png \ + extras/package/macosx/Resources/sidebarRepeatOneOn.png \ + extras/package/macosx/Resources/sidebarResizeWidget.png \ + extras/package/macosx/Resources/sidebarShuffle.png \ + extras/package/macosx/Resources/sidebarShuffleOn.png \ + extras/package/macosx/Resources/sidebarStatusAreaBackground.png \ + extras/package/macosx/Resources/stop_sm.pdf \ + extras/package/macosx/Resources/noart.png \ + extras/package/macosx/Resources/spref_cone_Audio_64.png \ + extras/package/macosx/Resources/spref_cone_Hotkeys_64.png \ + extras/package/macosx/Resources/spref_cone_Input_64.png \ + extras/package/macosx/Resources/spref_cone_Interface_64.png \ + extras/package/macosx/Resources/spref_cone_Subtitles_64.png \ + extras/package/macosx/Resources/spref_cone_Video_64.png \ + extras/package/macosx/fullscreen_panel.svg \ + extras/package/macosx/ub.sh \ + extras/package/macosx/vlc.xcodeproj/project.pbxproj \ + extras/package/macosx/Delete_Preferences.app/Contents/Info.plist \ + extras/package/macosx/Delete_Preferences.app/Contents/PkgInfo \ + extras/package/macosx/Delete_Preferences.app/Contents/MacOS/applet \ + extras/package/macosx/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf \ + extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns \ + extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc \ + extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \ + extras/package/macosx/plugin/Info.plist.in \ + extras/package/macosx/plugin/InstallerInfo.plist.in \ + extras/package/macosx/plugin/InstallerDescription.plist \ + extras/package/macosx/plugin/pbdevelopment.plist \ + extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \ + extras/package/macosx/eyetvplugin/Info.plist \ + extras/package/macosx/eyetvplugin/eyetvplugin.c \ + extras/package/macosx/eyetvplugin/eyetvplugin.h \ + extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings \ + extras/package/macosx/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj \ + extras/package/macosx/README.MacOSX.rtf \ + extras/package/macosx/Info.plist.in + ############################################################################### # Various utilities ( editor syntax files, D-Bus controller ... ) ############################################################################## EXTRA_DIST += \ - 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: - distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib + extras/analyser/zsh_completion.sh \ + extras/analyser/zsh.cpp \ + extras/analyser/emacs.init \ + extras/analyser/vlc.vim \ + extras/analyser/valgrind.suppressions \ + extras/buildsystem/make.pl \ + extras/misc/mpris.py \ + extras/misc/mpris.glade ############################################################################### # Building libvlc ############################################################################### -bin_SCRIPTS = vlc-config +noinst_SCRIPTS = vlc-config vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in $(SHELL) ./config.status --file=$@ chmod 0755 $@ @@ -233,57 +341,26 @@ vlc-config.in: vlc-config.in.in ./config.status --recheck touch $@ -CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin +CLEANFILES = $(BUILT_SOURCES_clean) DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile +MAINTAINERCLEANFILES = ChangeLog -# Shortcut for developpers to rebuild the core (libvlc + vlc) +# Shortcut for developers 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) - -.PHONY: libvlc - -############################################################################### -# Building vlc -############################################################################### - -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 +libcompat: + cd compat && $(MAKE) $(AM_MAKEFLAGS) -vlc_DEPENDENCIES = $(DATA_win32_rc) - -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 +libvlc: libcompat + cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la -vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` -LIB_libvlc = libvlc.la -LIBVLC = src/$(LIB_libvlc) +core: libvlc vlc + cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT) -#To get some nice output -nice: - $(top_builddir)/compile +doc: + cd doc && $(MAKE) $(AM_MAKEFLAGS) doc -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)" ; \ - echo $$cmd ; \ - eval $$cmd +.PHONY: libvlc core doc if HAVE_BEOS noinst_DATA = vlc-bundle @@ -297,16 +374,16 @@ vlc-bundle: vlc cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \ fi ; \ done - if test -d $(top_builddir)/extras/contrib/vlc-lib ; then \ + if test -d $(CONTRIB_DIR)/vlc-lib ; then \ mkdir -p $(top_builddir)/vlc-bundle/lib ; \ - for i in $(top_builddir)/extras/contrib/vlc-lib/*.so ; do \ + for i in $(CONTRIB_DIR)/vlc-lib/*.so ; do \ cp $$i $(top_builddir)/vlc-bundle/lib/ ; \ done ; \ fi cat $(top_srcdir)/po/LINGUAS | while read i; do \ - mkdir -p "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \ + mkdir -p "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES" ; \ cp "$(top_builddir)/po/$$i.gmo" \ - "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \ + "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \ done find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \; endif @@ -315,50 +392,70 @@ endif # Building aliases ############################################################################### -ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc -bin_SCRIPTS += $(ALIASES) +ALL_ALIASES = cvlc rvlc svlc qvlc nvlc mvlc +bin_SCRIPTS = $(ALIASES) +CLEANFILES += $(ALIASES) $(noinst_SCRIPTS) EXTRA_SCRIPTS = $(ALL_ALIASES) dist_noinst_SCRIPTS += make-alias -MKALIAS = bindir="$(bindir)" transform="$(transform)" $(top_srcdir)/make-alias $@ +MKALIAS = bindir="$(bindir)" transform="$(transform)" program_prefix="$(program_prefix)" program_suffix="$(program_suffix)" $(top_srcdir)/make-alias $@ -cvlc: make-alias - $(MKALIAS) dummy +cvlc: make-alias Makefile + $(AM_V_GEN)$(MKALIAS) dummy -rvlc: make-alias - $(MKALIAS) rc +rvlc: make-alias Makefile + $(AM_V_GEN)$(MKALIAS) rc -svlc: make-alias - $(MKALIAS) skins2 +svlc: make-alias Makefile + $(AM_V_GEN)$(MKALIAS) skins2 -wxvlc: make-alias - $(MKALIAS) wx +qvlc: make-alias Makefile + $(AM_V_GEN)$(MKALIAS) qt4 -qvlc: make-alias - $(MKALIAS) qt4 +nvlc: make-alias Makefile + $(AM_V_GEN)$(MKALIAS) ncurses -nvlc: make-alias - $(MKALIAS) ncurses +mvlc: make-alias Makefile + $(AM_V_GEN)$(MKALIAS) maemo + +if BUILD_VLC +noinst_SCRIPTS += vlc$(EXEEXT) +endif + +vlc$(EXEEXT): + $(AM_V_GEN)ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT) if HAVE_DARWIN +if BUILD_MACOSX_VLC_APP # Create the MacOS X app -vlc_app_DATA = VLC.app -vlc_appdir = $(bindir) -# VLC-release.app is the old VLC.app target +noinst_DATA = VLC.app +endif +endif + +silentstd = $(silentstd_$(V)) +silentstd_ = $(silentstd_$(AM_DEFAULT_VERBOSITY)) +silentstd_0 = 2>&1 >/dev/null + +# VLC-release.app for packaging and giving it to your friends +# use package-macosx to get a nice dmg VLC-release.app: vlc - @if test -e "$(top_builddir)/tmp"; then \ - echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \ - false; \ - else \ - echo "OK."; mkdir -p "$(top_builddir)/tmp/extras/MacOSX"; \ - fi + ( cd src && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd) ) + rm -Rf "$(top_builddir)/tmp" + mkdir -p "$(top_builddir)/tmp/extras/package/macosx" rm -Rf $(top_builddir)/VLC-release.app - cp -R $(srcdir)/extras/MacOSX/vlc.xcodeproj $(top_builddir)/tmp/extras/MacOSX/ - cp -R $(srcdir)/extras/MacOSX/Resources $(top_builddir)/tmp/extras/MacOSX - for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \ + for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \ + cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ + done + REVISION=`(git --git-dir=$(srcdir)/.git describe --always || echo exported)` && \ + cat $(top_builddir)/extras/package/macosx/Info.plist | \ + sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist + cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/ + for i in AUTHORS COPYING THANKS; do \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done + mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle + cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ @@ -389,8 +486,9 @@ VLC-release.app: vlc prefs_widgets.m \ prefs.h \ prefs.m \ + simple_prefs.h \ + simple_prefs.m \ vout.h \ - voutqt.m \ voutgl.m \ wizard.h \ wizard.m \ @@ -398,12 +496,8 @@ VLC-release.app: vlc extended.m \ bookmarks.h \ bookmarks.m \ - sfilters.h \ - sfilters.m \ - update.h \ - update.m \ - interaction.h \ - interaction.m \ + coredialogs.h \ + coredialogs.m \ embeddedwindow.h \ embeddedwindow.m \ fspanel.h \ @@ -412,122 +506,79 @@ VLC-release.app: vlc cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - 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; \ + $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \ + xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \ + cd ../../../../ && \ + cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \ rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS - $(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 \ - if test -n "$$i" ; \ - 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/`basename $${i}` ; \ - done ; \ - fi - $(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}` ; \ + PRODUCT="VLC-release.app" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua + for i in $(srcdir)/share/lua/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/`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}` ; \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist + for i in $(srcdir)/share/lua/playlist/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist/`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}` ; \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/meta + for i in $(srcdir)/share/lua/meta/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/meta/`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}` ; \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf + for i in $(srcdir)/share/lua/intf/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/`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}` ; \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/modules + for i in $(srcdir)/share/lua/intf/modules/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/modules/`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/lua/http/dialogs + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/js + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/images + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests + $(INSTALL) -m 644 $(srcdir)/share/lua/http/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/.hosts + for i in $(srcdir)/share/lua/http/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/`basename $${i}` ; \ + done + for i in $(srcdir)/share/lua/http/dialogs/* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/dialogs/`basename $${i}` ; \ + done + for i in $(srcdir)/share/lua/http/js/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/js/`basename $${i}` ; \ + done + for i in $(srcdir)/share/lua/http/images/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/images/`basename $${i}` ; \ + done + for i in $(srcdir)/share/lua/http/requests/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/`basename $${i}` ; \ + done + $(INSTALL) -m 644 $(srcdir)/share/lua/http/requests/README.txt $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/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 + $(INSTALL) -m 644 $(srcdir)/share/http/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/.hosts for i in $(srcdir)/share/http/*.* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \ - done ; \ + 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 ; \ + 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 ; \ + 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 ; \ + 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 + done + $(INSTALL) -m 644 $(srcdir)/share/http/requests/README.txt $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/README.txt + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale 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 ; \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \ + $(INSTALL) $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ mkdir -p $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ ln -sf ../English.lproj/InfoPlist.strings \ $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ @@ -535,22 +586,29 @@ VLC-release.app: vlc $(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/Contents/Resources/English.lproj -name designable.nib -delete; 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 \ - echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \ - false; \ - else \ - echo "OK."; mkdir -p "$(top_builddir)/tmp/extras/MacOSX"; \ - fi +# This is just for development purposes. +# The resulting VLC.app will only run in this tree. +VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.libs/libvlc.dylib + $(AM_V_GEN)(cd src && make install $(silentstd)) + rm -Rf $(top_builddir)/tmp + mkdir -p "$(top_builddir)/tmp/extras/package/macosx" rm -Rf $(top_builddir)/VLC.app - cp -R $(srcdir)/extras/MacOSX/vlc.xcodeproj $(top_builddir)/tmp/extras/MacOSX/ - cp -R $(srcdir)/extras/MacOSX/Resources $(top_builddir)/tmp/extras/MacOSX - for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \ + for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \ + cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ + done + REVISION=`(git --git-dir=$(srcdir)/.git describe --always || echo exported)` && \ + cat $(top_builddir)/extras/package/macosx/Info.plist | \ + sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist + cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/ + for i in AUTHORS COPYING THANKS; do \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done + mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle + cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ @@ -581,8 +639,9 @@ VLC.app: vlc prefs_widgets.m \ prefs.h \ prefs.m \ + simple_prefs.h \ + simple_prefs.m \ vout.h \ - voutqt.m \ voutgl.m \ wizard.h \ wizard.m \ @@ -590,12 +649,8 @@ VLC.app: vlc extended.m \ bookmarks.h \ bookmarks.m \ - sfilters.h \ - sfilters.m \ - update.h \ - update.m \ - interaction.h \ - interaction.m \ + coredialogs.h \ + coredialogs.m \ embeddedwindow.h \ embeddedwindow.m \ fspanel.h \ @@ -604,47 +659,23 @@ VLC.app: vlc cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - 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; \ - rm -Rf $(top_builddir)/tmp + $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \ + xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \ + cd ../../../../ && \ + cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC.app $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS - $(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 \ - if test -n "$$i" ; \ - 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 \ - 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`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/ - $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale + touch $(top_builddir)/VLC.app/Contents/MacOS/VLC + chmod +x $(top_builddir)/VLC.app/Contents/MacOS/VLC + $(INSTALL) $(top_builddir)/bin/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC + ln -sf ../../../modules $(top_builddir)/VLC.app/Contents/MacOS/plugins + install -d $(top_builddir)/VLC.app/Contents/MacOS/share + for i in `ls $(srcdir)/share`; do \ + ln -sf `pwd`/$(srcdir)/share/$$i $(top_builddir)/VLC.app/Contents/MacOS/share/; \ + done + $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/locale 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/MacOS/share/locale/$${i}/LC_MESSAGES ; \ + ln -sfn `pwd`/$(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ ln -sf ../English.lproj/InfoPlist.strings \ $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ @@ -652,16 +683,6 @@ VLC.app: vlc $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ done printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo -endif - -if HAVE_WIN32 -DATA_win32_rc = $(noinst_share_vlc_win32_rc_DATA) -noinst_share_vlc_win32_rc_DATA = share/vlc_win32_rc.$(OBJEXT) -noinst_share_vlc_win32_rcdir = $(libdir) -share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc - $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir)/share -i $< -o $@ -endif - ############################################################################### # Building architecture-specific binary packages @@ -671,394 +692,401 @@ endif # the same setup as the maintaner(s). # -package-win-common: +############################################################################ +## Win ## +############################################################################ +destdir=$(prefix) +win32_destdir=$(top_builddir)/vlc-$(VERSION) +win32_debugdir=$(top_builddir)/symbols-$(VERSION) +win32_lua_destdir=$(win32_destdir)/lua +win32_xpi_destdir=$(win32_destdir)/vlc-plugin + +#Win-common is for win32 and wince +package-win-common: install # 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; \ + @if test -e "$(win32_destdir)"; then \ + echo "Error: please remove $(win32_destdir), it is in the way"; \ + false; \ + elif test -e "$(win32_debugdir)"; then \ + echo "Error: please remove $(win32_debugdir), it is in the way"; \ + false; \ else \ - echo "OK."; mkdir -p "$(top_builddir)/vlc-${VERSION}"; \ + echo "Debug dir OK."; mkdir -p "$(win32_debugdir)"; \ + echo "Dest dir OK."; mkdir -p "$(win32_destdir)"; \ fi -# Copy relevant files - cp "$(top_builddir)/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/" - cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/" - cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-${VERSION}/" - cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-${VERSION}/" +# Executables, major libs+manifests + find $(destdir) -maxdepth 4 \( -name "*$(LIBEXT)" -o -name "*$(EXEEXT)" \) -exec cp {} "$(win32_destdir)/" \; + for file in $(top_srcdir)/extras/package/win32/vlc$(EXEEXT).manifest \ + $(top_srcdir)/extras/package/win32/libvlc$(LIBEXT).manifest; \ + do cp $$file "$(win32_destdir)/" ; done; - for file in AUTHORS MAINTAINERS THANKS ; \ - do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done; +# Text files and clean them + for file in AUTHORS THANKS ; \ + do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(win32_destdir)/$${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 + do cp "$(srcdir)/$$file" "$(win32_destdir)/$${file}.txt"; done - mkdir $(top_builddir)/vlc-${VERSION}/locale - 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 +# Necessary icon + cp $(srcdir)/share/icons/vlc.ico $(win32_destdir) - 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" - 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/.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/*.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}/ ; +# Locales + -cp -r $(destdir)/share/locale $(win32_destdir) -if BUILD_MOZILLA - mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla" - cp $(top_builddir)/mozilla/.libs/npvlc$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ; -endif +# Plugins + cp -r $(destdir)/lib/vlc/plugins $(win32_destdir) -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/* ; +if BUILD_LUA +# Copy the lua scripts (HTTP) + mkdir -p $(win32_lua_destdir) + cp -r $(destdir)/share/vlc/lua/http "$(win32_lua_destdir)/http" - cp $(top_builddir)/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ; +# Lua Scripts - cannot be simplified yet, because make install doesn't install READMEs + $(INSTALL) -d $(win32_lua_destdir) + for i in $(srcdir)/share/lua/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/modules + for i in $(srcdir)/share/lua/modules/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/modules/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/extensions + for i in $(srcdir)/share/lua/extensions/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/extensions/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/intf + for i in $(srcdir)/share/lua/intf/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/intf/modules + for i in $(srcdir)/share/lua/intf/modules/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/modules/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/meta/art + for i in $(srcdir)/share/lua/meta/art/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/art/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/meta/fetcher + for i in $(srcdir)/share/lua/meta/fetcher/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/fetcher/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/meta/reader + for i in $(srcdir)/share/lua/meta/reader/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/reader/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/playlist + for i in $(srcdir)/share/lua/playlist/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/sd + for i in $(srcdir)/share/lua/sd/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/sd/`basename $${i}` ; \ + done 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-win-common-strip: - $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)" - $(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)" - $(STRIP) "vlc-${VERSION}/libvlc-control$(LIBEXT)" +if BUILD_HTTPD + cp -r $(destdir)/share/vlc/http $(win32_destdir) +endif +if BUILD_SKINS + cp -r $(destdir)/share/vlc/skins2 $(win32_destdir)/skins +endif +if BUILD_OSDMENU + cp -r $(destdir)/share/vlc/osdmenu "$(win32_destdir)/osdmenu" + for file in $(win32_destdir)/osdmenu/*.cfg; do \ + sed 's%share/osdmenu%osdmenu%g' "$$file" > "$$file.tmp" || exit $$? ; \ + sed 's%/%\\%g' "$$file.tmp" > "$$file" || exit$$? ; \ + rm -f -- "$$file.tmp"; \ + done +endif if BUILD_MOZILLA - $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/npvlc$(LIBEXT); + cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir) endif if BUILD_ACTIVEX - $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/axvlc$(LIBEXT); + cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir) endif -package-win32-base-debug: package-win-common -# Copy relevant files - cp "$(top_builddir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/" +# SDK + mkdir -p "$(win32_destdir)/sdk/lib" + cp -r $(destdir)/include "$(win32_destdir)/sdk" + cp -r $(destdir)/lib/pkgconfig "$(win32_destdir)/sdk/lib" + for file in libvlc.dll.a libvlc.la libvlccore.dll.a libvlccore.la; do \ + cp -r $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done +if BUILD_ACTIVEX + mkdir -p "$(win32_destdir)/sdk/activex" + cp $(srcdir)/projects/activex/README.TXT $(win32_destdir)/sdk/activex/ + cp $(srcdir)/projects/activex/test.html $(win32_destdir)/sdk/activex/ +endif - 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 + find $(win32_destdir) -type f \( -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*.lua' \) -exec $(U2D) {} \; - 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 +#Enable DEP and ASLR for all the binaries +if USE_PEFLAGS + find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -print -o -name '*$(EXEEXT)' -print \) -exec $(PEFLAGS) --dynamicbase=true --nxcompat=true {} \; +endif - $(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; \ +# Strip DLLs +package-win-base: package-win-common + find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' \) | while read i; \ + do if test -n "$$i" ; then \ + $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \ + $(OBJCOPY) --strip-all "$$i" ; \ + $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \ + mv "$$i.dbg" "$(win32_debugdir)"; \ + fi ; \ done +package-win32-webplugin-common: package-win-base + mkdir -p "$(win32_xpi_destdir)/plugins" + find $(destdir) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \; + cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins" + cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_xpi_destdir)/plugins" + cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/plugins" + rm -rf "$(win32_xpi_destdir)/plugins/plugins/*qt*" + rm -rf "$(win32_xpi_destdir)/plugins/plugins/*skins*" + +package-win32-xpi: package-win32-webplugin-common + cp $(top_builddir)/projects/mozilla/install.rdf "$(win32_xpi_destdir)" + cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" install.rdf plugins + +package-win32-crx: package-win32-webplugin-common + cp $(top_builddir)/projects/mozilla/manifest.json "$(win32_xpi_destdir)" + crxmake --pack-extension "$(win32_xpi_destdir)" \ + --extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf + +package-win32-base-exe: package-win-base +# Script installer + cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/" + cp "$(top_builddir)/extras/package/win32/spad.nsi" "$(win32_destdir)/" + mkdir "$(win32_destdir)/languages" + cp $(srcdir)/extras/package/win32/languages/*.nsh "$(win32_destdir)/languages/" +# Copy the UAC NSIS plugin + mkdir -p "$(win32_destdir)/NSIS" + cp "$(top_srcdir)/extras/package/win32/UAC.nsh" "$(win32_destdir)/NSIS" + cp "$(top_srcdir)/extras/package/win32/UAC.dll" "$(win32_destdir)/NSIS" -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 makensis -VERSION >/dev/null 2>&1; then \ - MAKENSIS="makensis -DVERSION=${VERSION}"; \ + MAKENSIS="makensis"; \ elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \ - MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=${VERSION}"; \ - elif [ -x "${PROGRAMFILES}/NSIS/makensis" ]; then \ - MAKENSIS="${PROGRAMFILES}/NSIS/makensis -DVERSION=${VERSION}"; \ + MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis"; \ + elif [ -x "$(PROGRAMFILES)/NSIS/makensis" ]; then \ + MAKENSIS="$(PROGRAMFILES)/NSIS/makensis"; \ elif wine --version >/dev/null 2>&1; then \ - MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=${VERSION}"; \ + MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe"; \ else \ echo 'Error: cannot locate makensis tool'; exit 1; \ fi; \ - eval "$$MAKENSIS $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi" + eval "$$MAKENSIS $(win32_destdir)/spad.nsi"; \ + eval "$$MAKENSIS $(win32_destdir)/vlc.win32.nsi" -package-win32-base-exe-cygwin: package-win32-base-exe +package-win32-base-zip: package-win-base # Create package + rm -f -- vlc-$(VERSION)-win32.zip + zip -r -9 vlc-$(VERSION)-win32.zip vlc-$(VERSION) -package-win32-base-exe-linux: +package-win32-base-debug-zip: package-win-common # Create package - makensis -DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi + rm -f -- vlc-$(VERSION)-win32-debug.zip + zip -r -9 vlc-$(VERSION)-win32-debug.zip vlc-$(VERSION) -package-win32-base-zip: package-win32-base -# Create package - zip -r -9 vlc-${VERSION}-win32.zip vlc-${VERSION} +package-win32-base-7zip: package-win-base +# Create package + 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32.7z 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-base-debug-7zip: package-win-common +# Create package + 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32-debug.7z vlc-$(VERSION) -package-win32-exe: package-win32-base package-win32-base-exe -# Clean up - rm -Rf $(top_builddir)/vlc-${VERSION} +package-win32-cleanup: + rm -Rf $(win32_destdir) $(win32_debugdir) -package-win32-exe-linux: package-win32-base package-win32-base-exe-linux -# Clean up - rm -Rf $(top_builddir)/vlc-${VERSION} +package-win32-exe: package-win-base package-win32-base-exe package-win32-cleanup -package-win32-zip: package-win32-base-zip -# Clean up - rm -Rf $(top_builddir)/vlc-${VERSION} +package-win32-zip: package-win32-base-zip package-win32-cleanup -package-win32-7zip: package-win32-base-7zip -# Clean up - rm -Rf $(top_builddir)/vlc-${VERSION} +package-win32-debug-zip: package-win32-base-debug-zip package-win32-cleanup -package-win32-no-clean: package-win32-base-exe package-win32-base-zip package-win32-base-7zip +package-win32-7zip: package-win32-base-7zip package-win32-cleanup -package-win32: package-win32-no-clean -# Clean up - rm -Rf $(top_builddir)/vlc-${VERSION} +package-win32-debug-7zip: package-win32-base-debug-7zip package-win32-cleanup -package-wince-base: package-win-common package-win-common-strip +package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe package-win32-xpi -package-wince-base-zip: -# Create package - zip -r vlc-${VERSION}-wince.zip vlc-${VERSION} +package-win32: package-win32-no-clean package-win32-cleanup -package-wince: package-wince-base package-wince-base-zip -# Clean up - rm -Rf $(top_builddir)/vlc-${VERSION} +package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip package-win32-cleanup -package-beos: -# Check that tmp isn't in the way - @if test -e $(srcdir)/tmp; then \ - echo "Error: please remove $(srcdir)/tmp, it is in the way"; \ - false ; \ - else \ - echo "OK." ; mkdir $(srcdir)/tmp ; \ - fi +####### +# WinCE +####### +package-wince-base: package-win-base + +package-wince-base-zip: package-wince-base +# Create package + rm -f -- vlc-$(VERSION)-wince.zip + zip -r -9 vlc-$(VERSION)-wince.zip vlc-$(VERSION) -# Copy relevant files - mkdir -p $(srcdir)/tmp/vlc ; - cd $(srcdir) && cp -R vlc-bundle/* AUTHORS COPYING ChangeLog README \ - THANKS NEWS tmp/vlc/ ; - -# Create debug package - 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} ) - mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ ; - mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ; - -# Create normal package - $(STRIP) --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ; - find $(srcdir)/tmp/vlc -name 'lib*.so' -exec $(STRIP) \ - --strip-debug --strip-unneeded "{}" \; ; - 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} ) - mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/ ; +package-wince: package-wince-base-zip package-win32-cleanup -# Clean up - rm -Rf $(srcdir)/tmp ; -package-macosx: +######################################################################### +## MacOS X ## +######################################################################### +package-macosx: VLC-release.app ChangeLog # Check that the temporary location isn't in the way - @if test -e "$(top_builddir)/vlc-${VERSION}/"; then \ - rm -Rf "$(top_builddir)/vlc-${VERSION}/" ; \ + @if test -e "$(top_builddir)/vlc-$(VERSION)/"; then \ + rm -Rf "$(top_builddir)/vlc-$(VERSION)/" ; \ fi - echo "Create package directory: vlc-${VERSION}/"; - mkdir -p "$(top_builddir)/vlc-${VERSION}/"; + echo "Create package directory: vlc-$(VERSION)/"; + mkdir -p "$(top_builddir)/vlc-$(VERSION)/"; # Copy relevant files @if test -e "$(top_builddir)/VLC-release.app/"; then \ - cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \ + 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"; \ + 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 ; + mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ + mkdir -p $(top_builddir)/vlc-$(VERSION)/.background/ && \ + cp $(srcdir)/AUTHORS $(srcdir)/COPYING $(srcdir)/README $(srcdir)/THANKS $(srcdir)/NEWS $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ + cp -R $(srcdir)/extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \ + cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \ + cp $(srcdir)/extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png + cp -L $(top_builddir)/ChangeLog $(top_builddir)/vlc-$(VERSION)/Goodies/ # Place a link to the application folder - ln -s /Applications $(top_builddir)/vlc-${VERSION}/Applications ; + ln -s /Applications $(top_builddir)/vlc-$(VERSION)/Applications + +# Create disk image (temporarily taken from the 0.8.6-bugfix branch to provide reliable NBs) + echo "Creating disk image" + rm -f "$(top_builddir)/vlc-$(VERSION).dmg" + hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-$(VERSION)" \ + "$(top_builddir)/vlc-$(VERSION).dmg" -scrub + echo "Disk image creation completed:" + ls -la "$(top_builddir)/vlc-$(VERSION).dmg" ; echo # Create disk image - echo "Creating disk image" ; - rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ; - hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-${VERSION}" \ - "$(top_builddir)/vlc-${VERSION}.dmg" -format UDRW \ - -scrub -imagekey zlib-level=9 ; +# echo "Creating disk image" +# rm -f "$(top_builddir)/vlc-$(VERSION).dmg" +# hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-$(VERSION)" \ +# "$(top_builddir)/vlc-$(VERSION).dmg" -format UDRW \ +# -scrub -imagekey zlib-level=9 -attach # 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)" +# echo "Make sure the root window of the dmg will pop up when the dmg is mounted" +# mkdir -p $(top_builddir)/vlcmnt +# hdiutil attach -nokernel -readwrite -noverify -noautoopen -private "$(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 ; +# 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" ; + 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 UDBZ -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 ; + echo "Disk image creation completed:" + ls -la "$(top_builddir)/vlc-$(VERSION).dmg" ; echo # Clean up - rm -Rf "$(top_builddir)/vlc-${VERSION}" ; + rm -Rf "$(top_builddir)/vlc-$(VERSION)" + +package-macosx-zip: VLC-release.app + rm -Rf $(top_builddir)/vlc-$(VERSION) + mkdir -p $(top_builddir)/vlc-$(VERSION) + cp -R $(top_builddir)/VLC-release.app $(top_builddir)/vlc-$(VERSION)/VLC.app + mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies + for i in AUTHORS COPYING ChangeLog README THANKS NEWS; do \ + cp $(srcdir)/$$i $(top_builddir)/vlc-$(VERSION)/Goodies; \ + done + cp -R $(srcdir)/extras/package/macosx/Delete_Preferences.app \ + $(top_builddir)/vlc-$(VERSION)/Goodies + cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf \ + $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf + zip -r -y -9 $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION) + rm -Rf $(top_builddir)/vlc-$(VERSION) + +package-macosx-framework-zip: + rm -Rf $(top_builddir)/vlckit-$(VERSION) + mkdir -p $(top_builddir)/vlckit-$(VERSION) + cp -R $(srcdir)/projects/macosx/framework/build/Debug/VLCKit.framework \ + $(top_builddir)/vlckit-$(VERSION)/VLCKit.framework + mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies + for i in AUTHORS COPYING ChangeLog README THANKS NEWS; do \ + cp $(srcdir)/$$i $(top_builddir)/vlckit-$(VERSION)/Goodies; \ + done + zip -r -y -9 $(top_builddir)/vlckit-$(VERSION).zip $(top_builddir)/vlckit-$(VERSION) + 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 -f "$(top_builddir)/projects/mozilla/VLC Plugin.plugin/Contents/MacOS/modules/libmacosx_plugin.dylib" + cp -R "$(top_builddir)/projects/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" \ + export PACKAGEMAKER= + if test -x /Developer/Tools/packagemaker; then \ + export PACKAGEMAKER=/Developer/Tools/packagemaker; \ + fi; \ + if test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then \ + export PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; \ + fi; \ + $${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 + -i "$(top_builddir)/extras/package/macosx/plugin/InstallerInfo.plist" \ + -d "$(top_srcdir)/extras/package/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 ; + 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 UDBZ \ + -scrub -imagekey zlib-level=9 echo "Disk image creation completed:" - rm -rf "$(top_builddir)/vlc-plugin-${VERSION}" + rm -rf "$(top_builddir)/vlc-plugin-$(VERSION)" +endif + +package-macosx-xpi: +if BUILD_MOZILLA + mkdir -p "$(top_builddir)/macosx-xpi/plugins" + cp $(top_builddir)/projects/mozilla/install.rdf \ + "$(top_builddir)/macosx-xpi/" + cp -R "$(top_builddir)/projects/mozilla/VLC Plugin.plugin" \ + "$(top_builddir)/macosx-xpi/plugins" + cd "$(top_builddir)/macosx-xpi" && zip -r vlc-$(VERSION).xpi install.rdf plugins endif package-translations: - @if test -e "$(srcdir)/vlc-translations-${VERSION}"; then \ - echo "Error: please remove $(srcdir)/vlc-translations-${VERSION}, it is in the way"; \ + @if test -e "$(srcdir)/vlc-translations-$(VERSION)"; then \ + echo "Error: please remove $(srcdir)/vlc-translations-$(VERSION), it is in the way"; \ false; \ else \ - echo "OK."; mkdir -p "$(srcdir)/vlc-translations-${VERSION}"; \ + echo "OK."; mkdir -p "$(srcdir)/vlc-translations-$(VERSION)"; \ fi # Copy translations cat $(top_srcdir)/po/LINGUAS | while read i; do \ cp "$(srcdir)/po/$${i}.po" \ - "$(srcdir)/vlc-translations-${VERSION}/$${i}.po" \ + "$(srcdir)/vlc-translations-$(VERSION)/$${i}.po" \ || true ; \ done cp "$(srcdir)/doc/translations.txt" \ - "$(srcdir)/vlc-translations-${VERSION}/README.txt" + "$(srcdir)/vlc-translations-$(VERSION)/README.txt" echo "#!/bin/sh" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh" echo "" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh" @@ -1074,47 +1102,12 @@ 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) && \ - echo "# automatically created by make update-po" ; \ - echo "" ; \ - echo "# main sources" ; \ - find include src -name '*.[chm]' -o -name '*.[ch]pp' \ - | 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' -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 cd po && $(MAKE) POTFILES vlc.pot update-po -#cd po && $(MAKE) update-po - -############################################################################### -# Stamp rules -############################################################################### -stamp-builtin: - @for dep in "" `$(VLC_CONFIG) --target plugin`; do \ - if test "$${dep}.la" -nt "$(top_builddir)/vlc$(EXEEXT)"; then \ - touch "$@"; \ - break; \ - fi; \ - done - -.PHONY: stamp-builtin ############################################################################### # Enforce Mac OS X deployment target environment variable