DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
--disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2
-# Tell aclocal to use -I m4. Wonder if it really works.
ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = \
+ 1.9 \
+ -Wall \
+ check-news \
+ std-options \
+ dist-bzip2 \
+ no-dist-gzip
###############################################################################
# MacOS X project
if HAVE_DARWIN
# Create the MacOS X app
-vlc_app_DATA = VLC.app
-vlc_appdir = $(bindir)
+noinst_DATA = VLC.app
# VLC-release.app is the old VLC.app target
VLC-release.app: vlc
+ ( cd src && make )
@if test -e "$(top_builddir)/tmp"; then \
echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
false; \
else \
- echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \
+ echo "OK."; mkdir -p "$(top_builddir)/tmp/extras/MacOSX"; \
fi
rm -Rf $(top_builddir)/VLC-release.app
- cp -R $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
+ cp -R $(srcdir)/extras/MacOSX/vlc.xcodeproj $(top_builddir)/tmp/extras/MacOSX/
+ cp -R $(srcdir)/extras/MacOSX/Resources $(top_builddir)/tmp/extras/MacOSX
for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done
$(top_builddir)/VLC-release.app; \
rm -Rf $(top_builddir)/tmp
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
- $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/lib
- $(INSTALL) $(top_builddir)/.libs/vlc \
- $(top_builddir)/VLC-release.app/Contents/MacOS/VLC
- $(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \
- $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc.dylib
- $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.1.dylib \
- $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib
- install_name_tool -change /usr/local/lib/libvlc.1.dylib \
- @executable_path/lib/libvlc.dylib \
- $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib
- install_name_tool -change /usr/local/lib/libvlc.1.dylib \
- @executable_path/lib/libvlc.dylib \
- $(top_builddir)/VLC-release.app/Contents/MacOS/VLC
- ln -sf ./VLC $(top_builddir)/VLC-release.app/Contents/MacOS/clivlc
- $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/modules
- for i in `$(VLC_CONFIG) --target plugin` ; do \
- if test -n "$$i" ; \
- then $(INSTALL) "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
- "$(top_builddir)/VLC-release.app/Contents/MacOS/modules" ; \
- fi ; done
- if test -d $(srcdir)/extras/contrib/vlc-lib; then \
- mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \
- for i in $(srcdir)/extras/contrib/vlc-lib/*.dylib ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \
- done ; \
- fi
+ ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/extras/MacOSX/Framework/Pre-Compile.sh
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist
for i in $(srcdir)/share/luaplaylist/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist/`basename $${i}` ; \
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests
+ $(INSTALL) -m 644 $(srcdir)/share/http-lua/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/.hosts
for i in $(srcdir)/share/http-lua/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/`basename $${i}` ; \
done ; \
$(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 ; \
find $(top_builddir)/VLC-release.app -type d -exec chmod ugo+rx '{}' \;
find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \;
-VLC.app: vlc
+VLC.app: vlc
+ ( cd src && make install )
@if test -e "$(top_builddir)/tmp"; then \
echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
false; \
else \
- echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \
+ echo "OK."; mkdir -p "$(top_builddir)/tmp/extras/MacOSX"; \
fi
rm -Rf $(top_builddir)/VLC.app
- cp -R $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
+ cp -R $(srcdir)/extras/MacOSX/vlc.xcodeproj $(top_builddir)/tmp/extras/MacOSX/
+ cp -R $(srcdir)/extras/MacOSX/Resources $(top_builddir)/tmp/extras/MacOSX
for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done
$(top_builddir)/VLC.app; \
rm -Rf $(top_builddir)/tmp
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
- $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/lib
$(INSTALL) $(top_builddir)/.libs/vlc \
$(top_builddir)/VLC.app/Contents/MacOS/VLC
- $(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \
- $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc.dylib
- $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.1.dylib \
- $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc-control.dylib
- install_name_tool -change /usr/local/lib/libvlc.1.dylib \
- @executable_path/lib/libvlc.dylib \
- $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc-control.dylib
- install_name_tool -change /usr/local/lib/libvlc.1.dylib \
- @executable_path/lib/libvlc.dylib \
- $(top_builddir)/VLC.app/Contents/MacOS/VLC
ln -sf ./VLC $(top_builddir)/VLC.app/Contents/MacOS/clivlc
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
for i in `$(VLC_CONFIG) --target plugin` ; do \
if test -n "$$i" ; \
- then install_name_tool -change /usr/local/lib/libvlc.1.dylib \
- @executable_path/lib/libvlc.dylib \
- "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)"; \
- ln -sfn "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
- "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
- fi ; done
- if test -d $(srcdir)/extras/contrib/vlc-lib; then \
- mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/lib ; \
- for i in $(srcdir)/extras/contrib/vlc-lib/*.dylib ; do \
- install_name_tool -change /usr/local/lib/libvlc.1.dylib @executable_path/lib/libvlc.dylib $${i}; \
- ln -sfn `pwd`/$${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/`basename $${i}` ; \
- done ; \
- fi
+ then ln -sfn "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
+ "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
+ fi ; done && \
ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
cat $(top_srcdir)/po/LINGUAS | while read i; do \
# Place a link to the application folder
ln -s /Applications $(top_builddir)/vlc-${VERSION}/Applications ;
-# Create disk image
+# Create disk image (temporarily taken from the 0.8.6-bugfix branch to provide reliable NBs)
echo "Creating disk image" ;
rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ;
- hdiutil create -srcfolder "$(top_builddir)/vlc-${VERSION}" \
- "$(top_builddir)/vlc-${VERSION}.dmg" -format UDRW \
- -scrub -imagekey zlib-level=9 ;
+ hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-${VERSION}" \
+ "$(top_builddir)/vlc-${VERSION}.dmg" -scrub ;
+ echo "Disk image creation completed:" ;
+ ls -la "$(top_builddir)/vlc-${VERSION}.dmg" ; echo ;
+
+# Create disk image
+# echo "Creating disk image" ;
+# rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ;
+# hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-${VERSION}" \
+# "$(top_builddir)/vlc-${VERSION}.dmg" -format UDRW \
+# -scrub -imagekey zlib-level=9 -attach ;
# Make sure the root window of the dmg will pop up when the dmg is mounted.
# Note: We dont mount in /Volumes to be sure we won't collide with an other
# finder mounted dmg with the same name.
- echo "Make sure the root window of the dmg will pop up when the dmg is mounted" ;
- mkdir -p $(top_builddir)/vlcmnt ;
- hdiutil attach -readwrite -noverify -noautoopen "$(top_builddir)/vlc-${VERSION}.dmg" -mountpoint "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
- bless --folder "$(top_builddir)/vlcmnt/vlc-${VERSION}/" --openfolder "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
- sleep 1 # Make sure operation completes
- cd "$(srcdir)"
+# echo "Make sure the root window of the dmg will pop up when the dmg is mounted" ;
+# mkdir -p $(top_builddir)/vlcmnt ;
+# hdiutil attach -nokernel -readwrite -noverify -noautoopen -private "$(top_builddir)/vlc-${VERSION}.dmg" -mountpoint "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
+# bless --folder "$(top_builddir)/vlcmnt/vlc-${VERSION}/" --openfolder "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
+# sleep 1 # Make sure operation completes
+# cd "$(srcdir)"
# Unmount the image now
- hdiutil detach "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
- rm -R $(top_builddir)/vlcmnt ;
+# hdiutil detach "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
+# rm -R $(top_builddir)/vlcmnt ;
# Make sure the image is not writable
# Note: We can't directly create a read only dmg as we do the bless stuff
projects / vlc / blobdiff