# 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 \
+ libs/loader libs/srtp libs/unzip \
projects/mozilla projects/activex
DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
if HAVE_LIBGCRYPT
SUBDIRS += libs/srtp
endif
+if HAVE_ZLIB
+if !HAVE_MINIZIP
+SUBDIRS += libs/unzip
+endif
+endif
+if BUILD_VLC
+SUBDIRS += bin
+endif
SUBDIRS += modules share doc test
if BUILD_MOZILLA
SUBDIRS += projects/mozilla
INSTALL.win32 \
INSTALL.wince \
extras/package/win32/vlc.exe.manifest \
+ extras/package/win32/libvlc.dll.manifest \
MAINTAINERS \
extras/package/macosx/README.MacOSX.rtf \
vlc-config.in.in \
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/languages/declaration.nsh \
extras/package/win32/languages/french.nsh
dist_noinst_SCRIPTS = bootstrap toolbox
+nodist_noinst_SCRIPTS = compile
-BUILT_SOURCES_distclean = vlc-config compile extras/package/win32/vlc.win32.nsi
+BUILT_SOURCES_distclean = vlc-config extras/package/win32/vlc.win32.nsi
if HAVE_DARWIN
BUILT_SOURCES_clean = macosx-sdk
else
ChangeLog: Makefile.am
rm -f -- "$@"
cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs
- ln -sf doc/ChangeLog-2008 "$@"
+ ln -sf doc/ChangeLog-2009 "$@"
###############################################################################
# MacOS X project
extras/package/macosx/plugin/InstallerInfo.plist.in \
extras/package/macosx/plugin/InstallerDescription.plist \
extras/package/macosx/plugin/pbdevelopment.plist \
- extras/package/macosx/plugin/English.lproj/InfoPlist.strings.in \
extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \
extras/package/macosx/eyetvplugin/Info.plist \
extras/package/macosx/eyetvplugin/eyetvplugin.c \
# 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) libvlccore.la
+ cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
-core:
- cd src && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
+core: libvlc
+ cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
doc:
cd doc && $(MAKE) $(AM_MAKEFLAGS) doc
# Building aliases
###############################################################################
-ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
+ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc mvlc
bin_SCRIPTS = $(ALIASES)
CLEANFILES += $(ALIASES) $(noinst_SCRIPTS)
EXTRA_SCRIPTS = $(ALL_ALIASES)
MKALIAS = bindir="$(bindir)" transform="$(transform)" program_prefix="$(program_prefix)" program_suffix="$(program_suffix)" $(top_srcdir)/make-alias $@
-cvlc: make-alias
+cvlc: make-alias Makefile
$(MKALIAS) dummy
-rvlc: make-alias
+rvlc: make-alias Makefile
$(MKALIAS) rc
-svlc: make-alias
+svlc: make-alias Makefile
$(MKALIAS) skins2
-wxvlc: make-alias
+wxvlc: make-alias Makefile
$(MKALIAS) wx
-qvlc: make-alias
+qvlc: make-alias Makefile
$(MKALIAS) qt4
-nvlc: make-alias
+nvlc: make-alias Makefile
$(MKALIAS) ncurses
+mvlc: make-alias Makefile
+ $(MKALIAS) maemo
+
if BUILD_VLC
noinst_SCRIPTS += vlc$(EXEEXT)
endif
-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
- chmod +x vlc.tmp
- mv -f -- vlc.tmp vlc
+vlc$(EXEEXT):
+ ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
if HAVE_DARWIN
if BUILD_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 --always` && \
+ 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
simple_prefs.h \
simple_prefs.m \
vout.h \
- voutqt.m \
voutgl.m \
wizard.h \
wizard.m \
rm -Rf $(top_builddir)/tmp
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
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
+ for i in $(srcdir)/share/lua/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/`basename $${i}` ; \
+ done ; \
$(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 ; \
$(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
done
printf "APPLVLC#" >| $(top_builddir)/VLC-release.app/Contents/PkgInfo
+ find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name classes.nib -delete;
+ find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name info.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 '{}' \;
# This is just for development purposes.
-# The resulting VLC.app will only in this tree.
-VLC.app: vlc
+# The resulting VLC.app will only run in this tree.
+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 --always` && \
+ 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
simple_prefs.h \
simple_prefs.m \
vout.h \
- voutqt.m \
voutgl.m \
wizard.h \
wizard.m \
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 ; \
# the same setup as the maintaner(s).
#
+############################################################################
+## Win ##
+############################################################################
win32_destdir=$(top_builddir)/vlc-$(VERSION)
+win32_debugdir=$(top_builddir)/symbols-$(VERSION)
+npvlc=vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)
+axvlc=vlc-$(VERSION)/activex/axvlc$(LIBEXT)
win32_lua_destdir=$(win32_destdir)/lua
win32_http_destdir=$(win32_destdir)/http
# 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_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_destdir)/"
cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "$(win32_destdir)/"
cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/"
do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(win32_destdir)/$${file}.txt" ; done;
for file in NEWS COPYING README; \
do cp "$(srcdir)/$$file" "$(win32_destdir)/$${file}.txt"; done
- unix2dos "$(win32_destdir)/"*.txt
+ unix2dos "$(win32_destdir)/"*.txt || echo "WARNING: this shouldn't happen"
# Necessary icons
- cp $(srcdir)/share/vlc48x48.ico $(win32_destdir)/
+ cp $(srcdir)/share/vlc.ico $(win32_destdir)/
# Copy the locales
mkdir -p $(win32_destdir)/locale
if BUILD_MOZILLA
mkdir -p "$(win32_destdir)/mozilla"
cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)/mozilla/
+ cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/
endif
# ActiveX plugin
unix2dos $(win32_destdir)/activex/*
cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/
+ cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
endif
# Rebase all those DLLs to speed up loading (need cygwin rebase)
$(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \
fi ; done
+# Contrib *.dll's
+ cp $(srcdir)/extras/contrib/lib/*.dll "vlc-$(VERSION)/" || true
+
# Copy the lua scripts (HTTP)
if BUILD_LUA
mkdir -p "$(win32_lua_destdir)/http/images"
if BUILD_LUA
#Lua Scripts
+ $(INSTALL) -d $(win32_lua_destdir)
+ for i in $(srcdir)/share/lua/*.* ; do \
+ $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/`basename $${i}` ; \
+ done
$(INSTALL) -d $(win32_lua_destdir)/playlist
for i in $(srcdir)/share/lua/playlist/*.* ; do \
$(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \
for i in $(srcdir)/share/skins2/fonts/*.*; do \
cp -- "$$i" $(win32_destdir)/skins/fonts/ || true ; \
done
- for i in $(srcdir)/share/skins2/*.*; do \
+ for i in $(top_builddir)/share/skins2/*.*; do \
cp -- "$$i" $(win32_destdir)/skins/ || true ; \
done
+ cp -- $(srcdir)/share/skins2/skin.catalog $(win32_destdir)/skins/ || true ;
+ cp -- $(srcdir)/share/skins2/skin.dtd $(win32_destdir)/skins/ || true ;
endif
if BUILD_OSDMENU
#OSD Menu
mkdir -p "$(win32_destdir)/osdmenu"
cp $(srcdir)/share/osdmenu/*.* "$(win32_destdir)/osdmenu"
- for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \
+ for dir in default default/selected default/selection default/volume ;do \
mkdir -p "$(win32_destdir)/osdmenu/$$dir"; \
- for file in $(srcdir)/share/osdmenu/$${dir}/*.png ;do \
+ for file in $(srcdir)/share/osdmenu/$${dir}/*.png;do \
cp -- "$$file" "$(win32_destdir)/osdmenu/$$dir"; \
done; \
done
#strip exe and main dll
package-win-common-strip: package-win32-base-debug
- $(STRIP) "vlc-$(VERSION)/vlc$(EXEEXT)"
- $(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)"
- $(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)"
+ @if test -e "$(win32_debugdir)"; then \
+ echo "Error: please remove $(win32_debugdir), it is in the way"; \
+ false; \
+ else \
+ echo "OK."; mkdir -p "$(win32_debugdir)"; \
+ fi
+ for i in "" vlc-$(VERSION)/*$(LIBEXT) ; \
+ do if test -n "$$i" ; then \
+ $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
+ $(OBJCOPY) --strip-debug "$$i" ; \
+ $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
+ mv "$$i.dbg" "$(win32_debugdir)"; \
+ fi; done
+
if BUILD_MOZILLA
- $(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)"
+ $(OBJCOPY) --only-keep-debug "$(npvlc)" "$(npvlc).dbg"
+ $(OBJCOPY) --strip-debug "$(npvlc)"
+ $(OBJCOPY) --add-gnu-debuglink="$(npvlc).dbg" "$(npvlc)"
+ mv "$(npvlc).dbg" "$(win32_debugdir)"
endif
if BUILD_ACTIVEX
- $(STRIP) "vlc-$(VERSION)/activex/axvlc$(LIBEXT)"
+ $(OBJCOPY) --only-keep-debug "$(axvlc)" "$(axvlc).dbg"
+ $(OBJCOPY) --strip-debug "$(axvlc)"
+ $(OBJCOPY) --add-gnu-debuglink="$(axvlc).dbg" "$(axvlc)"
+ mv "$(axvlc).dbg" "$(win32_debugdir)"
endif
#strip all plugins dll
package-win32-base: package-win-common-strip
for i in "" $(win32_destdir)/plugins/*$(LIBEXT) ; \
- do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
+ do if test -n "$$i" ; then \
+ $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
+ $(OBJCOPY) --strip-debug "$$i" ; \
+ $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
+ mv "$$i.dbg" "$(win32_debugdir)"; \
+ fi ; done
package-win32-base-exe: package-win32-base
# Create package
rm -f -- vlc-$(VERSION)-win32.zip
zip -r -9 vlc-$(VERSION)-win32.zip vlc-$(VERSION)
+package-win32-base-debug-zip: package-win32-base-debug
+# Create package
+ rm -f -- vlc-$(VERSION)-win32-debug.zip
+ zip -r -9 vlc-$(VERSION)-win32-debug.zip vlc-$(VERSION)
+
package-win32-base-7zip: package-win32-base
# Create package
7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32.7z vlc-$(VERSION)
+package-win32-base-debug-7zip: package-win32-base-debug
+# Create package
+ 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32-debug.7z vlc-$(VERSION)
+
package-win32-exe: package-win32-base package-win32-base-exe
# Clean up
rm -Rf $(win32_destdir)
# Clean up
rm -Rf $(win32_destdir)
+package-win32-debug-zip: package-win32-base-debug-zip
+# Clean up
+ rm -Rf $(win32_destdir)
+
package-win32-7zip: package-win32-base-7zip
# Clean up
rm -Rf $(win32_destdir)
+package-win32-debug-7zip: package-win32-base-debug-7zip
+# Clean up
+ rm -Rf $(win32_destdir)
+
package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe
package-win32: package-win32-no-clean
# Clean up
rm -Rf $(win32_destdir)
+package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip
+# Clean up
+ rm -Rf $(win32_destdir)
+
package-wince-base: package-win-common package-win-common-strip
package-wince-base-zip:
rm -Rf $(win32_destdir)
+#####################################################################
+## BeOS ##
+#####################################################################
package-beos:
# Check that tmp isn't in the way
@if test -e $(srcdir)/tmp; then \
# Clean up
rm -Rf $(srcdir)/tmp
-package-macosx: VLC-release.app
+#########################################################################
+## MacOS X ##
+#########################################################################
+package-macosx: VLC-release.app ChangeLog
# Check that the temporary location isn't in the way
@if test -e "$(top_builddir)/vlc-$(VERSION)/"; then \
rm -Rf "$(top_builddir)/vlc-$(VERSION)/" ; \
mkdir -p "$(top_builddir)/macosx-plugin-instdata"
cp -R "$(top_builddir)/projects/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata"
rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg"
- PATH=/Developer/usr/bin:/Developer/Tools:$$PATH packagemaker -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
+ export PACKAGEMAKER=
+ if test -x /Developer/Tools/packagemaker; then \
+ export PACKAGEMAKER=/Developer/Tools/packagemaker; \
+ fi; \
+ if test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then \
+ export PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; \
+ fi; \
+ $${PACKAGEMAKER} -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
-f "$(top_builddir)/macosx-plugin-instdata" \
-i "$(srcdir)/extras/package/macosx/plugin/InstallerInfo.plist" \
-d "$(srcdir)/extras/package/macosx/plugin/InstallerDescription.plist"; true
projects / vlc / blobdiff