# which have makefiles with distribution information.
# - src (libvlc) is nedeed by modules, mozilla and bindings
# - libs/* are needed by modules
-BASE_SUBDIRS = po src modules share doc test
+BASE_SUBDIRS = po src bin modules share doc test
EXTRA_SUBDIRS = m4 extras/package/ipkg \
libs/loader libs/srtp \
projects/mozilla projects/activex
if HAVE_LIBGCRYPT
SUBDIRS += libs/srtp
endif
+if BUILD_VLC
+SUBDIRS += bin
+endif
SUBDIRS += modules share doc test
if BUILD_MOZILLA
SUBDIRS += projects/mozilla
extras/package/rpm/vlc.fedora.spec \
extras/package/rpm/vlc.mandriva.spec \
extras/package/rpm/vlc.altlinux.spec \
- extras/package/win32/vlc.win32.nsi.in
+ extras/package/win32/vlc.win32.nsi.in \
+ extras/package/win32/languages/declaration.nsh \
+ extras/package/win32/languages/english.nsh \
+ extras/package/win32/languages/french.nsh
dist_noinst_SCRIPTS = bootstrap toolbox
###############################################################################
EXTRA_DIST += \
+ extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib \
+ extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib \
extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \
extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib \
extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib \
libvlc:
cd src && $(MAKE) $(AM_MAKEFLAGS) libvlccore.la
-core:
- cd src && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
+core: libvlc
+ cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
-.PHONY: libvlc core
+doc:
+ cd doc && $(MAKE) $(AM_MAKEFLAGS) doc
+
+.PHONY: libvlc core doc
#To get some nice output
nice:
vlc$(EXEEXT): Makefile.am
rm -f -- vlc vlc.tmp
echo '#! /bin/sh' > vlc.tmp
- echo 'exec "$$(dirname "$$0")/src/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
+ echo 'exec "$$(dirname "$$0")/bin/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
chmod +x vlc.tmp
mv -f -- vlc.tmp vlc
for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \
cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
done
- for i in Resources Info.plist; do \
- cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
- done
+ REVISION=`git-describe` && \
+ cat $(top_builddir)/extras/package/macosx/Info.plist | \
+ sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
+ cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
for i in AUTHORS COPYING 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
- ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
+ PRODUCT="VLC-release.app" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist
for i in $(srcdir)/share/lua/playlist/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist/`basename $${i}` ; \
$(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale
cat $(top_srcdir)/po/LINGUAS | while read i; do \
- mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
- cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ $(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 \
$(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
# This is just for development purposes.
# The resulting VLC.app will only in this tree.
-VLC.app: vlc
+VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.libs/libvlc.dylib
(cd src && make install)
rm -Rf $(top_builddir)/tmp
mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
done
- for i in Resources Info.plist; do \
- cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
- done
+ REVISION=`git-describe` && \
+ cat $(top_builddir)/extras/package/macosx/Info.plist | \
+ sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
+ cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
for i in AUTHORS COPYING THANKS; do \
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done
cd ../../../../ && \
cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
$(top_builddir)/VLC.app
- rm -Rf $(top_builddir)/tmp
$(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)/src/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC
- $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
- find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \
- if test -n "$$i" ; \
- then ln -sfn "`pwd`/$$i" \
- "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
- fi ; done && \
- ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
+ $(INSTALL) $(top_builddir)/bin/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC
+ ln -sf ../../../modules $(top_builddir)/VLC.app/Contents/MacOS/modules
+ 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/; \
+ 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 ; \
# Copy relevant files
# Copy executables and libs
- cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(win32_destdir)/"
+ cp "$(top_builddir)/bin/.libs/vlc$(EXEEXT)" "$(win32_destdir)/"
cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(win32_destdir)/"
cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "$(win32_destdir)/"
cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/"
# Copy relevant files
# Script installer
cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/"
+ mkdir "$(win32_destdir)/languages"
+ cp $(srcdir)/extras/package/win32/languages/*.nsh "$(win32_destdir)/languages/"
# Plugins
mkdir -p "$(win32_destdir)/plugins"
# Clean up
rm -Rf $(srcdir)/tmp
-package-macosx:
+package-macosx: VLC-release.app
# Check that the temporary location isn't in the way
@if test -e "$(top_builddir)/vlc-$(VERSION)/"; then \
rm -Rf "$(top_builddir)/vlc-$(VERSION)/" ; \
# Clean up
rm -Rf "$(top_builddir)/vlc-$(VERSION)"
-package-macosx-zip:
+package-macosx-zip: VLC-release.app
rm -Rf $(top_builddir)/vlc-$(VERSION)
mkdir -p $(top_builddir)/vlc-$(VERSION)
cp -R $(top_builddir)/VLC-release.app $(top_builddir)/vlc-$(VERSION)/VLC.app
cp -R $(srcdir)/extras/package/macosx/Delete_Preferences.app \
$(top_builddir)/vlc-$(VERSION)/Goodies
cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf \
- $(top_builddir)/vlc-$(VERSION)
+ $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf
zip -r $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION)
rm -Rf $(top_builddir)/vlc-$(VERSION)