# which have makefiles with distribution information.
# - src (libvlc) is nedeed by modules, mozilla and bindings
# - libs/* are needed by modules
-SUBDIRS = po libs/loader libs/srtp src modules \
- projects/mozilla bindings projects/activex share doc test
-DIST_SUBDIRS = $(SUBDIRS) m4 extras/package/ipkg
+BASE_SUBDIRS = po src modules share doc test
+EXTRA_SUBDIRS = m4 extras/package/ipkg \
+ libs/loader libs/srtp \
+ projects/mozilla projects/activex
+DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
+
+SUBDIRS = po src
+if LOADER
+SUBDIRS += libs/loader
+endif
+if HAVE_LIBGCRYPT
+SUBDIRS += libs/srtp
+endif
+SUBDIRS += modules share doc test
+if BUILD_MOZILLA
+SUBDIRS += projects/mozilla
+endif
+if BUILD_ACTIVEX
+SUBDIRS += projects/activex
+endif
EXTRA_DIST = \
HACKING \
SUFFIXES =
-DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
+DISTCHECK_CONFIGURE_FLAGS = \
+ --enable-fast-install \
+ --disable-dbus \
+ --disable-dvd --disable-mad --disable-libmpeg2 \
--disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \
- --disable-fribidi
+ --disable-fribidi --disable-glx
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = \
ChangeLog: Makefile.am
rm -f -- "$@"
+ cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs
ln -sf doc/ChangeLog-2008 "$@"
###############################################################################
extras/package/macosx/Resources/English.lproj/Extended.nib/classes.nib \
extras/package/macosx/Resources/English.lproj/Extended.nib/info.nib \
extras/package/macosx/Resources/English.lproj/Extended.nib/keyedobjects.nib \
- extras/package/macosx/Resources/English.lproj/SFilters.nib/classes.nib \
- extras/package/macosx/Resources/English.lproj/SFilters.nib/info.nib \
- extras/package/macosx/Resources/English.lproj/SFilters.nib/keyedobjects.nib \
extras/package/macosx/Resources/English.lproj/Update.nib/classes.nib \
extras/package/macosx/Resources/English.lproj/Update.nib/info.nib \
extras/package/macosx/Resources/English.lproj/Update.nib/keyedobjects.nib \
extras/package/macosx/eyetvplugin/eyetvplugin.h \
extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings \
extras/package/macosx/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj \
- extras/package/macosx/README.MacOSX.rtf
+ extras/package/macosx/README.MacOSX.rtf \
+ extras/package/macosx/Info.plist
###############################################################################
# Building libvlc
###############################################################################
-bin_SCRIPTS = vlc-config
+noinst_SCRIPTS = vlc-config
vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in
$(SHELL) ./config.status --file=$@
chmod 0755 $@
# 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) libvlc.la
+ cd src && $(MAKE) $(AM_MAKEFLAGS) libvlccore.la
core:
cd src && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
###############################################################################
ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
-bin_SCRIPTS += $(ALIASES)
-CLEANFILES += $(ALIASES)
-if BUILD_VLC
+bin_SCRIPTS = $(ALIASES)
+CLEANFILES += $(ALIASES) $(noinst_SCRIPTS)
EXTRA_SCRIPTS = $(ALL_ALIASES)
-endif
dist_noinst_SCRIPTS += make-alias
-MKALIAS = bindir="$(bindir)" transform="$(transform)" $(top_srcdir)/make-alias $@
+MKALIAS = bindir="$(bindir)" transform="$(transform)" program_prefix="$(program_prefix)" program_suffix="$(program_suffix)" $(top_srcdir)/make-alias $@
cvlc: make-alias
$(MKALIAS) dummy
$(MKALIAS) ncurses
if BUILD_VLC
-noinst_SCRIPTS = vlc$(EXEEXT)
+noinst_SCRIPTS += vlc$(EXEEXT)
endif
-vlc$(EXEEXT): core
- rm -f vlc$(EXEEXT)
- ln -s src/vlc$(EXEEXT)
-# 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): 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
if HAVE_DARWIN
-# Create the MacOS X app
if BUILD_VLC
+# Create the MacOS X app
noinst_DATA = VLC.app
endif
+endif
+
# VLC-release.app for packaging and giving it to your friends
# use package-macosx to get a nice dmg
VLC-release.app: vlc
rm -Rf "$(top_builddir)/tmp"
mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
rm -Rf $(top_builddir)/VLC-release.app
- for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
+ for i in vlc.xcodeproj Resources README.MacOSX.rtf Info.plist; do \
cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
done
for i in AUTHORS COPYING THANKS; do \
extended.m \
bookmarks.h \
bookmarks.m \
- sfilters.h \
- sfilters.m \
update.h \
update.m \
interaction.h \
# This is just for development purposes.
# The resulting VLC.app will only in this tree.
VLC.app: vlc
- ( cd src && make install )
+ (cd src && make install)
rm -Rf $(top_builddir)/tmp
mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
rm -Rf $(top_builddir)/VLC.app
- for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
+ for i in vlc.xcodeproj Resources README.MacOSX.rtf Info.plist; do \
cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
done
for i in AUTHORS COPYING THANKS; do \
extended.m \
bookmarks.h \
bookmarks.m \
- sfilters.h \
- sfilters.m \
update.h \
update.m \
interaction.h \
$(top_builddir)/VLC.app
rm -Rf $(top_builddir)/tmp
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
- $(INSTALL) $(top_builddir)/src/.libs/vlc \
- $(top_builddir)/VLC.app/Contents/MacOS/VLC
- ln -sf ./VLC $(top_builddir)/VLC.app/Contents/MacOS/clivlc
+ 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 \
+ 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" ; \
$(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
done
printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo
-endif
###############################################################################
# Building architecture-specific binary packages
# the same setup as the maintaner(s).
#
+#Win-common if for win32 and wince
package-win-common:
# Check that tmp isn't in the way
@if test -e "$(top_builddir)/vlc-$(VERSION)"; then \
fi
# Copy relevant files
+# Copy executables and libs
cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/"
cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(top_builddir)/vlc-$(VERSION)/"
+ cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "vlc-$(VERSION)/"
cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-$(VERSION)/"
- cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-$(VERSION)/"
+# Copy Text files
for file in AUTHORS MAINTAINERS THANKS ; \
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
+# Necessary icons
+ cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-$(VERSION)/
+
+# Copy the locales
+ mkdir -p $(top_builddir)/vlc-$(VERSION)/locale
cat $(top_srcdir)/po/LINGUAS | while read i; do \
mkdir -p "$(top_builddir)/vlc-$(VERSION)/locale/$${i}/LC_MESSAGES" ; \
cp "$(srcdir)/po/$${i}.gmo" \
|| true ; \
done
-if BUILD_LUA
- mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/images"
- mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/requests"
- mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/js"
- mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/dialogs"
- cp $(srcdir)/share/lua/http/*.html $(top_builddir)/vlc-$(VERSION)/lua/http/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/*.html ;
- cp $(srcdir)/share/lua/http/.hosts $(top_builddir)/vlc-$(VERSION)/lua/http/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/.hosts ;
- cp $(srcdir)/share/lua/http/*.css $(top_builddir)/vlc-$(VERSION)/lua/http/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/*.css ;
- cp $(srcdir)/share/lua/http/js/*.js $(top_builddir)/vlc-$(VERSION)/lua/http/js/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/js/*.js ;
- cp $(srcdir)/share/lua/http/dialogs/* $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/* ;
- cp $(srcdir)/share/lua/http/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/.hosts ;
- cp $(srcdir)/share/lua/http/*.ico $(top_builddir)/vlc-$(VERSION)/lua/http/ ;
- cp $(srcdir)/share/lua/http/images/*.png $(top_builddir)/vlc-$(VERSION)/lua/http/images/
- cp $(srcdir)/share/lua/http/requests/*.xml $(top_builddir)/vlc-$(VERSION)/lua/http/requests/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/requests/*.xml ;
- cp $(srcdir)/share/lua/http/requests/readme $(top_builddir)/vlc-$(VERSION)/lua/http/requests/readme.txt ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/requests/readme.txt ;
-endif
-
-if BUILD_HTTPD
- mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/images"
- mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/requests"
- mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/js"
- mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/dialogs"
- mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/old"
- mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/old/vlm"
- mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/old/admin"
- cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-$(VERSION)/http/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http/*.html ;
- cp $(srcdir)/share/http/.hosts $(top_builddir)/vlc-$(VERSION)/http/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http/.hosts ;
- cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-$(VERSION)/http/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http/*.css ;
- cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-$(VERSION)/http/js/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http/js/*.js ;
- cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-$(VERSION)/http/dialogs/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http/dialogs/* ;
- cp $(srcdir)/share/http/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/http/dialogs/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http/dialogs/.hosts ;
- cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-$(VERSION)/http/ ;
- cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-$(VERSION)/http/images/
- cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-$(VERSION)/http/requests/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http/requests/*.xml ;
- cp $(srcdir)/share/http/requests/readme $(top_builddir)/vlc-$(VERSION)/http/requests/readme.txt ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http/requests/readme.txt ;
-
- cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-$(VERSION)/http/old/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http/old/*.html ;
- cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-$(VERSION)/http/old/ ;
- cp $(srcdir)/share/http/old/.hosts $(top_builddir)/vlc-$(VERSION)/http/old/ ;
- cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-$(VERSION)/http/old/ ;
- cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-$(VERSION)/http/old/vlm/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http/old/vlm/*.html ;
- cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-$(VERSION)/http/old/admin/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http/old/admin/*.html ;
- cp $(srcdir)/share/http/old/admin/.access $(top_builddir)/vlc-$(VERSION)/http/old/admin/ ;
-endif
-
- cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-$(VERSION)/ ;
-
+# Mozilla plugin
if BUILD_MOZILLA
mkdir -p "$(top_builddir)/vlc-$(VERSION)/mozilla"
- cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/mozilla/ ;
+ cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/mozilla/
endif
+# ActiveX plugin
if BUILD_ACTIVEX
mkdir -p "$(top_builddir)/vlc-$(VERSION)/activex"
- cp $(srcdir)/projects/activex/README.TXT $(top_builddir)/vlc-$(VERSION)/activex/ ;
- cp $(srcdir)/projects/activex/test.html $(top_builddir)/vlc-$(VERSION)/activex/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/activex/* ;
+ cp $(srcdir)/projects/activex/README.TXT $(top_builddir)/vlc-$(VERSION)/activex/
+ cp $(srcdir)/projects/activex/test.html $(top_builddir)/vlc-$(VERSION)/activex/
+ unix2dos $(top_builddir)/vlc-$(VERSION)/activex/*
- cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/ ;
+ cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/
endif
+
# Rebase all those DLLs to speed up loading (need cygwin rebase)
if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \
find $(top_builddir)/vlc-$(VERSION) -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
fi
-package-win-common-strip:
- $(STRIP) "$(top_builddir)/vlc-$(VERSION)/vlc$(EXEEXT)"
- $(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)"
- $(STRIP) "vlc-$(VERSION)/libvlc-control$(LIBEXT)"
-if BUILD_MOZILLA
- $(STRIP) $(top_builddir)/vlc-$(VERSION)/mozilla/npvlc$(LIBEXT);
-endif
-if BUILD_ACTIVEX
- $(STRIP) $(top_builddir)/vlc-$(VERSION)/activex/axvlc$(LIBEXT);
-endif
-
package-win32-base-debug: package-win-common
# Copy relevant files
# Script installer
# Plugins
mkdir -p "$(top_builddir)/vlc-$(VERSION)/plugins"
- find modules/ -name '*_plugin.$(LIBEXT)' | while read i; do \
+ find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \
if test -n "$$i" ; then \
$(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \
fi ; done
-if BUILD_SKINS
-# Skins
- mkdir -p $(top_builddir)/vlc-$(VERSION)/skins/fonts
- for i in $(srcdir)/share/skins2/fonts/*.*; do \
- cp $$i $(top_builddir)/vlc-$(VERSION)/skins/fonts/ || true ; \
- done
- for i in $(srcdir)/share/skins2/*.*; do \
- cp $$i $(top_builddir)/vlc-$(VERSION)/skins/ || true ; \
- done
+# Copy the lua scripts (HTTP)
+if BUILD_LUA
+ mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/lua/http/images"
+ mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/lua/http/requests"
+ mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/lua/http/js"
+ mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/lua/http/dialogs"
+ cp $(srcdir)/share/lua/http/*.html $(top_builddir)/vlc-$(VERSION)/share/lua/http/
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/*.html
+ cp $(srcdir)/share/lua/http/.hosts $(top_builddir)/vlc-$(VERSION)/share/lua/http/
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/.hosts
+ cp $(srcdir)/share/lua/http/*.css $(top_builddir)/vlc-$(VERSION)/share/lua/http/
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/*.css
+ cp $(srcdir)/share/lua/http/js/*.js $(top_builddir)/vlc-$(VERSION)/share/lua/http/js/
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/js/*.js
+ cp $(srcdir)/share/lua/http/dialogs/* $(top_builddir)/vlc-$(VERSION)/share/lua/http/dialogs/
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/dialogs/*
+ cp $(srcdir)/share/lua/http/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/share/lua/http/dialogs/
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/dialogs/.hosts
+ cp $(srcdir)/share/lua/http/*.ico $(top_builddir)/vlc-$(VERSION)/share/lua/http/
+ cp $(srcdir)/share/lua/http/images/*.png $(top_builddir)/vlc-$(VERSION)/share/lua/http/images/
+ cp $(srcdir)/share/lua/http/requests/*.xml $(top_builddir)/vlc-$(VERSION)/share/lua/http/requests/
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/requests/*.xml
+ cp $(srcdir)/share/lua/http/requests/readme $(top_builddir)/vlc-$(VERSION)/share/lua/http/requests/readme.txt
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/requests/readme.txt
endif
if BUILD_LUA
#Lua Scripts
- $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/playlist
+ $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/playlist
for i in $(srcdir)/share/lua/playlist/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/playlist/`basename $${i}` ; \
- done ;
- $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/meta
+ $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/playlist/`basename $${i}` ; \
+ done
+ $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/meta
for i in $(srcdir)/share/lua/meta/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/meta/`basename $${i}` ; \
- done ;
- $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/intf
+ $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/meta/`basename $${i}` ; \
+ done
+ $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf
for i in $(srcdir)/share/lua/intf/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/intf/`basename $${i}` ; \
- done ;
- $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/intf/modules
+ $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/intf/`basename $${i}` ; \
+ done
+ $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules
for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/intf/modules/`basename $${i}` ; \
- done ;
+ $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules/`basename $${i}` ; \
+ done
+endif
+
+# Copy the http files
+if BUILD_HTTPD
+ mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/images"
+ mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/requests"
+ mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/js"
+ mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/dialogs"
+ mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/old"
+ mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/old/vlm"
+ mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/old/admin"
+ cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-$(VERSION)/share/http/
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/*.html
+ cp $(srcdir)/share/http/.hosts $(top_builddir)/vlc-$(VERSION)/share/http/
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/.hosts
+ cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-$(VERSION)/share/http/
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/*.css
+ cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-$(VERSION)/share/http/js/
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/js/*.js
+ cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-$(VERSION)/share/http/dialogs/
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/dialogs/*
+ cp $(srcdir)/share/http/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/share/http/dialogs/
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/dialogs/.hosts
+ cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-$(VERSION)/share/http/
+ cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-$(VERSION)/share/http/images/
+ cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-$(VERSION)/share/http/requests/
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/requests/*.xml
+ cp $(srcdir)/share/http/requests/readme $(top_builddir)/vlc-$(VERSION)/share/http/requests/readme.txt
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/requests/readme.txt
+
+ cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-$(VERSION)/share/http/old/
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/old/*.html
+ cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-$(VERSION)/share/http/old/
+ cp $(srcdir)/share/http/old/.hosts $(top_builddir)/vlc-$(VERSION)/share/http/old/
+ cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-$(VERSION)/share/http/old/
+ cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-$(VERSION)/share/http/old/vlm/
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/old/vlm/*.html
+ cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-$(VERSION)/share/http/old/admin/
+ unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/old/admin/*.html
+ cp $(srcdir)/share/http/old/admin/.access $(top_builddir)/vlc-$(VERSION)/share/http/old/admin/
+endif
+
+if BUILD_SKINS
+# Skins
+ mkdir -p $(top_builddir)/vlc-$(VERSION)/skins/fonts
+ for i in $(srcdir)/share/skins2/fonts/*.*; do \
+ cp -- "$$i" $(top_builddir)/vlc-$(VERSION)/skins/fonts/ || true ; \
+ done
+ for i in $(srcdir)/share/skins2/*.*; do \
+ cp -- "$$i" $(top_builddir)/vlc-$(VERSION)/skins/ || true ; \
+ done
endif
if BUILD_OSDMENU
cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-$(VERSION)/osdmenu"
for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \
mkdir -p "$(top_builddir)/vlc-$(VERSION)/osdmenu/$$dir"; \
- for file in $(srcdir)/share/osdmenu/$${dir}/*.*;do \
- cp $$file "$(top_builddir)/vlc-$(VERSION)/osdmenu/$$dir" || true; \
+ for file in $(srcdir)/share/osdmenu/$${dir}/* ;do \
+ cp -- "$$file" "$(top_builddir)/vlc-$(VERSION)/osdmenu/$$dir"; \
done; \
done
unix2dos $(top_builddir)/vlc-$(VERSION)/osdmenu/*.cfg;
for file in $(top_builddir)/vlc-$(VERSION)/osdmenu/*.cfg; do \
- if sed 's%share/osdmenu%osdmenu%g' $$file >$$file.tmp; then :; else exit 1; fi; \
- if sed 's%/%\\%g' $$file.tmp >$$file; then :; else exit 1; fi; \
- rm -f $$file.tmp; \
+ sed 's%share/osdmenu%osdmenu%g' "$$file" > "$$file.tmp" || exit $$? ; \
+ sed 's%/%\\%g' "$$file.tmp" > "$$file" || exit$$? ; \
+ rm -f -- "$$file.tmp"; \
done
endif
-package-win32-base: package-win32-base-debug package-win-common-strip
+# SDK
+ mkdir -p "$(top_builddir)/vlc-$(VERSION)/sdk.tmp"
+ mkdir -p "$(top_builddir)/vlc-$(VERSION)/sdk"
+ d=$$(pwd) && \
+ cd src && \
+ make install DESTDIR="$$d/vlc-$(VERSION)/sdk.tmp"
+ cd vlc-$(VERSION) && mv sdk.tmp/$(prefix)/* sdk/
+ find vlc-$(VERSION)/sdk.tmp -type d | sort -r | xargs rmdir
+ rm -Rf vlc-$(VERSION)/sdk/bin
+
+package-win-common-strip: package-win32-base-debug
+ $(STRIP) "vlc-$(VERSION)/vlc$(EXEEXT)"
+ $(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)"
+ $(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)"
+if BUILD_MOZILLA
+ $(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)"
+endif
+if BUILD_ACTIVEX
+ $(STRIP) "vlc-$(VERSION)/activex/axvlc$(LIBEXT)"
+endif
+
+package-win32-base: package-win-common-strip
for i in "" $(top_builddir)/vlc-$(VERSION)/plugins/*$(LIBEXT) ; \
do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
package-win32-base-exe: package-win32-base
# Create package
if makensis -VERSION >/dev/null 2>&1; then \
- MAKENSIS="makensis -DVERSION=$(VERSION)"; \
+ MAKENSIS="makensis"; \
elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
- MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=$(VERSION)"; \
+ MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis)"; \
elif [ -x "$(PROGRAMFILES)/NSIS/makensis" ]; then \
- MAKENSIS="$(PROGRAMFILES)/NSIS/makensis -DVERSION=$(VERSION)"; \
+ MAKENSIS="$(PROGRAMFILES)/NSIS/makensis"; \
elif wine --version >/dev/null 2>&1; then \
- MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=$(VERSION)"; \
+ MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe"; \
else \
echo 'Error: cannot locate makensis tool'; exit 1; \
fi; \
package-win32-base-exe-linux:
# Create package
- makensis -DVERSION=$(VERSION) $(top_builddir)/vlc-$(VERSION)/vlc.win32.nsi
+ makensis $(top_builddir)/vlc-$(VERSION)/vlc.win32.nsi
package-win32-base-zip: package-win32-base
# Create package
+ rm -f -- vlc-$(VERSION)-win32.zip
zip -r -9 vlc-$(VERSION)-win32.zip vlc-$(VERSION)
package-win32-base-7zip: package-win32-base
fi
# Copy relevant files
- mkdir -p $(srcdir)/tmp/vlc ;
+ mkdir -p $(srcdir)/tmp/vlc
cd $(srcdir) && cp -R vlc-bundle/* AUTHORS COPYING ChangeLog README \
- THANKS NEWS tmp/vlc/ ;
+ THANKS NEWS tmp/vlc/
# Create debug package
- xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
- find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
- mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-$(VERSION) ;
+ xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc
+ find $(srcdir)/tmp/vlc -exec mimeset -f {} \;
+ mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-$(VERSION)
(cd $(srcdir)/tmp && zip -9 -r vlc-$(VERSION)-BeOS-debug.zip vlc-$(VERSION) )
- mv $(srcdir)/tmp/vlc-$(VERSION)-BeOS-debug.zip $(srcdir)/ ;
- mv $(srcdir)/tmp/vlc-$(VERSION) $(srcdir)/tmp/vlc ;
+ mv $(srcdir)/tmp/vlc-$(VERSION)-BeOS-debug.zip $(srcdir)/
+ mv $(srcdir)/tmp/vlc-$(VERSION) $(srcdir)/tmp/vlc
# Create normal package
- $(STRIP) --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ;
+ $(STRIP) --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc
find $(srcdir)/tmp/vlc -name 'lib*.so' -exec $(STRIP) \
- --strip-debug --strip-unneeded "{}" \; ;
- xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
- find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
- mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-$(VERSION) ;
+ --strip-debug --strip-unneeded "{}" \;
+ xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc
+ find $(srcdir)/tmp/vlc -exec mimeset -f {} \;
+ mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-$(VERSION)
(cd $(srcdir)/tmp && zip -9 -r vlc-$(VERSION)-BeOS.zip vlc-$(VERSION) )
- mv $(srcdir)/tmp/vlc-$(VERSION)-BeOS.zip $(srcdir)/ ;
+ mv $(srcdir)/tmp/vlc-$(VERSION)-BeOS.zip $(srcdir)/
# Clean up
- rm -Rf $(srcdir)/tmp ;
+ rm -Rf $(srcdir)/tmp
package-macosx:
# Check that the temporary location isn't in the way
cp AUTHORS COPYING ChangeLog README THANKS NEWS $(top_builddir)/vlc-$(VERSION)/Goodies/ && \
cp -R extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \
cp extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \
- cp extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png ;
+ cp extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png
# Place a link to the application folder
- ln -s /Applications $(top_builddir)/vlc-$(VERSION)/Applications ;
+ ln -s /Applications $(top_builddir)/vlc-$(VERSION)/Applications
# 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" ;
+ echo "Creating disk image"
+ rm -f "$(top_builddir)/vlc-$(VERSION).dmg"
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 ;
+ "$(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" ;
+# 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 ;
+# -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 -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)" ;
+# 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 "Make the disk image read-only" ;
- mv "$(top_builddir)/vlc-$(VERSION).dmg" "$(top_builddir)/vlc-$(VERSION)-rw.dmg" ;
- hdiutil convert "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -format UDZO -o "$(top_builddir)/vlc-$(VERSION).dmg" ;
- rm "$(top_builddir)/vlc-$(VERSION)-rw.dmg" ;
+ echo "Make the disk image read-only"
+ mv "$(top_builddir)/vlc-$(VERSION).dmg" "$(top_builddir)/vlc-$(VERSION)-rw.dmg"
+ hdiutil convert "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -format UDZO -o "$(top_builddir)/vlc-$(VERSION).dmg"
+ rm "$(top_builddir)/vlc-$(VERSION)-rw.dmg"
# We are done
- echo "Disk image creation completed:" ;
- ls -la "$(top_builddir)/vlc-$(VERSION).dmg" ; echo ;
+ echo "Disk image creation completed:"
+ ls -la "$(top_builddir)/vlc-$(VERSION).dmg" ; echo
# Clean up
- rm -Rf "$(top_builddir)/vlc-$(VERSION)" ;
+ rm -Rf "$(top_builddir)/vlc-$(VERSION)"
package-macosx-zip:
rm -Rf $(top_builddir)/vlc-$(VERSION)
mv "$(top_builddir)/VLC Internet Plug-In.pkg" "$(top_builddir)/vlc-plugin-$(VERSION)/"
hdiutil create -srcfolder "$(top_builddir)/vlc-plugin-$(VERSION)" \
"$(top_builddir)/vlc-plugin-$(VERSION).dmg" -format UDZO \
- -scrub -imagekey zlib-level=9 ;
+ -scrub -imagekey zlib-level=9
echo "Disk image creation completed:"
rm -rf "$(top_builddir)/vlc-plugin-$(VERSION)"
endif
| grep -vE 'qt4/ui/.*.h' \
| grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \
| grep -v 'gui/opie' \
+ | grep -v 'wxwidgets' \
+ | grep -v 'mux/rtp/' \
+ | grep -v 'demux/rtpxiph.c' \
| sort ; \
} > $(top_srcdir)/po/POTFILES.in
rm -f $(top_srcdir)/po/vlc.pot
projects / vlc / blobdiff