# Automake targets and declarations
###############################################################################
+NULL =
+
# SUBDIRS stores the directories where a "make" is required when building
# something. DIST_SUBDIRS stores the directories where nothing is built but
# which have makefiles with distribution information.
SUBDIRS = po intl m4 share
-DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib
+DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib autotools
+
+EXTRA_DIST = \
+ HACKING \
+ INSTALL.win32 \
+ MAINTAINERS \
+ Modules.am \
+ README.MacOSX.rtf \
+ bootstrap \
+ configure.ac.in \
+ install-win32 \
+ src/extras/COPYING \
+ toolbox \
+ vlc.spec \
+ $(NULL)
-EXTRA_DIST = FAQ HACKING MAINTAINERS STATUS src/extras/COPYING \
- INSTALL.win32 README.MacOSX.rtf vlc.spec install-win32 \
- Modules.am macosx-dmg \
- configure.ac.in mkinstalldirs bootstrap
MOSTLYCLEANFILES =
BUILT_SOURCES =
SUFFIXES =
-NULL =
# List of programs, libraries and headers that need to be built and/or
# distributed. Initialized to empty because we'll use += later.
# XXX: these flags could be set in configure.ac.in, but we set them here
# because old versions of automake don't support them in configure.ac.
-AUTOMAKE_OPTIONS = foreign dist-bzip2 subdir-objects
+AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects
###############################################################################
# Compilation flags for debug mode, profiling, and others
endif
endif
endif
+else
+# !OPTIM
+CFLAGS_optim = @CFLAGS_NOOPTIM@
endif
CPPFLAGS_default += $(CPPFLAGS_release) \
include/darwin_specific.h \
include/codecs.h \
include/error.h \
+ include/encoder.h \
include/input_ext-dec.h \
include/input_ext-intf.h \
include/input_ext-plugins.h \
include/interface.h \
include/intf_eject.h \
include/iso_lang.h \
+ include/httpd.h \
include/main.h \
include/mmx.h \
include/modules.h \
include/vlc_playlist.h \
include/vlc_threads.h \
include/vlc_threads_funcs.h \
+ include/vout_synchro.h \
include/win32_specific.h \
+ include/osd.h \
$(NULL)
HEADERS_include_built = \
$(NULL)
include/vlc_symbols.h: Makefile $(HEADERS_include)
- rm -f $@.in
- echo '/* DO NOT EDIT THIS FILE! See Makefile.am */' >> $@.in
- echo 'struct module_symbols_t {' >> $@.in
- cat $(HEADERS_include) | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/ \1 (* \2_inner) \3;/' >> $@.in
- echo '};' >> $@.in
- echo '#ifdef __PLUGIN__' >> $@.in
- cat $(HEADERS_include) | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/# define \2 p_symbols->\2_inner/' >> $@.in
- echo '#endif /* __PLUGIN__ */' >> $@.in
- mv -f $@.in $@
+ ./toolbox --update-includes $(BUILTINS)
src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include)
- rm -f $@.tmp && cp $@.in $@.tmp
- sed -e 's#.*\$[I][d]:.*# * Automatically generated from '$@'.in by bootstrap#' < $@.in > $@.tmp
- echo '#define STORE_SYMBOLS( p_symbols ) \' >> $@.tmp
- cat $(HEADERS_include) | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/ (p_symbols)->\2_inner = \2; \\/' >> $@.tmp
- echo '' >> $@.tmp
- mv -f $@.tmp $@
+ ./toolbox --update-includes $(BUILTINS)
src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in
- rm -f $@.tmp && cp $@.in $@.tmp
-if HAVE_BUILTINS
- for i in $(BUILTINS) ; do echo "int vlc_entry__"`echo $$i | sed -e 'y@/@_@' -e 's@\..*@@'`"( module_t* );" >>$@.tmp; done
- echo "" >> $@.tmp
-endif
- echo "#define ALLOCATE_ALL_BUILTINS() \\" >> $@.tmp
- echo " do \\" >> $@.tmp
- echo " { \\" >> $@.tmp
-if HAVE_BUILTINS
- for i in $(BUILTINS) ; do echo " ALLOCATE_BUILTIN("`echo $$i | sed -e 'y@/@_@' -e 's@\..*@@'`"); \\" >> $@.tmp ; done
-endif
- echo " } while( 0 );" >> $@.tmp
- echo "" >> $@.tmp
- mv -f $@.tmp $@
+ ./toolbox --update-includes $(BUILTINS)
# These dependencies are mandatory
$(SOURCES): include/vlc_symbols.h
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib \
extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib \
extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
+ extras/MacOSX/Resources/English.lproj/vlc.scriptTerminology \
extras/MacOSX/Resources/divx.icns \
extras/MacOSX/Resources/generic.icns \
extras/MacOSX/Resources/mpeg.icns \
extras/MacOSX/Resources/pause.png \
extras/MacOSX/Resources/play.png \
extras/MacOSX/Resources/prefs.png \
+ extras/MacOSX/Resources/slow.png \
extras/MacOSX/Resources/stop.png \
extras/MacOSX/Resources/vlc_hg.png \
+ extras/MacOSX/Resources/about_bg.png \
+ extras/MacOSX/Resources/vlc.scriptSuite \
+ extras/MacOSX/Resources/README \
extras/MacOSX/vlc.pbproj/project.pbxproj \
+ extras/MacOSX/macosx-dmg \
$(NULL)
###############################################################################
msvc/libvlc.dsp.in \
msvc/plugins.dsp.in \
msvc/vlc.dsp.in \
- msvc/config.h \
+ msvc/config.h.in \
msvc/modules_builtin_msvc.h \
evc/vlc.vcw \
evc/libvlc.vcp.in \
evc/vlc.vcp.in \
evc/plugins.vcp.in \
evc/vlc.c \
- evc/config.h \
+ evc/config.h.in \
evc/modules_builtin_evc.h \
$(NULL)
src/video_output/video_text.c \
src/video_output/video_text.h \
src/video_output/vout_subpictures.c \
+ src/video_output/vout_synchro.c \
src/audio_output/common.c \
src/audio_output/dec.c \
src/audio_output/filters.c \
vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
@rm -f vlc$(EXEEXT)
$(LINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS)
+
if HAVE_BEOS
xres -o $@ ./share/vlc_beos.rsrc
mimeset -f $@
+ rm -Rf locale ; mkdir locale
+ for i in $(ALL_LINGUAS); do \
+ mkdir -p locale/$${i}/LC_MESSAGES ; \
+ cp po/$${i}.gmo locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ done
endif
# Install the symlinks
if HAVE_DARWIN
# Create the MacOS X app
-vlc_app_DATA = vlc.app
+vlc_app_DATA = VLC.app
vlc_appdir = $(bindir)
-vlc.app: vlc $(PLUGIN_FILES)
- rm -Rf vlc.app
- cd extras/MacOSX ; pbxbuild | grep -v '^[ \t]' | grep -v "^$$"
- cp -r extras/MacOSX/build/vlc.bundle ./vlc.app
- $(INSTALL) -d vlc.app/Contents/MacOS
- $(INSTALL) vlc vlc.app/Contents/MacOS/
- $(INSTALL) -d vlc.app/Contents/MacOS/modules
+VLC.app: vlc $(PLUGIN_FILES)
+ rm -Rf VLC.app
+ cd extras/MacOSX ; pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'
+ cp -r extras/MacOSX/build/vlc.bundle ./VLC.app
+ $(INSTALL) -d VLC.app/Contents/MacOS
+ $(INSTALL) vlc VLC.app/Contents/MacOS/VLC
+ $(INSTALL) -d VLC.app/Contents/MacOS/modules
for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \
- $(INSTALL) $$i vlc.app/Contents/MacOS/modules/ ; \
+ $(INSTALL) $$i VLC.app/Contents/MacOS/modules/ ; \
fi ; done
- $(INSTALL) -d vlc.app/Contents/MacOS/share
- $(INSTALL) -m 644 share/*.psf vlc.app/Contents/MacOS/share
- $(INSTALL) -d vlc.app/Contents/MacOS/locale
- for i in $(CATALOGS); do \
- mkdir -p vlc.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES ; \
- cp po/$$i vlc.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES/vlc.mo ; \
+ $(INSTALL) -d VLC.app/Contents/MacOS/share
+ $(INSTALL) -m 644 share/*.psf share/*.rle VLC.app/Contents/MacOS/share
+ $(INSTALL) -d VLC.app/Contents/MacOS/locale
+ for i in $(ALL_LINGUAS); do \
+ mkdir -p VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
+ cp po/$${i}.gmo VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ mkdir -p VLC.app/Contents/Resources/$${i}.lproj ; \
+ ln -sf ../English.lproj/InfoPlist.strings VLC.app/Contents/Resources/$${i}.lproj ; \
+ ln -sf ../English.lproj/MainMenu.nib VLC.app/Contents/Resources/$${i}.lproj ; \
+ ln -sf ../English.lproj/vlc.scriptTerminology VLC.app/Contents/Resources/$${i}.lproj ; \
done
- echo -n "APPLVLC#" >| vlc.app/Contents/PkgInfo
+ echo -n "APPLVLC#" >| VLC.app/Contents/PkgInfo
endif
if HAVE_WIN32
cp vlc.exe tmp/
$(STRIP) tmp/vlc.exe
cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt
- for file in AUTHORS COPYING ChangeLog README FAQ ; \
+ for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
do cp $$file tmp/$${file}.txt ; \
unix2dos tmp/$${file}.txt ; done
+
mkdir tmp/plugins
for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \
$(INSTALL) $$i tmp/plugins/ ; \
fi ; done
-# don't include these two
-#rm -f tmp/plugins/gtk.so tmp/plugins/sdl.so
- for i in dummy tmp/plugins/*$(LIBEXT) ; do if test $$i != tmp/plugins/intfwin.so -a $$i != dummy ; then $(STRIP) $$i ; fi ; done
+
+ for i in dummy tmp/plugins/*$(LIBEXT) ; \
+ do if test $$i != tmp/plugins/libwin32_plugin$(LIBEXT) \
+ -a $$i != dummy ; then $(STRIP) $$i ; fi ; done
+
mkdir tmp/share
- for file in default8x16.psf default8x9.psf ; \
- do cp share/$$file tmp/share/ ; done
+ cp share/*.rle tmp/share/ ;
+
+ mkdir tmp/locale
+ for i in $(ALL_LINGUAS); do \
+ mkdir -p tmp/locale/$${i}/LC_MESSAGES ; \
+ cp po/$${i}.gmo tmp/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ done
+
+ mkdir -p tmp/skins/default
+ for i in share/skins/default/*.*; do \
+ cp $$i tmp/skins/default/ || true ; \
+ done
+ for i in doc/skins/*.txt; do \
+ cp $$i tmp/skins/ || true ; \
+ done
+
+ cd doc/faq ; $(MAKE) html ; cd ../.. ;
+ cp doc/faq/index.html tmp/FAQ.htm ;
+
# Create package
wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} tmp/nsi
# Clean up
else \
echo "OK."; mkdir tmp; \
fi
-
-# Create dir
- mkdir -p tmp/vlc/share
+
# Copy relevant files
- cp vlc tmp/vlc/
- $(STRIP) tmp/vlc/vlc
- xres -o tmp/vlc/vlc ./share/vlc_beos.rsrc
- cp AUTHORS COPYING ChangeLog README FAQ tmp/vlc/
- for file in default8x16.psf default8x9.psf ; \
- do cp share/$$file tmp/vlc/share/ ; done
- mkdir tmp/vlc/plugins
- for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \
- $(INSTALL) $$i tmp/vlc/plugins/ ; \
- fi ; done
- for i in dummy tmp/vlc/plugins/*$(LIBEXT) ; do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done
-# Create package
+ mkdir -p tmp/vlc
+ cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/
+# We cannot use ${PLUGIN_FILES}, it looks like it is too long for the BeOS shell...
+ if [ `find modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \
+ mkdir -p tmp/vlc/plugins; \
+ find modules -name "lib*_plugin.so" | xargs -i{} cp {} tmp/vlc/plugins/; \
+ fi
+ for i in $(ALL_LINGUAS); do \
+ mkdir -p tmp/vlc/locale/$${i}/LC_MESSAGES ; \
+ cp po/$${i}.gmo tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ done
+ mkdir -p tmp/vlc/share
+ cp share/*.rle tmp/vlc/share/
+
+# Create package with debug symbols
+ mimeset -f tmp/vlc/* tmp/vlc/*/*
mv tmp/vlc tmp/vlc-${VERSION}
- (cd tmp ; find vlc-${VERSION} | \
- zip -9 -@ vlc-${VERSION}-BeOS-x86.zip )
- mv tmp/vlc-${VERSION}-BeOS-x86.zip .
+ (cd tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
+ mv tmp/vlc-${VERSION}-BeOS.zip .
+
+# Create package without debug symbols
+ strip tmp/vlc-${VERSION}/vlc tmp/vlc-${VERSION}/plugins/lib*_plugin.so
+ xres -o tmp/vlc-${VERSION}/vlc share/vlc_beos.rsrc
+ mimeset -f tmp/vlc-${VERSION}/* tmp/vlc-${VERSION}/*/*
+ (cd tmp ; zip -9 -r vlc-${VERSION}-BeOS-stripped.zip vlc-${VERSION} )
+ mv tmp/vlc-${VERSION}-BeOS-stripped.zip .
+
# Clean up
rm -Rf tmp
fi
# Copy relevant files
- cp -R vlc.app tmp/
- cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf FAQ tmp/
+ cp -R VLC.app tmp/
+ cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/
# Create disk image
- ./macosx-dmg 18 "vlc-${VERSION}" tmp/*
+ ./extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" tmp/*
# Clean up
rm -Rf tmp
mozilla/vlcplugin.h \
mozilla/vlcpeer.cpp \
mozilla/vlcpeer.h \
- mozilla/classinfo.h \
+ mozilla/support/classinfo.h \
$(SOURCES_mozilla_win32) \
+ $(SOURCES_mozilla_macosx) \
$(SOURCES_mozilla_unix) \
$(NULL)
# under Win32 and npunix.c under Unix.
if HAVE_WIN32
LIBRARIES_mozilla = mozilla/npvlc$(LIBEXT)
-SOURCES_mozilla_win32 = mozilla/npwin.cpp
+SOURCES_mozilla_win32 = mozilla/support/npwin.cpp
CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32
else
+if HAVE_DARWIN
+# We don't define LIBRARIES_mozilla because we'll be using project builder
+SOURCES_mozilla_macosx = mozilla/support/npmac.cpp
+else
LIBRARIES_mozilla = mozilla/libvlcplugin$(LIBEXT)
-SOURCES_mozilla_unix = mozilla/npunix.c
+SOURCES_mozilla_unix = mozilla/support/npunix.c
+endif
endif
if BUILD_MOZILLA
projects / vlc / blobdiff