X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=1db460394d4586b3fcece9ae33c2759b9b5f94db;hb=00b78e937eefcc5c4332afb0ea0fa5e77c173480;hp=f78babb4115bdaa7243cc1f939f9c59a0290e980;hpb=50f1d61d6da3e6fdb67420133bd8e5d080064e11;p=vlc diff --git a/Makefile.am b/Makefile.am index f78babb411..1db460394d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -110,7 +110,7 @@ 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 @@ -131,12 +131,16 @@ EXTRA_DIST += \ 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/AudioEffects.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/AudioEffects.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/SyncTracks.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/SyncTracks.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/VideoEffects.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/VideoEffects.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 \ @@ -161,33 +165,22 @@ EXTRA_DIST += \ 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 \ @@ -195,20 +188,12 @@ EXTRA_DIST += \ 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 \ @@ -315,7 +300,7 @@ EXTRA_DIST += \ extras/analyser/valgrind.suppressions \ extras/buildsystem/make.pl \ extras/misc/mpris.py \ - extras/misc/mpris.glade + extras/misc/mpris.xml ############################################################################### # Building libvlc @@ -344,7 +329,7 @@ libcompat: libvlc: libcompat cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la -core: libvlc vlc +core: libvlc vlc$(EXEEXT) cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT) doc: @@ -352,32 +337,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 ############################################################################### @@ -414,7 +373,7 @@ 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 @@ -446,6 +405,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 \ @@ -482,8 +445,6 @@ VLC-release.app: vlc voutgl.m \ wizard.h \ wizard.m \ - extended.h \ - extended.m \ bookmarks.h \ bookmarks.m \ coredialogs.h \ @@ -497,7 +458,7 @@ VLC-release.app: vlc $(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 @@ -544,38 +505,19 @@ 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.nib \ $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ done printf "APPLVLC#" >| $(top_builddir)/VLC-release.app/Contents/PkgInfo + rm -Rf $(top_builddir)/VLC-release.app/Contents/Frameworks/BGHUDAppKit.framework/Resources/ 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 '{}' \; @@ -599,6 +541,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 \ @@ -635,8 +581,6 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib voutgl.m \ wizard.h \ wizard.m \ - extended.h \ - extended.m \ bookmarks.h \ bookmarks.m \ coredialogs.h \ @@ -650,26 +594,26 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib $(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.nib \ $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ done printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo @@ -688,7 +632,6 @@ 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 @@ -748,56 +691,11 @@ package-win-common: install build-npapi build-activex 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 @@ -823,7 +721,7 @@ 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 + cp -rv $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done if !HAVE_WIN64 if !HAVE_WINCE mkdir -p "$(win32_destdir)/sdk/activex" @@ -838,6 +736,7 @@ 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 {} \; package-win-base: package-win-common find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' \) | while read i; \ @@ -977,7 +876,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"