X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=551285dafe5ca3bd4e15f81691f188a2a8f15d3b;hb=61b0e2a9bd16272ee3cfcb128528e354ad668e30;hp=4224ba7a2ada87592c26685ccca7a959eeff288f;hpb=e1a78b744b324b4dec1e8f5f2c41c95c5b00433a;p=vlc diff --git a/Makefile.am b/Makefile.am index 4224ba7a2a..551285dafe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -93,8 +93,7 @@ ChangeLog: Makefile.am ############################################################################### 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 \ @@ -127,33 +126,25 @@ EXTRA_DIST += \ extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/info.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 \ @@ -251,6 +242,28 @@ EXTRA_DIST += \ 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 \ @@ -313,12 +326,16 @@ vlc-config.in: vlc-config.in.in 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 @@ -571,6 +588,7 @@ VLC-release.app: vlc 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 '{}' \; @@ -1066,12 +1084,13 @@ package-macosx: VLC-release.app ChangeLog 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 @@ -1109,7 +1128,7 @@ package-macosx: VLC-release.app ChangeLog # 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