Skip to content

V
vlc
Commit e9a2d322 authored by Loïc Minier's avatar Loïc Minier
Browse files
Options

* Makefile.am: 

    . cleanups, use of top_builddir where possible, just to feel safer
    . fixed VLC.app inclusion of AUTHORS, COPYING etc.
    . propagated previous changes to package-osx
    . checked both build methods
parent 1312bc9e
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 32 deletions
Makefile.am
View file @ e9a2d322
...@@ -402,35 +402,81 @@ if HAVE_DARWIN ...@@ -402,35 +402,81 @@ if HAVE_DARWIN
vlc_app_DATA = VLC.app vlc_app_DATA = VLC.app
vlc_appdir = $(bindir) vlc_appdir = $(bindir)
VLC.app: vlc VLC.app: vlc
cd $(top_builddir) @if test -e "$(top_builddir)/tmp"; then \
rm -Rf VLC.app echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
mkdir extras || true false; \
cp -r $(srcdir)/extras/MacOSX extras || true else \
cd extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)' echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \
cd $(top_builddir) fi
cp -r extras/MacOSX/build/vlc.bundle VLC.app rm -Rf $(top_builddir)/VLC.app
$(INSTALL) -d VLC.app/Contents/MacOS cp -r $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
$(INSTALL) vlc VLC.app/Contents/MacOS/VLC for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
$(INSTALL) -d VLC.app/Contents/MacOS/modules cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done
mkdir -p $(top_builddir)/tmp/modules/audio_output
cp $(srcdir)/modules/audio_output/coreaudio.c \
$(top_builddir)/tmp/modules/audio_output/coreaudio.c
mkdir -p $(top_builddir)/tmp/modules/gui/macosx
for i in \
about.h \
about.m \
applescript.h \
applescript.m \
controls.h \
controls.m \
info.h \
info.m \
intf.h \
intf.m \
macosx.m \
misc.h \
misc.m \
open.h \
open.m \
output.h \
output.m \
playlist.h \
playlist.m \
prefs.h \
prefs.m \
vout.h \
vout.m; do \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
done
cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'
cp -r $(top_builddir)/tmp/extras/MacOSX/build/vlc.bundle \
$(top_builddir)/VLC.app
rm -Rf $(top_builddir)/tmp
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
$(INSTALL) $(top_builddir)/vlc \
$(top_builddir)/VLC.app/Contents/MacOS/VLC
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
for i in "" `$(VLC_CONFIG) --target plugin` ; do \ for i in "" `$(VLC_CONFIG) --target plugin` ; do \
if test -n "$$i" ; then $(INSTALL) "$$i$(LIBEXT)" \ if test -n "$$i" ; \
"VLC.app/Contents/MacOS/modules" ; \ then $(INSTALL) "$$i$(LIBEXT)" \
"$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
fi ; done fi ; done
$(INSTALL) -d VLC.app/Contents/MacOS/share $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share
$(INSTALL) -d VLC.app/Contents/MacOS/share/http $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http
$(INSTALL) -m 644 $(srcdir)/share/http/*.html VLC.app/Contents/MacOS/share/http $(INSTALL) -m 644 $(srcdir)/share/http/*.html \
$(INSTALL) -d VLC.app/Contents/MacOS/share/http/admin $(top_builddir)/VLC.app/Contents/MacOS/share/http
$(INSTALL) -m 644 $(srcdir)/share/http/admin/*.html VLC.app/Contents/MacOS/share/http/admin $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin
$(INSTALL) -d VLC.app/Contents/MacOS/locale $(INSTALL) -m 644 $(srcdir)/share/http/admin/*.html \
$(top_builddir)/VLC.app/Contents/MacOS/share/http/admin
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
for i in $(ALL_LINGUAS); do \ for i in $(ALL_LINGUAS); do \
mkdir -p VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
cp $(srcdir)/po/$${i}.gmo VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
mkdir -p VLC.app/Contents/Resources/$${i}.lproj ; \ mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
ln -sf ../English.lproj/InfoPlist.strings VLC.app/Contents/Resources/$${i}.lproj ; \ ln -sf ../English.lproj/InfoPlist.strings \
ln -sf ../English.lproj/MainMenu.nib VLC.app/Contents/Resources/$${i}.lproj ; \ $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
ln -sf ../English.lproj/vlc.scriptTerminology VLC.app/Contents/Resources/$${i}.lproj ; \ ln -sf ../English.lproj/MainMenu.nib \
$(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
ln -sf ../English.lproj/vlc.scriptTerminology \
$(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
done done
printf "APPLVLC#" >| VLC.app/Contents/PkgInfo printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo
endif endif
if HAVE_WIN32 if HAVE_WIN32
...@@ -563,22 +609,22 @@ package-beos: ...@@ -563,22 +609,22 @@ package-beos:
package-macosx: package-macosx:
# Check that tmp isn't in the way # Check that tmp isn't in the way
@if test -e "$(srcdir)/tmp"; then \ @if test -e "$(top_builddir)/tmp"; then \
echo "Error: please remove $(srcdir)/tmp, it is in the way"; \ echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
false; \ false; \
else \ else \
echo "OK."; mkdir -p "$(srcdir)/tmp"; \ echo "OK."; mkdir -p "$(top_builddir)/tmp"; \
fi fi
# Copy relevant files # Copy relevant files
cp -R "$(srcdir)/VLC.app" "$(srcdir)/tmp/" cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/tmp/"
cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/ cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/
# Create disk image # Create disk image
$(srcdir)/extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" $(srcdir)/tmp/* $(srcdir)/extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" $(top_builddir)/tmp/*
# Clean up # Clean up
rm -Rf $(srcdir)/tmp rm -Rf $(top_builddir)/tmp
############################################################################### ###############################################################################
# Stamp rules # Stamp rules
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment