X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=f3ad1e465d0ecc1eea1eddc16af1504667ff0256;hb=1cf4ccdf71ed22a378361ff1dc756e0e13f17c06;hp=60b67639c425440a608ef287c9ebcbdadbd0e38f;hpb=cb137fb6ec397b4e383f4ee3a57c9898929b4cc1;p=vlc diff --git a/Makefile.am b/Makefile.am index 60b67639c4..f3ad1e465d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,7 +70,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ --enable-fast-install \ --disable-dbus \ --disable-dvd --disable-mad --disable-libmpeg2 \ - --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \ + --disable-ffmpeg --disable-faad --disable-skins2 \ --disable-live555 \ --disable-fribidi --disable-glx @@ -93,38 +93,27 @@ 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 \ + 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/aiff.icns \ @@ -330,10 +319,13 @@ 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: +libcompat: + cd compat && $(MAKE) $(AM_MAKEFLAGS) + +libvlc: libcompat cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la core: libvlc @@ -378,7 +370,7 @@ endif # Building aliases ############################################################################### -ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc mvlc +ALL_ALIASES = cvlc rvlc svlc qvlc nvlc mvlc bin_SCRIPTS = $(ALIASES) CLEANFILES += $(ALIASES) $(noinst_SCRIPTS) EXTRA_SCRIPTS = $(ALL_ALIASES) @@ -396,9 +388,6 @@ rvlc: make-alias Makefile svlc: make-alias Makefile $(MKALIAS) skins2 -wxvlc: make-alias Makefile - $(MKALIAS) wx - qvlc: make-alias Makefile $(MKALIAS) qt4 @@ -541,13 +530,9 @@ VLC-release.app: vlc $(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 @@ -557,15 +542,6 @@ VLC-release.app: vlc 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 @@ -584,8 +560,7 @@ 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 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 '{}' \; @@ -836,9 +811,6 @@ if BUILD_HTTPD 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)/ @@ -858,16 +830,6 @@ if BUILD_HTTPD 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 @@ -922,30 +884,17 @@ package-win-common-strip: package-win32-base-debug for i in "" vlc-$(VERSION)/*$(LIBEXT) ; \ do if test -n "$$i" ; then \ $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \ - $(OBJCOPY) --strip-debug "$$i" ; \ + $(OBJCOPY) --strip-all "$$i" ; \ $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \ mv "$$i.dbg" "$(win32_debugdir)"; \ fi; done -if BUILD_MOZILLA - $(OBJCOPY) --only-keep-debug "$(npvlc)" "$(npvlc).dbg" - $(OBJCOPY) --strip-debug "$(npvlc)" - $(OBJCOPY) --add-gnu-debuglink="$(npvlc).dbg" "$(npvlc)" - mv "$(npvlc).dbg" "$(win32_debugdir)" -endif -if BUILD_ACTIVEX - $(OBJCOPY) --only-keep-debug "$(axvlc)" "$(axvlc).dbg" - $(OBJCOPY) --strip-debug "$(axvlc)" - $(OBJCOPY) --add-gnu-debuglink="$(axvlc).dbg" "$(axvlc)" - mv "$(axvlc).dbg" "$(win32_debugdir)" -endif - #strip all plugins dll package-win32-base: package-win-common-strip for i in "" $(win32_destdir)/plugins/*$(LIBEXT) ; \ do if test -n "$$i" ; then \ $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \ - $(OBJCOPY) --strip-debug "$$i" ; \ + $(OBJCOPY) --strip-all "$$i" ; \ $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \ mv "$$i.dbg" "$(win32_debugdir)"; \ fi ; done @@ -1081,12 +1030,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 @@ -1124,7 +1074,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 @@ -1177,8 +1127,8 @@ if BUILD_MOZILLA 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 @@ -1187,7 +1137,7 @@ if BUILD_MOZILLA 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)"