# which have makefiles with distribution information.
# - src (libvlc) is nedeed by modules, mozilla and bindings
# - libs/* are needed by modules
-BASE_SUBDIRS = po src bin modules share doc test
+BASE_SUBDIRS = po compat src bin modules share doc test
EXTRA_SUBDIRS = m4 extras/package/ipkg \
libs/loader libs/srtp libs/unzip \
projects/mozilla projects/activex
DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
-SUBDIRS = po src
+SUBDIRS = po compat src
if LOADER
SUBDIRS += libs/loader
endif
###############################################################################
EXTRA_DIST += \
- extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib \
- extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib \
+ 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/classes.nib \
- extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.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/classes.nib \
- extras/package/macosx/Resources/English.lproj/About.nib/info.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/classes.nib \
- extras/package/macosx/Resources/English.lproj/Open.nib/info.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/classes.nib \
- extras/package/macosx/Resources/English.lproj/Preferences.nib/info.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/classes.nib \
- extras/package/macosx/Resources/English.lproj/Wizard.nib/info.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/classes.nib \
- extras/package/macosx/Resources/English.lproj/Bookmarks.nib/info.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/classes.nib \
- extras/package/macosx/Resources/English.lproj/Extended.nib/info.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/Update.nib/classes.nib \
- extras/package/macosx/Resources/English.lproj/Update.nib/info.nib \
+ extras/package/macosx/Resources/English.lproj/Update.nib/designable.nib \
extras/package/macosx/Resources/English.lproj/Update.nib/keyedobjects.nib \
- extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/classes.nib \
- extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/info.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/classes.nib \
- extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/info.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/a52.icns \
- extras/package/macosx/Resources/aac.icns \
- extras/package/macosx/Resources/asf.icns \
- extras/package/macosx/Resources/asx.icns \
+ extras/package/macosx/Resources/aiff.icns \
+ extras/package/macosx/Resources/audio.icns \
extras/package/macosx/Resources/avi.icns \
- extras/package/macosx/Resources/bin.icns \
- extras/package/macosx/Resources/cue.icns \
- extras/package/macosx/Resources/dat.icns \
- extras/package/macosx/Resources/divx.icns \
- extras/package/macosx/Resources/dv.icns \
+ extras/package/macosx/Resources/flv.icns \
extras/package/macosx/Resources/generic.icns \
- extras/package/macosx/Resources/m3u.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/mp4.icns \
extras/package/macosx/Resources/mpeg.icns \
- extras/package/macosx/Resources/mpeg1.icns \
- extras/package/macosx/Resources/mpeg2.icns \
- extras/package/macosx/Resources/mpeg4.icns \
- extras/package/macosx/Resources/mpg.icns \
extras/package/macosx/Resources/ogg.icns \
- extras/package/macosx/Resources/ogm.icns \
- extras/package/macosx/Resources/pls.icns \
- extras/package/macosx/Resources/srt.icns \
- extras/package/macosx/Resources/sub.icns \
- extras/package/macosx/Resources/vlc.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/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 \
touch $@
CLEANFILES = $(BUILT_SOURCES_clean)
-DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog
+DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
+MAINTAINERCLEANFILES = ChangeLog
# Shortcut for developpers to rebuild the core (libvlc + vlc)
# Don't use it if you don't know what it is about.
# Don't complain if it doesn't work. -- Courmisch
-libvlc:
+libcompat:
+ cd compat && $(MAKE) $(AM_MAKEFLAGS)
+
+libvlc: libcompat
cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
core: libvlc
$(INSTALL) -m 644 $(srcdir)/share/lua/http/requests/readme $(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
- $(INSTALL) -m 644 $(srcdir)/share/http/old/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/.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/js/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js/`basename $${i}` ; \
done
- for i in $(srcdir)/share/http/old/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/`basename $${i}` ; \
- done
- for i in $(srcdir)/share/http/old/admin/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin/`basename $${i}` ; \
- done
- for i in $(srcdir)/share/http/old/vlm/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm/`basename $${i}` ; \
- done
for i in $(srcdir)/share/http/images/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images/`basename $${i}` ; \
done
$(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 classes.nib -delete;
- find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name info.nib -delete;
+ 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 '{}' \;
mkdir -p "$(win32_http_destdir)/requests"
mkdir -p "$(win32_http_destdir)/js"
mkdir -p "$(win32_http_destdir)/dialogs"
- mkdir -p "$(win32_http_destdir)/old"
- mkdir -p "$(win32_http_destdir)/old/vlm"
- mkdir -p "$(win32_http_destdir)/old/admin"
cp $(srcdir)/share/http/*.html $(win32_http_destdir)/
unix2dos $(win32_http_destdir)/*.html
cp $(srcdir)/share/http/.hosts $(win32_http_destdir)/
cp $(srcdir)/share/http/requests/readme $(win32_http_destdir)/requests/readme.txt
unix2dos $(win32_http_destdir)/requests/readme.txt
- cp $(srcdir)/share/http/old/*.html $(win32_http_destdir)/old/
- unix2dos $(win32_http_destdir)/old/*.html
- cp $(srcdir)/share/http/old/*.css $(win32_http_destdir)/old/
- cp $(srcdir)/share/http/old/.hosts $(win32_http_destdir)/old/
- cp $(srcdir)/share/http/old/*.png $(win32_http_destdir)/old/
- cp $(srcdir)/share/http/old/vlm/*.html $(win32_http_destdir)/old/vlm/
- unix2dos $(win32_http_destdir)/old/vlm/*.html
- cp $(srcdir)/share/http/old/admin/*.html $(win32_http_destdir)/old/admin/
- unix2dos $(win32_http_destdir)/old/admin/*.html
- cp $(srcdir)/share/http/old/admin/.access $(win32_http_destdir)/old/admin/
endif
if BUILD_SKINS
else \
cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-$(VERSION)/VLC.app"; \
fi
- cd "$(srcdir)" && mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/ && \
+ mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/ && \
mkdir -p $(top_builddir)/vlc-$(VERSION)/.background/ && \
- cp AUTHORS COPYING ChangeLog README THANKS NEWS $(top_builddir)/vlc-$(VERSION)/Goodies/ && \
- cp -R extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \
- cp extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \
- cp extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png
+ 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
# 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"
+ 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
fi; \
$${PACKAGEMAKER} -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
-f "$(top_builddir)/macosx-plugin-instdata" \
- -i "$(srcdir)/extras/package/macosx/plugin/InstallerInfo.plist" \
- -d "$(srcdir)/extras/package/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
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 \
+ "$(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)"