SUBDIRS = po intl m4 share
DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib
-EXTRA_DIST = BUGS FAQ HACKING MAINTAINERS STATUS \
+EXTRA_DIST = BUGS 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
CPPFLAGS_release = -DHAVE_RELEASE
endif
if DEBUG
-CPPFLAGS_debug = -DDEBUG -DHAVE_RELEASE
+CPPFLAGS_debug = -DDEBUG
CFLAGS_debug = -g
endif
if GPROF
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/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/stop.png \
extras/MacOSX/Resources/stepf.png \
extras/MacOSX/Resources/stepr.png \
- extras/MacOSX/vlc.pbproj/project.pbxproj
+ extras/MacOSX/vlc.pbproj/project.pbxproj \
+ $(NULL)
+
+###############################################################################
+# MS Visual Studio and eMbedded Visual Studio projects
+###############################################################################
+
+EXTRA_DIST += \
+ msvc/vlc.dsp \
+ msvc/vlc.dsw \
+ msvc/vlc.dsp.in \
+ msvc/vlc.dsp.out \
+ msvc/config.h \
+ msvc/modules_builtin_msvc.h \
+ evc/vlc.vcp \
+ evc/vlc.vcw \
+ evc/vlc.vcp.in \
+ evc/vlc.vcp.out \
+ evc/config.h \
+ evc/modules_builtin_msvc.h \
+ $(NULL)
+
+show-vlc-sources: FORCE
+ @echo X: $(vlc_SOURCES)
+
+show-libvlc-sources: FORCE
+ @echo X: $(SOURCES_libvlc_common) $(SOURCES_libvlc_win32) $(SOURCES_libvlc_dirent) $(SOURCES_libvlc_getopt) $(SOURCES_libvlc_libc)
+
+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_pic_a_CXXFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(CXXFLAGS_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_LIBC
+OPT_SOURCES_libvlc_libc = $(SOURCES_libvlc_libc)
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) \
+ $(SOURCES_libvlc_libc) \
+ $(NULL)
+
+SOURCES_libvlc_beos = \
src/misc/beos_specific.cpp \
+ $(NULL)
+
+SOURCES_libvlc_darwin = \
src/misc/darwin_specific.c \
- src/misc/win32_specific.c
+ $(NULL)
-SOURCES_libvlc = \
+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_libc = \
+ src/extras/libc.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 \
+ $(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) \
+ $(OPT_SOURCES_libvlc_libc) \
+ $(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_DEPENDENCIES = lib/libvlc.a $(L_builtin)
+vlc_LDADD = lib/libvlc.a $(LDFLAGS_vlc) \
+ $(DATA_win32_rc) $(LIB_intl) @AUTOMAKE_SUCKS@
vlc_CFLAGS = $(CPPFLAGS_default) $(CFLAGS_default)
-vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
+# 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) $(DATA_win32_rc) $(LIB_intl)
+
+vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
@rm -f vlc$(EXEEXT)
$(LINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS)
if HAVE_BEOS
# 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) -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 vlc.app/Contents/MacOS/share
endif
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
###############################################################################
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) $(BUILT_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