X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=5aeb06973b9d6feceb00b35f6f93105f2f3f811b;hb=9d4515ac4873076af85af33270d126818c0e8639;hp=aeb3d011e96366e60bb1da2606151f7a34b2b41b;hpb=42850ecfa2401d3a6dacea664936b657ae002f13;p=vlc

diff --git a/Makefile.am b/Makefile.am
index aeb3d011e9..5aeb06973b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,44 +5,19 @@
 # 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.
-#  - src (libvlc) is nedeed by modules, mozilla and bindings
+#  - src (libvlc) is nedeed by modules
 #  - libs/* are needed by modules
-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
+DIST_SUBDIRS = m4 compat doc po share src modules lib bin test
+SUBDIRS = compat doc po share src modules lib
 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
+SUBDIRS += test
 
 EXTRA_DIST = \
-	HACKING \
-	INSTALL.win32 \
 	extras/package/win32/vlc.exe.manifest \
 	extras/package/win32/libvlc.dll.manifest \
 	extras/package/macosx/README.MacOSX.rtf \
-	vlc-config.in.in \
 	extras/package/rpm/vlc.fedora.spec \
 	extras/package/rpm/vlc.altlinux.spec \
 	extras/package/win32/vlc.win32.nsi.in \
@@ -51,6 +26,7 @@ EXTRA_DIST = \
 	extras/package/win32/UAC.dll \
 	extras/package/win32/languages/declaration.nsh \
 	extras/package/win32/languages/bengali.nsh \
+	extras/package/win32/languages/basque.nsh \
 	extras/package/win32/languages/brazilian_portuguese.nsh \
 	extras/package/win32/languages/bulgarian.nsh \
 	extras/package/win32/languages/catalan.nsh \
@@ -64,6 +40,7 @@ EXTRA_DIST = \
 	extras/package/win32/languages/hungarian.nsh \
 	extras/package/win32/languages/italian.nsh \
 	extras/package/win32/languages/japanese.nsh \
+	extras/package/win32/languages/lithuanian.nsh \
 	extras/package/win32/languages/occitan.nsh \
 	extras/package/win32/languages/polish.nsh \
 	extras/package/win32/languages/punjabi.nsh \
@@ -77,7 +54,7 @@ EXTRA_DIST = \
 dist_noinst_SCRIPTS = bootstrap
 nodist_noinst_SCRIPTS = compile
 
-BUILT_SOURCES_distclean = vlc-config
+BUILT_SOURCES_distclean =
 if HAVE_WIN32
 BUILT_SOURCES_distclean += \
 	extras/package/win32/vlc.win32.nsi extras/package/win32/spad.nsi
@@ -117,180 +94,215 @@ AUTOMAKE_OPTIONS = \
 ChangeLog: Makefile.am
 	rm -f -- "$@"
 	cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs
-	ln -sf doc/ChangeLog-2009 "$@"
+	$(LN_S) -f doc/ChangeLog-2009 "$@"
 
 ###############################################################################
 # MacOS X project
 ###############################################################################
 
 EXTRA_DIST += \
-	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/dsa_pub.pem \
+	extras/package/macosx/Resources/English.lproj/About.xib \
+	extras/package/macosx/Resources/English.lproj/AudioEffects.xib \
+	extras/package/macosx/Resources/English.lproj/Bookmarks.xib \
+	extras/package/macosx/Resources/English.lproj/CoreDialogs.xib \
+	extras/package/macosx/Resources/English.lproj/ErrorPanel.xib \
+	extras/package/macosx/Resources/English.lproj/MainMenu.xib \
+	extras/package/macosx/Resources/English.lproj/MediaInfo.xib \
+	extras/package/macosx/Resources/English.lproj/Open.xib \
+	extras/package/macosx/Resources/English.lproj/Preferences.xib \
+	extras/package/macosx/Resources/English.lproj/SyncTracks.xib \
+	extras/package/macosx/Resources/English.lproj/VideoEffects.xib \
+	extras/package/macosx/Resources/English.lproj/Wizard.xib \
+	extras/package/macosx/Resources/fspanel/fs_background.png \
+	extras/package/macosx/Resources/fspanel/fs_exit_fullscreen.png \
+	extras/package/macosx/Resources/fspanel/fs_exit_fullscreen_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_forward.png \
+	extras/package/macosx/Resources/fspanel/fs_forward_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_pause.png \
+	extras/package/macosx/Resources/fspanel/fs_pause_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_play.png \
+	extras/package/macosx/Resources/fspanel/fs_play_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_rewind.png \
+	extras/package/macosx/Resources/fspanel/fs_rewind_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_skip_next.png \
+	extras/package/macosx/Resources/fspanel/fs_skip_next_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_skip_previous.png \
+	extras/package/macosx/Resources/fspanel/fs_skip_previous_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_stop.png \
+	extras/package/macosx/Resources/fspanel/fs_stop_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_time_slider.png \
+	extras/package/macosx/Resources/fspanel/fs_time_slider_knob.png \
+	extras/package/macosx/Resources/fspanel/fs_time_slider_knob_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_max.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_max_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_mute.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_mute_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_slider_bar.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_slider_knob.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_slider_knob_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_background@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_exit_fullscreen@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_exit_fullscreen_highlight@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_forward@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_forward_highlight@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_pause@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_pause_highlight@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_play@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_play_highlight@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_rewind@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_rewind_highlight@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_skip_next@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_skip_next_highlight@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_skip_previous@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_skip_previous_highlight@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_stop@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_stop_highlight@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_time_slider@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_time_slider_knob@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_time_slider_knob_highlight@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_max@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_max_highlight@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_mute@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_mute_highlight@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_slider_bar@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_slider_knob@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_slider_knob_highlight@x1.5.png \
+	extras/package/macosx/Resources/icons/aiff.icns \
+	extras/package/macosx/Resources/icons/audio.icns \
+	extras/package/macosx/Resources/icons/avi.icns \
+	extras/package/macosx/Resources/icons/flv.icns \
+	extras/package/macosx/Resources/icons/generic.icns \
+	extras/package/macosx/Resources/icons/m4a.icns \
+	extras/package/macosx/Resources/icons/m4v.icns \
+	extras/package/macosx/Resources/icons/mkv.icns \
+	extras/package/macosx/Resources/icons/mov.icns \
+	extras/package/macosx/Resources/icons/movie.icns \
+	extras/package/macosx/Resources/icons/mp3.icns \
+	extras/package/macosx/Resources/icons/mpeg.icns \
+	extras/package/macosx/Resources/icons/ogg.icns \
+	extras/package/macosx/Resources/icons/playlist.icns \
+	extras/package/macosx/Resources/icons/rm.icns \
+	extras/package/macosx/Resources/icons/subtitle.icns \
+	extras/package/macosx/Resources/icons/vlc.icns \
+	extras/package/macosx/Resources/icons/vob.icns \
+	extras/package/macosx/Resources/icons/wav.icns \
+	extras/package/macosx/Resources/icons/wma.icns \
+	extras/package/macosx/Resources/icons/wmv.icns \
+	extras/package/macosx/Resources/mainwindow/back-pressed.png \
+	extras/package/macosx/Resources/mainwindow/back.png \
+	extras/package/macosx/Resources/mainwindow/bottom-background.png \
+	extras/package/macosx/Resources/mainwindow/bottombar-mini.png \
+	extras/package/macosx/Resources/mainwindow/dropzone-background.png \
+	extras/package/macosx/Resources/mainwindow/dropzone.png \
+	extras/package/macosx/Resources/mainwindow/effects-double-buttons-blue.png \
+	extras/package/macosx/Resources/mainwindow/effects-double-buttons-pressed.png \
+	extras/package/macosx/Resources/mainwindow/effects-double-buttons.png \
+	extras/package/macosx/Resources/mainwindow/effects-one-button-blue.png \
+	extras/package/macosx/Resources/mainwindow/effects-one-button.png \
+	extras/package/macosx/Resources/mainwindow/forward-pressed.png \
+	extras/package/macosx/Resources/mainwindow/forward.png \
+	extras/package/macosx/Resources/mainwindow/fullscreen-double-buttons-pressed.png \
+	extras/package/macosx/Resources/mainwindow/fullscreen-double-buttons.png \
+	extras/package/macosx/Resources/mainwindow/mini-progressbar-fill-left.png \
+	extras/package/macosx/Resources/mainwindow/mini-progressbar-fill-middle.png \
+	extras/package/macosx/Resources/mainwindow/mini-progressbar-fill-right.png \
+	extras/package/macosx/Resources/mainwindow/mini-progressbar-knob.png \
+	extras/package/macosx/Resources/mainwindow/mini-progressbar-wrapper-left.png \
+	extras/package/macosx/Resources/mainwindow/mini-progressbar-wrapper-middle.png \
+	extras/package/macosx/Resources/mainwindow/mini-progressbar-wrapper-right.png \
+	extras/package/macosx/Resources/mainwindow/pause-pressed.png \
+	extras/package/macosx/Resources/mainwindow/pause.png \
+	extras/package/macosx/Resources/mainwindow/play-pressed.png \
+	extras/package/macosx/Resources/mainwindow/play.png \
+	extras/package/macosx/Resources/mainwindow/playlist-blue.png \
+	extras/package/macosx/Resources/mainwindow/playlist-pressed.png \
+	extras/package/macosx/Resources/mainwindow/playlist.png \
+	extras/package/macosx/Resources/mainwindow/progression-fill-left.png \
+	extras/package/macosx/Resources/mainwindow/progression-fill-middle.png \
+	extras/package/macosx/Resources/mainwindow/progression-fill-right.png \
+	extras/package/macosx/Resources/mainwindow/progression-knob.png \
+	extras/package/macosx/Resources/mainwindow/progression-track-wrapper-left.png \
+	extras/package/macosx/Resources/mainwindow/progression-track-wrapper-middle.png \
+	extras/package/macosx/Resources/mainwindow/progression-track-wrapper-right.png \
+	extras/package/macosx/Resources/mainwindow/repeat-all-pressed.png \
+	extras/package/macosx/Resources/mainwindow/repeat-all.png \
+	extras/package/macosx/Resources/mainwindow/repeat-one-pressed.png \
+	extras/package/macosx/Resources/mainwindow/repeat-one.png \
+	extras/package/macosx/Resources/mainwindow/repeat-pressed.png \
+	extras/package/macosx/Resources/mainwindow/repeat.png \
+	extras/package/macosx/Resources/mainwindow/shuffle-blue-pressed.png \
+	extras/package/macosx/Resources/mainwindow/shuffle-blue.png \
+	extras/package/macosx/Resources/mainwindow/shuffle-pressed.png \
+	extras/package/macosx/Resources/mainwindow/shuffle.png \
+	extras/package/macosx/Resources/mainwindow/stop-pressed.png \
+	extras/package/macosx/Resources/mainwindow/stop.png \
+	extras/package/macosx/Resources/mainwindow/volume-high.png \
+	extras/package/macosx/Resources/mainwindow/volume-low.png \
+	extras/package/macosx/Resources/mainwindow/volume-slider-knob.png \
+	extras/package/macosx/Resources/mainwindow/volume-slider-track.png \
+	extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/back_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/bottom-background_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/bottombar-mini.png \
+	extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons-blue_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons-pressed_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/effects-one-button-blue_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/effects-one-button_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/forward-pressed_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/forward_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/fullscreen-double-buttons-pressed_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/fullscreen-double-buttons_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/pause-pressed_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/pause_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/play-pressed_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/play_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/playlist-blue-pressed_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/playlist-blue_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/playlist-pressed_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/playlist_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/progressbar-fill-left_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/progressbar-fill-middle_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/progressbar-fill-right_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/progression-knob_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/progression-track-wrapper-left_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/progression-track-wrapper-middle_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/progression-track-wrapper-right_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/repeat-all-blue-pressed_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/repeat-all-blue_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/repeat-one-blue-pressed_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/repeat-one-blue_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/repeat-pressed_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/repeat_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/shuffle-blue-pressed_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/shuffle-blue_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/shuffle-pressed_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/shuffle_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/stop-pressed_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/stop_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/volume-high_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/volume-low_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/volume-slider-knob_dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/volume-slider-track_dark.png \
+	extras/package/macosx/Resources/noart.png \
+	extras/package/macosx/Resources/prefs/spref_cone_Audio_64.png \
+	extras/package/macosx/Resources/prefs/spref_cone_Hotkeys_64.png \
+	extras/package/macosx/Resources/prefs/spref_cone_Input_64.png \
+	extras/package/macosx/Resources/prefs/spref_cone_Interface_64.png \
+	extras/package/macosx/Resources/prefs/spref_cone_Subtitles_64.png \
+	extras/package/macosx/Resources/prefs/spref_cone_Video_64.png \
+	extras/package/macosx/Resources/README \
+	extras/package/macosx/Resources/sidebar-icons/document-music-playlist.png \
+	extras/package/macosx/Resources/sidebar-icons/film-cast.png \
+	extras/package/macosx/Resources/sidebar-icons/film.png \
+	extras/package/macosx/Resources/sidebar-icons/music-beam.png \
+	extras/package/macosx/Resources/sidebar-icons/network-cloud.png \
+	extras/package/macosx/Resources/sidebar-icons/picture.png \
+	extras/package/macosx/Resources/sidebar-icons/README \
 	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 \
@@ -301,10 +313,6 @@ EXTRA_DIST += \
 	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 \
@@ -326,24 +334,21 @@ EXTRA_DIST += \
 	extras/analyser/valgrind.suppressions \
 	extras/buildsystem/make.pl \
 	extras/misc/mpris.py \
-	extras/misc/mpris.glade
+	extras/misc/mpris.xml
+
+###############################################################################
+# Scripts for building dependencies.
+##############################################################################
+EXTRA_DIST += \
+	contrib/bootstrap \
+	contrib/src/
 
 ###############################################################################
 # Building libvlc
 ###############################################################################
 
-noinst_SCRIPTS = vlc-config
-vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in
-	$(SHELL) ./config.status --file=$@
-	chmod 0755 $@
-	touch $@
-
-vlc-config.in: vlc-config.in.in
-	./config.status --recheck
-	touch $@
-
 CLEANFILES = $(BUILT_SOURCES_clean)
-DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
+DISTCLEANFILES = $(BUILT_SOURCES_distclean) compile
 MAINTAINERCLEANFILES = ChangeLog
 
 # Shortcut for developers to rebuild the core (libvlc + vlc)
@@ -352,10 +357,13 @@ MAINTAINERCLEANFILES = ChangeLog
 libcompat:
 	cd compat && $(MAKE) $(AM_MAKEFLAGS)
 
-libvlc: libcompat
-	cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
+libvlccore: libcompat
+	cd src && $(MAKE) $(AM_MAKEFLAGS) libvlccore.la
 
-core: libvlc vlc
+libvlc: libvlccore
+	cd lib && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
+
+core: libvlc vlc$(EXEEXT)
 	cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT)
 
 doc:
@@ -363,32 +371,6 @@ doc:
 
 .PHONY: libvlc core doc
 
-if HAVE_BEOS
-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/
-	xres -o $(top_builddir)/vlc-bundle/vlc $(srcdir)/share/vlc_beos.rsrc
-	for i in "" `$(VLC_CONFIG) --target plugin` ; do \
-	  if test -n "$$i" ; then \
-	    mkdir -p $(top_builddir)/vlc-bundle/plugins ; \
-	    cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \
-	  fi ; \
-	done
-	if test -d $(CONTRIB_DIR)/vlc-lib ; then \
-	  mkdir -p $(top_builddir)/vlc-bundle/lib ; \
-	  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/share/locale/$$i/LC_MESSAGES" ; \
-	  cp "$(top_builddir)/po/$$i.gmo" \
-	    "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
-	done
-	find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \;
-endif
-
 ###############################################################################
 # Building aliases
 ###############################################################################
@@ -421,11 +403,11 @@ mvlc: make-alias Makefile
 	$(AM_V_GEN)$(MKALIAS) maemo
 
 if BUILD_VLC
-noinst_SCRIPTS += vlc$(EXEEXT)
+noinst_SCRIPTS = vlc$(EXEEXT)
 endif
 
 vlc$(EXEEXT):
-	$(AM_V_GEN)ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
+	$(AM_V_GEN)$(LN_S) -f bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
 
 if HAVE_DARWIN
 if BUILD_MACOSX_VLC_APP
@@ -434,6 +416,18 @@ noinst_DATA = VLC.app
 endif
 endif
 
+###############################################################################
+# Installing plugins cache
+###############################################################################
+install-exec-hook:
+	if test "$(build)" = "$(host)"; then \
+		LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \
+		"$(DESTDIR)$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
+			 "$(DESTDIR)$(vlclibdir)/plugins" ; \
+	else \
+		echo "Cross-compilation: cache generation skipped!" ; \
+	fi
+
 silentstd = $(silentstd_$(V))
 silentstd_ = $(silentstd_$(AM_DEFAULT_VERBOSITY))
 silentstd_0 = 2>&1 >/dev/null
@@ -442,6 +436,7 @@ silentstd_0 = 2>&1 >/dev/null
 # use package-macosx to get a nice dmg
 VLC-release.app: vlc
 	( cd src && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd) )
+	( cd lib && $(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
@@ -457,6 +452,10 @@ VLC-release.app: vlc
 	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/extras/contrib/BGHUDAppKit
+	cp -R $(CONTRIB_DIR)/BGHUDAppKit/BGHUDAppKit.framework $(top_builddir)/tmp/extras/contrib/BGHUDAppKit
+	mkdir -p $(top_builddir)/tmp/extras/contrib/Growl
+	cp -R $(CONTRIB_DIR)/Growl/Growl.framework $(top_builddir)/tmp/extras/contrib/Growl
 	mkdir -p $(top_builddir)/tmp/modules/audio_output
 	mkdir -p $(top_builddir)/tmp/modules/gui/macosx
 	for i in \
@@ -468,8 +467,6 @@ VLC-release.app: vlc
 	    applescript.m \
 	    controls.h \
 	    controls.m \
-	    equalizer.h \
-	    equalizer.m \
 	    intf.h \
 	    intf.m \
 	    macosx.m \
@@ -489,26 +486,19 @@ VLC-release.app: vlc
 	    prefs.m \
 	    simple_prefs.h \
 	    simple_prefs.m \
-	    vout.h \
-	    voutgl.m \
 	    wizard.h \
 	    wizard.m \
-	    extended.h \
-	    extended.m \
 	    bookmarks.h \
 	    bookmarks.m \
 	    coredialogs.h \
 	    coredialogs.m \
-	    embeddedwindow.h \
-	    embeddedwindow.m \
 	    fspanel.h \
-	    fspanel.m \
-	    vout.m; do \
+	    fspanel.m; do \
 	  cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
 	$(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
-        xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
+	xcodebuild -target vlc SYMROOT=../../../build DSTROOT=../../../build $(silentstd) && \
 	cd ../../../../ && \
 	cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \
 	rm -Rf $(top_builddir)/tmp
@@ -555,46 +545,27 @@ VLC-release.app: vlc
 	  $(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/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
-	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/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.txt $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/README.txt
+	$(INSTALL) -m 644 $(srcdir)/share/vlc512x512.png $(top_builddir)/VLC-release.app/Contents/MacOS/share/vlc512x512.png
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale
 	cat $(top_srcdir)/po/LINGUAS | while read i; do \
 	  $(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 \
+	  $(LN_S) -f ../English.lproj/InfoPlist.strings \
 	      $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
-	  ln -sf ../English.lproj/MainMenu.nib \
+	  $(LN_S) -f ../English.lproj/MainMenu.xib \
 	      $(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;
+	rm -Rf $(top_builddir)/VLC-release.app/Contents/Frameworks/BGHUDAppKit.framework/Resources/
 	find $(top_builddir)/VLC-release.app -type d -exec chmod ugo+rx '{}' \;
 	find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \;
 
 # 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
+VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/lib/.libs/libvlc.dylib
 	$(AM_V_GEN)(cd src && make install $(silentstd))
+	$(AM_V_GEN)(cd lib && make install $(silentstd))
 	rm -Rf $(top_builddir)/tmp
 	mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
 	rm -Rf $(top_builddir)/VLC.app
@@ -610,6 +581,10 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 	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/extras/contrib/BGHUDAppKit
+	cp -R $(CONTRIB_DIR)/BGHUDAppKit/BGHUDAppKit.framework $(top_builddir)/tmp/extras/contrib/BGHUDAppKit
+	mkdir -p $(top_builddir)/tmp/extras/contrib/Growl
+	cp -R $(CONTRIB_DIR)/Growl/Growl.framework $(top_builddir)/tmp/extras/contrib/Growl
 	mkdir -p $(top_builddir)/tmp/modules/audio_output
 	mkdir -p $(top_builddir)/tmp/modules/gui/macosx
 	for i in \
@@ -621,8 +596,6 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 	    applescript.m \
 	    controls.h \
 	    controls.m \
-	    equalizer.h \
-	    equalizer.m \
 	    intf.h \
 	    intf.m \
 	    macosx.m \
@@ -642,45 +615,38 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 	    prefs.m \
 	    simple_prefs.h \
 	    simple_prefs.m \
-	    vout.h \
-	    voutgl.m \
 	    wizard.h \
 	    wizard.m \
-	    extended.h \
-	    extended.m \
 	    bookmarks.h \
 	    bookmarks.m \
 	    coredialogs.h \
 	    coredialogs.m \
-	    embeddedwindow.h \
-	    embeddedwindow.m \
 	    fspanel.h \
-	    fspanel.m \
-	    vout.m; do \
+	    fspanel.m; do \
 	  cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
 	$(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
-	xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
+	xcodebuild -target vlc SYMROOT=../../../build DSTROOT=../../../build $(silentstd) && \
 	cd ../../../../ && \
-	cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC.app
+	cp -R -L $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC.app
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
 	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
+	$(LN_S) -f ../../../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/; \
+	   $(LN_S) -f `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/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 ; \
+	  $(LN_S) -f `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 \
+	  $(LN_S) -f ../English.lproj/InfoPlist.strings \
 	      $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
-	  ln -sf ../English.lproj/MainMenu.nib \
+	  $(LN_S) -f ../English.lproj/MainMenu.xib \
 	      $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
 	done
 	printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo
@@ -699,11 +665,31 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 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
 
+if HAVE_WIN64
+build-npapi:
+	touch $@
+
+build-activex:
+	touch $@
+else
+if HAVE_WINCE
+build-npapi:
+	touch $@
+
+build-activex:
+	touch $@
+else
+if HAVE_WIN32
+include extras/package/npapi.am
+include extras/package/activex.am
+endif
+endif
+endif
+
 #Win-common is for win32 and wince
-package-win-common: install
+package-win-common: install build-npapi build-activex
 # Check that tmp isn't in the way
 	@if test -e "$(win32_destdir)"; then \
 	    echo "Error: please remove $(win32_destdir), it is in the way"; \
@@ -738,56 +724,11 @@ package-win-common: install
 	cp -r $(destdir)/lib/vlc/plugins $(win32_destdir)
 
 if BUILD_LUA
-# Copy the lua scripts (HTTP)
-	mkdir -p $(win32_lua_destdir)
-	cp -r $(destdir)/share/vlc/lua/http "$(win32_lua_destdir)/http"
-
-# 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
+	mkdir -p $(win32_destdir)/lua
+	cp -r $(destdir)/lib/vlc/lua/* $(win32_destdir)/lua
+	cp -r $(destdir)/share/vlc/lua/* $(win32_destdir)/lua
 endif
 
-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
@@ -799,11 +740,13 @@ if BUILD_OSDMENU
 		rm -f -- "$$file.tmp"; \
 	done
 endif
-if BUILD_MOZILLA
-	cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)
+if !HAVE_WIN64
+if !HAVE_WINCE
+	cp "$(top_builddir)/activex-vlc/src/axvlc.dll.manifest" "$(win32_destdir)/"
+	cp "$(top_builddir)/activex-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/"
+	cp "$(top_builddir)/npapi-vlc/npapi/npvlc.dll.manifest" "$(win32_destdir)/"
+	cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/"
 endif
-if BUILD_ACTIVEX
-	cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)
 endif
 
 # SDK
@@ -811,11 +754,13 @@ endif
 	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
+        cp -rv $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done
+if !HAVE_WIN64
+if !HAVE_WINCE
 	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/
+	cp $(top_builddir)/activex-vlc/README $(win32_destdir)/sdk/activex/README.TXT
+	cp $(top_builddir)/activex-vlc/src/test.html $(win32_destdir)/sdk/activex/
+endif
 endif
 
 	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) {} \;
@@ -824,8 +769,8 @@ endif
 if USE_PEFLAGS
 	find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -print -o -name '*$(EXEEXT)' -print \) -exec $(PEFLAGS) --dynamicbase=true --nxcompat=true {} \;
 endif
+	find $(win32_destdir)/plugins/ -type f \( -name '*.a' -or -name '*.la' \) -exec rm -rvf {} \;
 
-# 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 \
@@ -837,25 +782,25 @@ package-win-base: package-win-common
 	done
 
 package-win32-webplugin-common: package-win-base
-if BUILD_MOZILLA
 	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"
+if !HAVE_WIN64
+	cp $(top_builddir)/npapi-vlc/npapi/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins"
+endif
 	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*"
-endif
 
 package-win32-xpi: package-win32-webplugin-common
-if BUILD_MOZILLA
-	cp $(top_builddir)/projects/mozilla/install.rdf "$(win32_xpi_destdir)"
+if !HAVE_WIN64
+	cp $(top_builddir)/npapi-vlc/npapi/install.rdf "$(win32_xpi_destdir)"
 	cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" install.rdf plugins
 endif
 
 package-win32-crx: package-win32-webplugin-common
-if BUILD_MOZILLA
-	cp $(top_builddir)/projects/mozilla/manifest.json "$(win32_xpi_destdir)"
+if !HAVE_WIN64
+	cp $(top_builddir)/npapi-vlc/npapi/manifest.json "$(win32_xpi_destdir)"
 	crxmake --pack-extension "$(win32_xpi_destdir)" \
 		--extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf
 endif
@@ -964,7 +909,7 @@ package-macosx: VLC-release.app ChangeLog
 	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"
@@ -1036,49 +981,6 @@ package-macosx-framework-zip:
 	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"
-	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"
-	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 "$(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 UDBZ \
-	  -scrub -imagekey zlib-level=9
-	echo "Disk image creation completed:"
-	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"; \
@@ -1119,5 +1021,5 @@ update-po:
 ###############################################################################
 # Enforce Mac OS X deployment target environment variable
 ###############################################################################
-macosx-sdk: Makefile.in $(HEADERS_include) vlc-config
+macosx-sdk: Makefile.in $(HEADERS_include)
 	export MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET)