X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=c0256b02168042406e56a8511731cf9a8b4b007c;hb=d634cc1b7b8e75a307bb116f73b1eaca02ed9e3d;hp=6586555eafc2e1753607650e5100b2eb162786bb;hpb=5bee5b7d7efc37e3bae3576f048d21857f974cc2;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 6586555eaf..c0256b0216 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
@@ -137,6 +137,10 @@ EXTRA_DIST += \
 	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/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 \
@@ -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:
@@ -388,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
@@ -420,8 +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/BWToolKit
-	cp -R $(CONTRIB_DIR)/Sparkle/BWToolKitFramework.framework $(top_builddir)/tmp/extras/contrib/BWToolKit
+	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 \
@@ -520,38 +507,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 '{}' \;
@@ -575,8 +543,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/BWToolKit
-	cp -R $(CONTRIB_DIR)/Sparkle/BWToolKitFramework.framework $(top_builddir)/tmp/extras/contrib/BWToolKit
+	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 \
@@ -630,24 +600,24 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 	$(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
 	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
@@ -730,9 +700,6 @@ if BUILD_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
@@ -913,7 +880,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"