# - libs/* are needed by modules
SUBDIRS = po libs/loader libs/srtp src modules \
projects/mozilla bindings projects/activex share doc
-DIST_SUBDIRS = $(SUBDIRS) extras/buildsystem/autotools/m4 extras/package/ipkg
+DIST_SUBDIRS = $(SUBDIRS) m4 extras/package/ipkg
EXTRA_DIST = \
HACKING \
SUFFIXES =
DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
- --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2
+ --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \
+ --disable-fribidi
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = \
1.9 \
-Wall \
check-news \
- std-options \
dist-bzip2 \
no-dist-gzip
+# std-options
+
+ChangeLog: Makefile.am
+ rm -f -- "$@"
+ ln -sf doc/ChangeLog-2008 "$@"
###############################################################################
# MacOS X project
# Various utilities ( editor syntax files, D-Bus controller ... )
##############################################################################
EXTRA_DIST += \
- extras/analyser/Makefile \
+ extras/analyser/zsh_completion.sh \
extras/analyser/zsh.cpp \
extras/analyser/emacs.init \
extras/analyser/vlc.vim \
extras/analyser/valgrind.suppressions \
extras/buildsystem/make.pl \
- extras/buildsystem/autotools/m4/autoconf260.m4 \
extras/misc/mpris.py \
extras/misc/mpris.glade
touch $@
CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin
-DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
+DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog
# 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
-###############################################################################
-
-bin_PROGRAMS = vlc
-
-vlc_SOURCES = src/vlc.c
-# Ugly kludge so that automake defines $(CXXLINK)
-nodist_EXTRA_vlc_SOURCES = extras/analyser/zsh.cpp src/misc/darwin_specific.c
+ cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
-vlc_DEPENDENCIES = $(DATA_win32_rc)
+core:
+ cd src && $(MAKE) $(AM_MAKEFLAGS) vlc
-vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc`
-vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
-if !HAVE_PLUGINS
-vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'`
-endif
-
-vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-LIB_libvlc = libvlc.la
-LIBVLC = src/$(LIB_libvlc)
+.PHONY: libvlc core
#To get some nice output
nice:
$(top_builddir)/compile
-core: libvlc vlc$(EXEEXT)
-
-.PHONY: core
-
-vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
- @rm -f vlc$(EXEEXT)
- @case `$(VLC_CONFIG) --linkage vlc builtin` in \
- c++) cmd="$(CXXLINK)" ;; \
- objc) cmd="$(OBJCLINK)" ;; \
- c|*) cmd="$(LINK)" ;; \
- esac ; \
- cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \
- echo $$cmd ; \
- eval $$cmd
-
if HAVE_BEOS
noinst_DATA = vlc-bundle
vlc-bundle: vlc
ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
bin_SCRIPTS += $(ALIASES)
+CLEANFILES += $(ALIASES)
+if BUILD_VLC
EXTRA_SCRIPTS = $(ALL_ALIASES)
+endif
dist_noinst_SCRIPTS += make-alias
nvlc: make-alias
$(MKALIAS) ncurses
+if BUILD_VLC
+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
+
if HAVE_DARWIN
# Create the MacOS X app
+if BUILD_VLC
noinst_DATA = VLC.app
-# VLC-release.app is the old VLC.app target
+endif
+# VLC-release.app for packaging and giving it to your friends
+# use package-macosx to get a nice dmg
VLC-release.app: vlc
( cd src && make install )
- then rm -Rf "$(top_builddir)/tmp"
+ rm -Rf "$(top_builddir)/tmp"
mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
rm -Rf $(top_builddir)/VLC-release.app
- cp -R $(srcdir)/extras/package/macosx/vlc.xcodeproj $(top_builddir)/tmp/extras/package/macosx/
- cp -R $(srcdir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx
- for i in AUTHORS COPYING extras/package/macosx/README.MacOSX.rtf THANKS; do \
+ 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 AUTHORS COPYING THANKS; do \
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done
mkdir -p $(top_builddir)/tmp/modules/audio_output
prefs_widgets.m \
prefs.h \
prefs.m \
+ simple_prefs.h \
+ simple_prefs.m \
vout.h \
voutqt.m \
voutgl.m \
$(top_builddir)/tmp/modules/gui/macosx; \
done
cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
- cd ../../../ && \
+ cd ../../../../ && \
cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
$(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)/extras/package/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}` ; \
- done ; \
- $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta
- for i in $(srcdir)/share/luameta/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta/`basename $${i}` ; \
- done ; \
- $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf
- for i in $(srcdir)/share/luaintf/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/`basename $${i}` ; \
- done ; \
- $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/modules
- for i in $(srcdir)/share/luaintf/modules/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/modules/`basename $${i}` ; \
- done ; \
- $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs
- $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js
- $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old
- $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin
- $(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 ; \
- for i in $(srcdir)/share/http-lua/dialogs/* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs/`basename $${i}` ; \
- done ; \
- for i in $(srcdir)/share/http-lua/js/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js/`basename $${i}` ; \
- done ; \
- for i in $(srcdir)/share/http-lua/old/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/`basename $${i}` ; \
- done ; \
- for i in $(srcdir)/share/http-lua/old/admin/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin/`basename $${i}` ; \
+ $(INSTALL) $(top_builddir)/src/.libs/vlc \
+ $(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
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \
+ for i in $(srcdir)/src/.libs/*.dylib ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`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}` ; \
done ; \
- for i in $(srcdir)/share/http-lua/old/vlm/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm/`basename $${i}` ; \
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/meta
+ for i in $(srcdir)/share/lua/meta/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/meta/`basename $${i}` ; \
done ; \
- for i in $(srcdir)/share/http-lua/images/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images/`basename $${i}` ; \
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf
+ for i in $(srcdir)/share/lua/intf/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/`basename $${i}` ; \
done ; \
- for i in $(srcdir)/share/http-lua/requests/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/`basename $${i}` ; \
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/modules
+ for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/modules/`basename $${i}` ; \
done ; \
- $(INSTALL) -m 644 $(srcdir)/share/http-lua/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/readme.txt
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/dialogs
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/js
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/images
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests
+ $(INSTALL) -m 644 $(srcdir)/share/lua/http/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/.hosts
+ for i in $(srcdir)/share/lua/http/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/`basename $${i}` ; \
+ done
+ for i in $(srcdir)/share/lua/http/dialogs/* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/dialogs/`basename $${i}` ; \
+ done
+ for i in $(srcdir)/share/lua/http/js/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/js/`basename $${i}` ; \
+ done
+ for i in $(srcdir)/share/lua/http/images/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/images/`basename $${i}` ; \
+ done
+ for i in $(srcdir)/share/lua/http/requests/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/`basename $${i}` ; \
+ done
+ $(INSTALL) -m 644 $(srcdir)/share/lua/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/readme.txt
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old
$(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 ; \
+ done
for i in $(srcdir)/share/http/dialogs/* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http/js/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http/old/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http/old/admin/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http/old/vlm/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http/images/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images/`basename $${i}` ; \
- done ; \
+ done
for i in $(srcdir)/share/http/requests/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/`basename $${i}` ; \
- done ; \
+ done
$(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/locale
cat $(top_srcdir)/po/LINGUAS | while read i; do \
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
( cd src && make install )
rm -Rf $(top_builddir)/tmp
mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
rm -Rf $(top_builddir)/VLC.app
- cp -R $(srcdir)/extras/package/macosx/vlc.xcodeproj $(top_builddir)/tmp/extras/package/macosx/
- cp -R $(srcdir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx
- for i in AUTHORS COPYING extras/package/macosx/README.MacOSX.rtf THANKS; do \
+ 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 AUTHORS COPYING THANKS; do \
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done
mkdir -p $(top_builddir)/tmp/modules/audio_output
prefs_widgets.m \
prefs.h \
prefs.m \
+ simple_prefs.h \
+ simple_prefs.m \
vout.h \
voutqt.m \
voutgl.m \
$(top_builddir)/tmp/modules/gui/macosx; \
done
cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
- cd ../../../ && \
+ cd ../../../../ && \
cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
- $(top_builddir)/VLC.app; \
+ $(top_builddir)/VLC.app
rm -Rf $(top_builddir)/tmp
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
- $(INSTALL) $(top_builddir)/.libs/vlc \
+ $(INSTALL) $(top_builddir)/src/.libs/vlc \
$(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
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
cat $(top_srcdir)/po/LINGUAS | while read i; do \
mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
- ln -sfn `pwd`/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ ln -sfn `pwd`/$(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
ln -sf ../English.lproj/InfoPlist.strings \
$(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo
endif
-if HAVE_WIN32
-DATA_win32_rc = $(noinst_share_vlc_win32_rc_DATA)
-noinst_share_vlc_win32_rc_DATA = share/vlc_win32_rc.$(OBJEXT)
-noinst_share_vlc_win32_rcdir = $(libdir)
-share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc
- $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir)/share -i $< -o $@
-endif
-
-
###############################################################################
# Building architecture-specific binary packages
###############################################################################
fi
# Copy relevant files
- cp "$(top_builddir)/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/"
+ 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/libvlc$(LIBEXT)" "vlc-$(VERSION)/"
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" ; done;
for file in NEWS COPYING README; \
- do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done
- unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt
+ 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 \
|| true ; \
done
- mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/images"
- mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/requests"
- mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/js"
- mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/dialogs"
- mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/old"
- mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/old/vlm"
- mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/old/admin"
- cp $(srcdir)/share/http-lua/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/*.html ;
- cp $(srcdir)/share/http-lua/.hosts $(top_builddir)/vlc-$(VERSION)/http-lua/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/.hosts ;
- cp $(srcdir)/share/http-lua/*.css $(top_builddir)/vlc-$(VERSION)/http-lua/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/*.css ;
- cp $(srcdir)/share/http-lua/js/*.js $(top_builddir)/vlc-$(VERSION)/http-lua/js/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/js/*.js ;
- cp $(srcdir)/share/http-lua/dialogs/* $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/* ;
- cp $(srcdir)/share/http-lua/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/.hosts ;
- cp $(srcdir)/share/http-lua/*.ico $(top_builddir)/vlc-$(VERSION)/http-lua/ ;
- cp $(srcdir)/share/http-lua/images/*.png $(top_builddir)/vlc-$(VERSION)/http-lua/images/
- cp $(srcdir)/share/http-lua/requests/*.xml $(top_builddir)/vlc-$(VERSION)/http-lua/requests/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/requests/*.xml ;
- cp $(srcdir)/share/http-lua/requests/readme $(top_builddir)/vlc-$(VERSION)/http-lua/requests/readme.txt ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/requests/readme.txt ;
-
- cp $(srcdir)/share/http-lua/old/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/old/*.html ;
- cp $(srcdir)/share/http-lua/old/*.css $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ;
- cp $(srcdir)/share/http-lua/old/.hosts $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ;
- cp $(srcdir)/share/http-lua/old/*.png $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ;
- cp $(srcdir)/share/http-lua/old/vlm/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/old/vlm/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/old/vlm/*.html ;
- cp $(srcdir)/share/http-lua/old/admin/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/old/admin/ ;
- unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/old/admin/*.html ;
- cp $(srcdir)/share/http-lua/old/admin/.access $(top_builddir)/vlc-$(VERSION)/http-lua/old/admin/ ;
+ 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 ;
mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/images"
mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/requests"
package-win32-base-debug: package-win-common
# Copy relevant files
+# Script installer
cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(top_builddir)/vlc-$(VERSION)/"
+# Plugins
mkdir -p "$(top_builddir)/vlc-$(VERSION)/plugins"
for i in "" `$(VLC_CONFIG) --target plugin` ; do \
if test -n "$$i" ; then \
"$(top_builddir)/vlc-$(VERSION)/plugins/" ; \
fi ; done
+# 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 ; \
cp $$i $(top_builddir)/vlc-$(VERSION)/skins/ || true ; \
done
- $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaplaylist
- for i in $(srcdir)/share/luaplaylist/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaplaylist/`basename $${i}` ; \
+#Lua Scripts
+ $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/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)/share/luameta
- for i in $(srcdir)/share/luameta/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luameta/`basename $${i}` ; \
+ $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/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)/share/luaintf
- for i in $(srcdir)/share/luaintf/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaintf/`basename $${i}` ; \
+ $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/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)/share/luaintf/modules
- for i in $(srcdir)/share/luaintf/modules/*.* ; do \
- $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaintf/modules/`basename $${i}` ; \
+ $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/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 ;
+#OSD Menu
mkdir -p "$(top_builddir)/vlc-$(VERSION)/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 \
projects / vlc / blobdiff