SUBDIRS = po intl m4 share
DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib
-EXTRA_DIST = BUGS FAQ HACKING MAINTAINERS STATUS \
+EXTRA_DIST = HACKING MAINTAINERS 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
CPPFLAGS_release = -DHAVE_RELEASE
endif
if DEBUG
-CPPFLAGS_debug = -DDEBUG -DHAVE_RELEASE
+CPPFLAGS_debug = -DDEBUG
CFLAGS_debug = -g
endif
if GPROF
endif
endif
endif
+else
+# !OPTIM
+CFLAGS_optim = @CFLAGS_NOOPTIM@
endif
CPPFLAGS_default += $(CPPFLAGS_release) \
BUILT_SOURCES += \
include/vlc_symbols.h \
src/misc/modules_builtin.h \
- src/misc/modules_plugin.h
+ src/misc/modules_plugin.h \
+ $(NULL)
pkgincludedir = $(includedir)/vlc
include/vlc/sout.h \
include/vlc/decoder.h \
include/vlc/input.h \
- include/vlc/intf.h
+ include/vlc/intf.h \
+ $(NULL)
noinst_HEADERS += $(HEADERS_include) $(HEADERS_include_built)
include/beos_specific.h \
include/configuration.h \
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/os_specific.h \
include/stream_control.h \
include/stream_output.h \
+ include/variables.h \
include/video.h \
include/video_output.h \
include/vlc_common.h \
include/vlc_playlist.h \
include/vlc_threads.h \
include/vlc_threads_funcs.h \
- include/win32_specific.h
+ include/win32_specific.h \
+ $(NULL)
HEADERS_include_built = \
- include/vlc_symbols.h
+ include/vlc_symbols.h \
+ $(NULL)
include/vlc_symbols.h: Makefile $(HEADERS_include)
rm -f $@.in
# These dependencies are mandatory
$(SOURCES): include/vlc_symbols.h
-$(SOURCES_libvlc): src/misc/modules_plugin.h src/misc/modules_builtin.h
+$(SOURCES_libvlc): src/misc/modules_plugin.h src/misc/modules_builtin.h $(LIB_intl)
###############################################################################
-# Optional getopt
+# Optional libintl - FIXME, bad dependencies
###############################################################################
-EXTRA_DIST += \
- extras/GNUgetopt/COPYING \
- extras/GNUgetopt/getopt.c \
- extras/GNUgetopt/getopt.h \
- extras/GNUgetopt/getopt1.c
+intl/libintl.a: FORCE
+ cd intl && $(MAKE)
-if BUILD_GETOPT
-SOURCES_libgetopt = extras/GNUgetopt/getopt.c extras/GNUgetopt/getopt1.c
+if BUILD_INTL
+LIB_intl = intl/libintl.a
endif
###############################################################################
extras/MacOSX/Resources/mpeg2.icns \
extras/MacOSX/Resources/mpeg4.icns \
extras/MacOSX/Resources/vlc.icns \
+ extras/MacOSX/Resources/back.png \
+ extras/MacOSX/Resources/begin.png \
+ extras/MacOSX/Resources/end.png \
+ extras/MacOSX/Resources/forw.png \
+ extras/MacOSX/Resources/list.png \
extras/MacOSX/Resources/pause.png \
extras/MacOSX/Resources/play.png \
+ extras/MacOSX/Resources/prefs.png \
extras/MacOSX/Resources/stop.png \
- extras/MacOSX/Resources/stepf.png \
- extras/MacOSX/Resources/stepr.png \
- extras/MacOSX/vlc.pbproj/project.pbxproj
+ extras/MacOSX/Resources/vlc_hg.png \
+ extras/MacOSX/vlc.pbproj/project.pbxproj \
+ $(NULL)
+
+###############################################################################
+# MS Visual Studio and eMbedded Visual Studio projects
+###############################################################################
+
+EXTRA_DIST += \
+ msvc/vlc.dsw \
+ msvc/libvlc.dsp.in \
+ msvc/plugins.dsp.in \
+ msvc/vlc.dsp.in \
+ 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.in \
+ evc/modules_builtin_evc.h \
+ $(NULL)
+
+show-libvlc-sources: FORCE
+ @echo X: $(SOURCES_libvlc_common) $(SOURCES_libvlc_win32) $(SOURCES_libvlc_dirent) $(SOURCES_libvlc_getopt)
+
+show-libvlc-headers: FORCE
+ @echo X: $(HEADERS_include) $(HEADERS_include_built)
+
+show-libvlc-pkg-headers: FORCE
+ @echo X: $(dist_pkginclude_HEADERS)
###############################################################################
# Building libvlc
lib_libvlc_a_SOURCES = $(SOURCES_libvlc)
lib_libvlc_a_CFLAGS = $(CPPFLAGS_default) -D__VLC__ $(CFLAGS_default) @CFLAGS_vlc@
lib_libvlc_a_CXXFLAGS = $(CPPFLAGS_default) -D__VLC__ $(CXXFLAGS_default)
+lib_libvlc_a_OBJCFLAGS = $(CPPFLAGS_default) -D__VLC__ $(OBJCFLAGS_default)
lib_libvlc_pic_a_SOURCES = $(SOURCES_libvlc)
lib_libvlc_pic_a_CFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(CFLAGS_pic) @CFLAGS_vlc@
lib_libvlc_pic_a_CXXFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(CXXFLAGS_pic)
+lib_libvlc_pic_a_OBJCFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(OBJCFLAGS_pic)
if HAVE_BEOS
-SOURCES_libvlc_beos = src/misc/beos_specific.cpp
+OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos)
endif
if HAVE_DARWIN
-SOURCES_libvlc_darwin = src/misc/darwin_specific.c
+OPT_SOURCES_libvlc_darwin = $(SOURCES_libvlc_darwin)
endif
if HAVE_WIN32
-SOURCES_libvlc_win32 = src/misc/win32_specific.c
+OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32)
+endif
+if BUILD_DIRENT
+OPT_SOURCES_libvlc_dirent = $(SOURCES_libvlc_dirent)
+endif
+if BUILD_GETOPT
+OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt)
endif
if BUILD_MOZILLA
LIBRARIES_libvlc_pic = lib/libvlc_pic.a
endif
EXTRA_DIST += \
+ $(SOURCES_libvlc_beos) \
+ $(SOURCES_libvlc_darwin) \
+ $(SOURCES_libvlc_win32) \
+ $(SOURCES_libvlc_dirent) \
+ $(SOURCES_libvlc_getopt) \
+ $(NULL)
+
+SOURCES_libvlc_beos = \
src/misc/beos_specific.cpp \
- src/misc/darwin_specific.c \
- src/misc/win32_specific.c
+ $(NULL)
-SOURCES_libvlc = \
+SOURCES_libvlc_darwin = \
+ src/misc/darwin_specific.m \
+ $(NULL)
+
+SOURCES_libvlc_win32 = \
+ src/misc/win32_specific.c \
+ $(NULL)
+
+SOURCES_libvlc_dirent = \
+ src/extras/dirent.c \
+ src/extras/dirent.h \
+ $(NULL)
+
+SOURCES_libvlc_getopt = \
+ src/extras/getopt.c \
+ src/extras/getopt.h \
+ src/extras/getopt1.c \
+ $(NULL)
+
+SOURCES_libvlc_common = \
src/libvlc.c \
src/libvlc.h \
src/interface/interface.c \
src/stream_output/stream_output.c \
src/misc/mtime.c \
src/misc/modules.c \
- src/misc/modules_plugin.h \
src/misc/threads.c \
src/misc/cpu.c \
src/misc/configuration.c \
src/misc/netutils.c \
src/misc/iso_lang.c \
- src/misc/iso-639.def \
+ src/misc/iso-639_def.h \
src/misc/messages.c \
src/misc/objects.c \
- src/misc/extras.c \
- $(SOURCES_libvlc_win32) \
- $(SOURCES_libvlc_beos) \
- $(SOURCES_libvlc_darwin)
+ src/misc/variables.c \
+ src/misc/error.c \
+ src/extras/libc.c \
+ $(NULL)
+
+SOURCES_libvlc = \
+ $(SOURCES_libvlc_common) \
+ $(OPT_SOURCES_libvlc_beos) \
+ $(OPT_SOURCES_libvlc_darwin) \
+ $(OPT_SOURCES_libvlc_win32) \
+ $(OPT_SOURCES_libvlc_dirent) \
+ $(OPT_SOURCES_libvlc_getopt) \
+ $(NULL)
###############################################################################
# Building vlc
bin_PROGRAMS += vlc
-vlc_SOURCES = src/vlc.c $(SOURCES_libgetopt)
+vlc_SOURCES = src/vlc.c
# @AUTOMAKE_SUCKS@ gets expanded to $(L_builtin) $(LDFLAGS_builtin)
# but we don't write it directly, otherwise automake will go amok and eat all
# the memory because of its 2^N crap algorithm. So we fool him. Nuahaha.
-vlc_LDADD = lib/libvlc.a $(LDFLAGS_vlc) $(DATA_win32_rc) @AUTOMAKE_SUCKS@
+vlc_LDADD = lib/libvlc.a $(LDFLAGS_vlc) \
+ $(DATA_win32_rc) $(LIB_intl) @AUTOMAKE_SUCKS@
vlc_CFLAGS = $(CPPFLAGS_default) $(CFLAGS_default)
# We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
# old automake-1.5 bug (automake/279).
-DEPENDENCIES_vlc = lib/libvlc.a $(L_builtin)
+DEPENDENCIES_vlc = lib/libvlc.a $(L_builtin) $(DATA_win32_rc) $(LIB_intl)
vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
@rm -f vlc$(EXEEXT)
# Create the MacOS X app
vlc_app_DATA = vlc.app
vlc_appdir = $(bindir)
-vlc.app: vlc
+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/share
- $(INSTALL) -d vlc.app/Contents/MacOS/modules
+ $(INSTALL) -d vlc.app/Contents/MacOS
$(INSTALL) vlc vlc.app/Contents/MacOS/
-# FIXME: install modules ! (and add dependency on modules)
- $(INSTALL) -m 644 share/*.psf vlc.app/Contents/MacOS/share
+ $(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/ ; \
+ fi ; done
+ $(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 $(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 || true ; \
+ done
+ echo -n "APPLVLC#" >| vlc.app/Contents/PkgInfo
endif
if HAVE_WIN32
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) -i $< -o $@
+ $(WINDRES) --include-dir share -i $< -o $@
endif
+###############################################################################
+# Building architecture-specific binary packages
+###############################################################################
+
+# XXX: this rule is probably only useful to you if you have exactly
+# the same setup as me. Contact sam@zoy.org if you need to use it.
+#
+# Check that tmp isn't in the way
+package-win32:
+ @if test -e tmp; then \
+ echo "Error: please remove ./tmp, it is in the way"; false; \
+ else \
+ echo "OK."; mkdir tmp; \
+ fi
+# Create installation script
+ cp install-win32 tmp/nsi
+# Copy relevant files
+ 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 THANKS NEWS ; \
+ 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
+ mkdir tmp/share
+ for file in default8x16.psf default8x9.psf ; \
+ do cp share/$$file tmp/share/ ; done
+# Create package
+ wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} tmp/nsi
+# Clean up
+ rm -Rf tmp
+
+package-beos:
+# Check that tmp isn't in the way
+ @if test -e tmp; then \
+ echo "Error: please remove ./tmp, it is in the way"; false; \
+ 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 THANKS NEWS 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
+ 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 .
+# Clean up
+ rm -Rf tmp
+
+package-macosx:
+# Check that tmp isn't in the way
+ @if test -e tmp; then \
+ echo "Error: please remove ./tmp, it is in the way"; false; \
+ else \
+ echo "OK."; mkdir tmp; \
+ fi
+
+# Copy relevant files
+ 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/*
+
+# Clean up
+ rm -Rf tmp
+
###############################################################################
# Building the Mozilla plugin
###############################################################################
noinst_LIBRARIES += $(noinst_LIBRARIES_mozilla)
-MOSTLYCLEANFILES += mozilla/libvlcplugin$(LIBEXT)
+MOSTLYCLEANFILES += $(LIBRARIES_mozilla)
EXTRA_DIST += $(SOURCES_mozilla) mozilla/vlcintf.idl
mozilla/vlcpeer.cpp \
mozilla/vlcpeer.h \
mozilla/classinfo.h \
- mozilla/npunix.c
+ $(SOURCES_mozilla_win32) \
+ $(SOURCES_mozilla_unix) \
+ $(NULL)
+
+# Under Win32, Mozilla plugins need to be named NP******.DLL, but under Unix
+# the common naming scheme is lib******plugin.so. Also, we need npwin.cpp
+# under Win32 and npunix.c under Unix.
+if HAVE_WIN32
+LIBRARIES_mozilla = mozilla/npvlc$(LIBEXT)
+SOURCES_mozilla_win32 = mozilla/npwin.cpp
+CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32
+else
+LIBRARIES_mozilla = mozilla/libvlcplugin$(LIBEXT)
+SOURCES_mozilla_unix = mozilla/npunix.c
+endif
if BUILD_MOZILLA
-noinst_LIBRARIES_mozilla = mozilla/libvlcplugin.a
+if UNTRUE
+noinst_LIBRARIES_mozilla = mozilla/libplugin.a
+endif
-mozilla_libvlcplugin_a_SOURCES = $(SOURCES_mozilla) $(BUILT_SOURCES_mozilla) \
- $(SOURCES_libgetopt)
-mozilla_libvlcplugin_a_CFLAGS = $(CPPFLAGS_pic) $(CFLAGS_pic) \
- $(CPPFLAGS_mozilla) $(CFLAGS_mozilla)
-mozilla_libvlcplugin_a_CXXFLAGS = $(CPPFLAGS_pic) $(CXXFLAGS_pic) \
- $(CPPFLAGS_mozilla) $(CXXFLAGS_mozilla)
-mozilla_libvlcplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(L_builtin_pic)
+mozilla_libplugin_a_SOURCES = $(SOURCES_mozilla)
+mozilla_libplugin_a_CFLAGS = $(CPPFLAGS_pic) $(CFLAGS_pic) \
+ $(CPPFLAGS_mozilla) $(CFLAGS_mozilla) \
+ $(CPPFLAGS_mozilla_EXTRA)
+mozilla_libplugin_a_CXXFLAGS = $(CPPFLAGS_pic) $(CXXFLAGS_pic) \
+ $(CPPFLAGS_mozilla) $(CXXFLAGS_mozilla) \
+ $(CPPFLAGS_mozilla_EXTRA)
+mozilla_libplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(L_builtin_pic) $(DATA_npvlc_rc)
BUILT_SOURCES_mozilla = mozilla/vlcintf.h
$(SOURCES_mozilla): mozilla/vlcintf.h
-mozilla_libvlcplugin_DATA = mozilla/libvlcplugin$(LIBEXT)
-mozilla_libvlcplugindir = $(libdir)/mozilla/plugins
-mozilla/libvlcplugin$(LIBEXT): mozilla/libvlcplugin.a $(L_builtin_pic)
- $(CC) -o $@ $(mozilla_libvlcplugin_a_OBJECTS) lib/libvlc_pic.a \
- $(L_builtin_pic) -shared $(LDFLAGS) $(LDFLAGS_vlc) \
- $(LDFLAGS_mozilla) $(LDFLAGS_builtin_pic)
+mozilla_plugin_DATA = $(LIBRARIES_mozilla)
+mozilla_plugindir = $(libdir)/mozilla/plugins
+$(LIBRARIES_mozilla): $(mozilla_libplugin_a_OBJECTS) \
+ $(mozilla_libplugin_a_DEPENDENCIES) \
+ $(L_builtin_pic)
+ $(CXXLINK) $(mozilla_libplugin_a_OBJECTS) $(DATA_npvlc_rc) \
+ lib/libvlc_pic.a $(L_builtin_pic) -shared $(LDFLAGS) \
+ $(LDFLAGS_vlc) $(LDFLAGS_mozilla) $(LDFLAGS_builtin_pic)
mozilla_vlcintf_xpt_DATA = mozilla/vlcintf.xpt
mozilla_vlcintf_xptdir = $(libdir)/mozilla/components
mozilla/vlcintf.h: Makefile mozilla/vlcintf.idl
$(XPIDL) -I/usr/share/idl/mozilla -m header \
-o mozilla/vlcintf mozilla/vlcintf.idl
+
+if HAVE_WIN32
+DATA_npvlc_rc = $(noinst_mozilla_npvlc_rc_DATA)
+noinst_mozilla_npvlc_rc_DATA = mozilla/npvlc_rc.$(OBJEXT)
+noinst_mozilla_npvlc_rcdir = $(libdir)
+mozilla/npvlc_rc.$(OBJEXT): mozilla/npvlc_rc.rc
+ $(WINDRES) --include-dir mozilla -i $< -o $@
+endif
endif
###############################################################################
# Modules
###############################################################################
+MOSTLYCLEANFILES += $(PLUGIN_FILES)
+PLUGIN_FILES =
+
libvlcdir = $(libdir)/vlc
include Modules.am
+###############################################################################
+# Force rule
+###############################################################################
+FORCE:
projects / vlc / blobdiff