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
CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin
DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
+# Shortcut for developpers 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:
+ cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
+
+.PHONY: libvlc
+
###############################################################################
# Building vlc
###############################################################################
nice:
$(top_builddir)/compile
-# Shortcut for developpers 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:
- cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
-
core: libvlc vlc$(EXEEXT)
-.PHONY: libvlc core
+.PHONY: core
vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
@rm -f vlc$(EXEEXT)
find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \;
endif
-# Install the symlinks
-install-exec-local: install-binPROGRAMS
- inst="`echo vlc | sed -e '$(transform)'`" ; \
- for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
- rm -f "$(DESTDIR)$(bindir)/$$i" && \
- ln -sf "$${inst}" "$(DESTDIR)$(bindir)/$$i" ; \
- fi ; done
+###############################################################################
+# Building aliases
+###############################################################################
+
+ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
+bin_SCRIPTS += $(ALIASES)
+EXTRA_SCRIPTS = $(ALL_ALIASES)
+
+dist_noinst_SCRIPTS += make-alias
+
+MKALIAS = bindir="$(bindir)" transform="$(transform)" $(top_srcdir)/make-alias $@
+
+cvlc: make-alias
+ $(MKALIAS) dummy
+
+rvlc: make-alias
+ $(MKALIAS) rc
+
+svlc: make-alias
+ $(MKALIAS) skins2
+
+wxvlc: make-alias
+ $(MKALIAS) wx
+
+qvlc: make-alias
+ $(MKALIAS) qt4
-# the opposite of install-{data,exec}-local
-uninstall-local:
- for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
- rm -f "$(DESTDIR)$(bindir)/$$i" ; \
- fi ; done
+nvlc: make-alias
+ $(MKALIAS) ncurses
if HAVE_DARWIN
# Create the MacOS X app
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
$(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 ; \
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
cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-${VERSION}/"
for file in AUTHORS MAINTAINERS THANKS ; \
- do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \
- unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done
+ do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done;
+ for file in NEWS COPYING README; \
+ do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-${VERSION}/$${file}.txt"; done
+ unix2dos "$(top_builddir)/vlc-${VERSION}/"*.txt
mkdir $(top_builddir)/vlc-${VERSION}/locale
cat $(top_srcdir)/po/LINGUAS | while read i; do \
echo "Create package directory: vlc-${VERSION}/";
mkdir -p "$(top_builddir)/vlc-${VERSION}/";
-# For now, export the framework for third parties, from here
- (cd $(top_builddir)/extras/MacOSX/Framework && xcodebuild);
- cp -r $(top_builddir)/extras/MacOSX/Framework/build/Release/VLC.framework $(top_builddir)/vlc-${VERSION}/VLC.framework
-
# Copy relevant files
@if test -e "$(top_builddir)/VLC-release.app/"; then \
cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \
# 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
-
-# Place the image disk finder icon at the correct place
-# Note: careful here the finder does some weird things
-# sometimes. delays in the script should prevent those.
- cd "$(srcdir)"
- osascript -e "tell application \"Finder\"" \
- -e " set f to POSIX file (\"$(top_builddir)/vlcmnt/vlc-${VERSION}/\" as string) as alias" \
- -e " tell folder f" \
- -e " open" \
- -e " tell container window" \
- -e " set toolbar visible to false" \
- -e " set statusbar visible to false" \
- -e " set current view to icon view" \
- -e " delay 1 -- Sync" \
- -e " set the bounds to {50, 100, 1000, 1000} -- Big size so the finder won't do silly things" \
- -e " end tell" \
- -e " delay 1 -- Sync" \
- -e " set icon size of the icon view options of container window to 128" \
- -e " set arrangement of the icon view options of container window to not arranged" \
- -e " set background picture of the icon view options of container window to file \".background:background.png\"" \
- -e " set position of item \"VLC.app\" to {100, 20}" \
- -e " set position of item \"Applications\" to {310, 20}" \
- -e " set position of item \"Goodies\" to {40, 200}" \
- -e " set position of item \"Read Me.rtf\" to {410, 200}" \
- -e " set the bounds of the container window to {50, 100, 590, 500}" \
- -e " update without registering applications" \
- -e " delay 5 -- Sync" \
- -e " close" \
- -e " end tell" \
- -e " -- Sync" \
- -e " delay 5" \
- -e "end tell" || true # Make sure we don't make the build bots fail
+# 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
echo "# modules" ; \
find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name '*.ui' \
| grep -v '\(\.moc\.\|gui/gtk2/\)' \
- | grep -vE 'qt4/ui/.*.h' |grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \
+ | grep -vE 'qt4/ui/.*.h' \
+ | grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \
+ | grep -v 'gui/opie' \
| sort ; \
} > $(top_srcdir)/po/POTFILES.in
rm -f $(top_srcdir)/po/vlc.pot
projects / vlc / blobdiff