# which have makefiles with distribution information.
# - intl should come before modules and . because all the code uses gettext
# - modules should come before . because vlc needs the builtins
-# - . should come before mozilla because the plugin needs libvlc_pic.a
+# - . should come before mozilla/bindings because the plugin needs libvlc_pic.a
# - po should come before . because VLC.app needs the pofiles
# - loader should come before modules because some plugins need it
-SUBDIRS = intl loader modules po . mozilla activex share m4 doc
+SUBDIRS = intl loader modules po . mozilla bindings activex share m4 doc
DIST_SUBDIRS = $(SUBDIRS) debian ipkg lib
EXTRA_DIST = \
HACKING \
INSTALL.win32 \
+ INSTALL.wince \
vlc.exe.manifest \
MAINTAINERS \
README.MacOSX.rtf \
src/misc/modules_builtin.h.in \
$(NULL)
-DISTCLEAN_BUILT_SOURCES = vlc-config
-CLEAN_BUILT_SOURCES = \
+BUILT_SOURCES_distclean = vlc-config
+BUILT_SOURCES_clean = \
stamp-api \
src/misc/modules_builtin.h \
src/misc/version.c \
$(NULL)
-BUILT_SOURCES = $(CLEAN_BUILT_SOURCES) $(DISTCLEAN_BUILT_SOURCES)
+BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean)
SUFFIXES =
include/modules_inner.h \
include/mtime.h \
include/network.h \
- include/osd.h \
include/os_specific.h \
include/snapshot.h \
include/stream_output.h \
srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
touch src/misc/modules_builtin.h
+src/misc/modules.c: src/misc/modules_builtin.h
+
src/misc/version.c: FORCE
srcdir=$(srcdir) $(srcdir)/toolbox --update-version
extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib \
extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib \
- extras/MacOSX/Resources/English.lproj/Update.nib/classes.nib \
- extras/MacOSX/Resources/English.lproj/Update.nib/info.nib \
- extras/MacOSX/Resources/English.lproj/Update.nib/keyedobjects.nib \
+ extras/MacOSX/Resources/English.lproj/SFilters.nib/classes.nib \
+ extras/MacOSX/Resources/English.lproj/SFilters.nib/info.nib \
+ extras/MacOSX/Resources/English.lproj/SFilters.nib/keyedobjects.nib \
extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
extras/MacOSX/Resources/a52.icns \
extras/MacOSX/Resources/aac.icns \
extras/MacOSX/Resources/README \
extras/MacOSX/vlc.pbproj/project.pbxproj \
extras/MacOSX/macosx-dmg \
- \
+ extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \
+ extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \
+ extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet \
+ extras/MacOSX/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf \
+ extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.icns \
+ extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.rsrc \
+ extras/MacOSX/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \
extras/Makefile \
extras/zsh.cpp \
$(NULL)
./config.status --recheck
MOSTLYCLEANFILES = $(DATA_noinst_libvlc)
-CLEANFILES = $(CLEAN_BUILT_SOURCES) stamp-builtin
-DISTCLEANFILES = $(DISTCLEAN_BUILT_SOURCES) vlc-config.in
+CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin
+DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in
if HAVE_WIN32
lib_LIBRARIES = lib/libvlc.a
else
-if BUILD_SHARED
-lib_LIBRARIES = lib/libvlc_pic.a
-else
lib_LIBRARIES = lib/libvlc.a
-if BUILD_MOZILLA
+if BUILD_PIC
lib_LIBRARIES += lib/libvlc_pic.a
-endif
+else
endif
endif
src/stream_output/sap.c \
src/stream_output/acl.c \
src/osd/osd.c \
- src/osd/osd_widgets.c \
src/osd/osd_parser.c \
+ src/osd/osd_text.c \
+ src/osd/osd_widgets.c \
src/misc/charset.c \
src/misc/httpd.c \
src/misc/tls.c \
echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \
fi
rm -Rf $(top_builddir)/VLC-release.app
- cp -r $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
+ cp -R $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done
wizard.m \
extended.h \
extended.m \
- bookmarks.h \
- bookmarks.m \
- update.h \
- update.m \
+ bookmarks.h \
+ bookmarks.m \
+ sfilters.h \
+ sfilters.m \
vout.m; do \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
case $(target_triplet) in \
*darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
cd ../../../; \
- cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+ cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC-release.app;; \
*darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
cd ../../../; \
- cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+ cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC-release.app;; \
*darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
cd ../../../; \
- cp -r $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
+ cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
$(top_builddir)/VLC-release.app;; \
esac
rm -Rf $(top_builddir)/tmp
echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \
fi
rm -Rf $(top_builddir)/VLC.app
- cp -r $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
+ cp -R $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done
wizard.m \
extended.h \
extended.m \
- bookmarks.h \
- bookmarks.m \
- update.h \
- update.m \
+ bookmarks.h \
+ bookmarks.m \
+ sfilters.h \
+ sfilters.m \
vout.m; do \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
case $(target_triplet) in \
*darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
cd ../../../; \
- cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+ cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC.app;; \
*darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
cd ../../../; \
- cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+ cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC.app;; \
*darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
cd ../../../; \
- cp -r $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
+ cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
$(top_builddir)/VLC.app;; \
esac
rm -Rf $(top_builddir)/tmp
done
mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu"
- mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd"
- mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selected"
- mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/unselect"
- mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selection"
- mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/volume"
- for i in $(srcdir)/share/osdmenu/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/ || true ; \
- unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/`basename $$i` ; \
- done
- for i in $(srcdir)/share/osdmenu/dvd/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd || true ; \
- done
- for i in $(srcdir)/share/osdmenu/dvd/unselect/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/unselect || true ; \
- done
- for i in $(srcdir)/share/osdmenu/dvd/selected/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selected/ || true ; \
- done
- for i in $(srcdir)/share/osdmenu/dvd/selection/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selection/ || true ; \
- done
- for i in $(srcdir)/share/osdmenu/dvd/volume/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/volume/ || true ; \
- done
-
- mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default"
- mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/selected"
- mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/selection"
- mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/volume"
- for i in $(srcdir)/share/osdmenu/default/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default || true ; \
- done
- for i in $(srcdir)/share/osdmenu/default/selected/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/selected/ || true ; \
- done
- for i in $(srcdir)/share/osdmenu/default/selection/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/selection/ || true ; \
- done
- for i in $(srcdir)/share/osdmenu/default/volume/*.*; do \
- cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/volume/ || true ; \
+ 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;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; \
+ done; \
done
+ unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg;
+ sed -i 's%share/osdmenu%osdmenu%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg
+ sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/admin"
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/vlm"
cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
- unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;:
cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ;
cp $(srcdir)/share/http/*.png $(top_builddir)/vlc-${VERSION}/http/
$(top_builddir)/vlc-${VERSION}/http/vlm/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
- cp $(srcdir)/share/vlc48x48new.ico $(top_builddir)/vlc-${VERSION}/ ;
+ cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
if BUILD_MOZILLA
# Clean up
rm -Rf $(top_builddir)/vlc-${VERSION}
+package-wince-base:
+# Check that tmp isn't in the way
+ @if test -e "$(top_builddir)/vlc-${VERSION}"; then \
+ echo "Error: please remove $(top_builddir)/vlc-${VERSION}, it is in the way"; \
+ false; \
+ else \
+ echo "OK."; mkdir -p "$(top_builddir)/vlc-${VERSION}"; \
+ fi
+
+# Copy relevant files
+ cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
+ cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/"
+ $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)"
+
+ for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
+ do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \
+ unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done
+
+ mkdir $(top_builddir)/vlc-${VERSION}/locale
+ for i in $(ALL_LINGUAS); do \
+ mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \
+ cp "$(srcdir)/po/$${i}.gmo" \
+ "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \
+ || true ; \
+ done
+
+
+ mkdir -p "$(top_builddir)/vlc-${VERSION}/http/admin"
+ mkdir -p "$(top_builddir)/vlc-${VERSION}/http/vlm"
+ cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
+ cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ;
+ cp $(srcdir)/share/http/*.png $(top_builddir)/vlc-${VERSION}/http/
+ cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ;
+ cp $(srcdir)/share/http/admin/*.html \
+ $(top_builddir)/vlc-${VERSION}/http/admin/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/*.html ;
+ cp $(srcdir)/share/http/admin/dboxfiles.html \
+ $(top_builddir)/vlc-${VERSION}/http/admin/ ;
+ cp $(srcdir)/share/http/admin/.access \
+ $(top_builddir)/vlc-${VERSION}/http/admin/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/.access ;
+ cp $(srcdir)/share/http/vlm/*.html \
+ $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
+
+ cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
+
+if BUILD_MOZILLA
+ mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
+ cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
+ $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
+ cp $(top_builddir)/mozilla/vlcintf.xpt $(top_builddir)/vlc-${VERSION}/mozilla/ ;
+endif
+
+if BUILD_ACTIVEX
+ mkdir -p "$(top_builddir)/vlc-${VERSION}/activex"
+ cp $(srcdir)/activex/README.TXT $(top_builddir)/vlc-${VERSION}/activex/ ;
+ cp $(srcdir)/activex/test.html $(top_builddir)/vlc-${VERSION}/activex/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ;
+
+ cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
+ $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
+endif
+# Rebase all those DLLs to speed up loading (need cygwin rebase)
+ if [ -x rebase ]; then \
+ find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
+ fi
+
+package-wince-base-zip:
+# Create package
+ zip -r vlc-${VERSION}-wince.zip vlc-${VERSION}
+
+package-wince: package-wince-base package-wince-base-zip
+# Clean up
+ rm -Rf $(top_builddir)/vlc-${VERSION}
+
+
package-beos:
# Check that tmp isn't in the way
@if test -e $(srcdir)/tmp; then \
# Copy relevant files
cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/tmp/VLC.app"
- cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/
+ cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/ && cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/tmp/
# Create disk image
$(srcdir)/extras/MacOSX/macosx-dmg "vlc-${VERSION}" $(top_builddir)/tmp
echo "" ; \
echo "# main sources" ; \
find include src -name '*.[chm]' -o -name '*.[ch]pp' \
- | grep -v '\(vlc_symbols\|misc/modules_\)' \
+ | grep -v '\(vlc_symbols\|misc/modules_\|src/misc/version.c\)' \
| sort ; \
echo "" ; \
echo "# modules" ; \
| sort ; \
} > $(top_srcdir)/po/POTFILES.in
rm -f $(top_srcdir)/po/vlc.pot
- cd po && $(MAKE) POTFILES $(top_srcdir)/../po/vlc.pot update-po
+ cd po && $(MAKE) POTFILES vlc.pot update-po
#cd po && $(MAKE) update-po