videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity
vlc/Makefile.am

680 lines
22 KiB
Makefile
Raw Normal View History

* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
###############################################################################
# Automake targets and declarations
###############################################################################
* ALL: started the slow move to automake. For the moment, the changes are unnoticeable apart from the extra dependency on autoconf, automake and gettextize. See the new HACKING file for some information, especially if you don't run Linux. The current strategy is to have the configure script generate a nice automake Makefile from Makefile.am, and then clobber it with our good old dirty Makefile. Muahaha :-)
2002-08-26 01:18:05 +02:00
* ./Makefile.am: we don't distribute ./mkinstalldirs, it's in ./autotools/. * ./Makefile.am: we distribute ./toolbox.
2003-03-26 00:32:00 +01:00
NULL =
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
# 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.
* debian/changelog: + Updated to the latest Debian unstable upload. * debian/rules: + Moved the skins interface into the wxvlc package. + Cosmetic fixes. * debian/control: + Updated the description of the wxvlc package. * bootstrap: + Put subdirectories of modules/ in SUBDIRS, not DIST_SUBDIRS. * Makefile.am: + Put modules in SUBDIRS, not DIST_SUBDIRS. * .cvsignore: + Ignore vlc-config.in.
2003-06-28 01:31:24 +02:00
SUBDIRS = intl modules . share po m4
DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools
* ALL: started the slow move to automake. For the moment, the changes are unnoticeable apart from the extra dependency on autoconf, automake and gettextize. See the new HACKING file for some information, especially if you don't run Linux. The current strategy is to have the configure script generate a nice automake Makefile from Makefile.am, and then clobber it with our good old dirty Makefile. Muahaha :-)
2002-08-26 01:18:05 +02:00
* ./Makefile.am: we don't distribute ./mkinstalldirs, it's in ./autotools/. * ./Makefile.am: we distribute ./toolbox.
2003-03-26 00:32:00 +01:00
EXTRA_DIST = \
HACKING \
INSTALL.win32 \
MAINTAINERS \
README.MacOSX.rtf \
bootstrap \
install-win32 \
src/extras/COPYING \
toolbox \
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 15:50:13 +02:00
vlc-config.in.in \
* added vlc.ebuild, vlc.spec.redhat to dist. * added all the new icons to the dist. * on make dist i would like to do mv vlc.ebuild vlc-${VERSION}.ebuild I don't know how to do this. Who does?
2003-05-15 02:46:23 +02:00
vlc.ebuild \
* ./Makefile.am: we don't distribute ./mkinstalldirs, it's in ./autotools/. * ./Makefile.am: we distribute ./toolbox.
2003-03-26 00:32:00 +01:00
vlc.spec \
* added vlc.ebuild, vlc.spec.redhat to dist. * added all the new icons to the dist. * on make dist i would like to do mv vlc.ebuild vlc-${VERSION}.ebuild I don't know how to do this. Who does?
2003-05-15 02:46:23 +02:00
vlc.spec.redhat \
* ./Makefile.am: we don't distribute ./mkinstalldirs, it's in ./autotools/. * ./Makefile.am: we distribute ./toolbox.
2003-03-26 00:32:00 +01:00
$(NULL)
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
BUILT_SOURCES =
SUFFIXES =
# Tell aclocal to use -I m4. Wonder if it really works.
ACLOCAL_AMFLAGS = -I m4
* configure.ac.in is no more, we can now use configure.ac like normal people, bootstrap generates the proper magic for us.
2003-06-21 19:04:20 +02:00
# XXX: these flags could be set in configure.ac, but we set them here
* ./bootstrap, ./Makefile.am: workarounds for automake 1.5.
2002-10-02 14:59:59 +02:00
# because old versions of automake don't support them in configure.ac.
* ./debian/vlc.docs, ./Makefile.am: added THANKS to the distributed files.
2003-01-31 23:35:44 +01:00
AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects
* ./bootstrap, ./Makefile.am: workarounds for automake 1.5.
2002-10-02 14:59:59 +02:00
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
###############################################################################
# Headers
###############################################################################
BUILT_SOURCES += \
include/vlc_symbols.h \
src/misc/modules_builtin.h \
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
src/misc/modules_plugin.h \
$(NULL)
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
pkgincludedir = $(includedir)/vlc
dist_pkginclude_HEADERS = \
include/vlc/vlc.h \
include/vlc/aout.h \
include/vlc/vout.h \
include/vlc/sout.h \
include/vlc/decoder.h \
include/vlc/input.h \
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
include/vlc/intf.h \
$(NULL)
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 15:50:13 +02:00
noinst_HEADERS = $(HEADERS_include) $(HEADERS_include_built)
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
HEADERS_include = \
include/aout_internal.h \
include/audio_output.h \
include/beos_specific.h \
include/configuration.h \
include/darwin_specific.h \
* ./Makefile.am: we properly install plugins in the OS X vlc.app directory. * ./mozilla/npvlc_rc.rc, ./mozilla/vlcplugin.h: added the Ogg mime type to the Mozilla plugin properties. * ./debian/control: added libogg-dev and libvorbis-dev dependicies to the Debian build script.
2002-11-04 16:04:45 +01:00
include/codecs.h \
* all: modified files for video transcoding. Still needed configure.ac.in
2003-01-22 11:44:50 +01:00
include/encoder.h \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
include/input_ext-dec.h \
include/input_ext-intf.h \
include/input_ext-plugins.h \
include/intf_eject.h \
include/iso_lang.h \
* all : declaration of http and httpd.
2003-02-23 20:07:02 +01:00
include/httpd.h \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
include/main.h \
include/mmx.h \
include/modules.h \
include/modules_inner.h \
include/mtime.h \
include/network.h \
include/os_specific.h \
include/stream_control.h \
include/stream_output.h \
All: Support for SAP advertising in stream output add sap, or sap="Name" in the stream output options
2003-05-20 18:20:33 +02:00
include/announce.h \
Changes to the libvlc API: * ./include/vlc/vlc.h: changed the naming conventions for libvlc. Now exported functions start with VLC_ instead of vlc_ to avoid conflicts. * ./include/vlc/vlc.h: removed the vlc_object_t, vlc_list_t, vlc_error_t and vlc_t types; they are now internal types only. * ./include/vlc/vlc.h: merged the reentrant and non-reentrant libvlc calls. In non-reentrant mode, we just use 0 as the first argument. In reentrant mode, we use an object's ID. (see below) Internal changes: * ./src/libvlc.c, ./src/misc/objects.c: instead of manipulating vlc_object_t pointers, we manipulate their i_object_id. When needed, an object is retrieved using vlc_object_get (I hope the lookup isn't too expensive, that's why I designed the pp_objects layout to allow log2(n) seeks). * ./src/misc/objects.c: activated the per-object variable storage. Unused yet, unless you want to try "getfoo" and "setfoo blablah" in vlc -I rc. * ./include/vlc_objects.h: moved the vlc_object_t and vlc_list_t definitions here. Misc: * ./src/vlc.c, ./mozilla/vlcshell.cpp: removed inclusion of config.h in code portions not part of libvlc; it was just required for the COPYRIGHT_MESSAGE string which is now available from VLC_Version().
2002-10-12 00:32:56 +02:00
include/variables.h \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
include/video_output.h \
include/vlc_common.h \
include/vlc_config.h \
include/vlc_cpu.h \
* Makefile.am: Gaaaaah, forgot to rename headers again!
2003-07-01 15:13:48 +02:00
include/vlc_error.h \
* Makefile.am: changed interface.h to vlc_interface.h.
2003-06-24 17:50:47 +02:00
include/vlc_interface.h \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
include/vlc_messages.h \
include/vlc_objects.h \
include/vlc_playlist.h \
include/vlc_threads.h \
include/vlc_threads_funcs.h \
* include/video.h: renamed this file to vlc_video.h to avoid name collisions with a couple of modules.
2003-06-26 14:19:59 +02:00
include/vlc_video.h \
* Implementation of a frame-dropping algorithm for the libmpeg2 plug-in (incomplete).
2003-04-15 00:22:32 +02:00
include/vout_synchro.h \
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
include/win32_specific.h \
modules/video_filter/osd_text.c: A video filter that uses freetpye2 to render text on the video include/osd.h: some constants useful when interfacing with the osd module configure.ac.in: check for freetype2, enabled the osdtext module by default Makefile.am: added osd.h, please check that this is correct lirc.c: modified to provide feedback when buttons are pressed. Look at the Feedback() function in lirc.c to see how this module can be used
2003-03-23 17:38:40 +01:00
include/osd.h \
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
$(NULL)
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
HEADERS_include_built = \
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
include/vlc_symbols.h \
$(NULL)
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
include/vlc_symbols.h: Makefile $(HEADERS_include)
* Makefile.am: + Call $(srcdir)/toolbox from $(builddir) instead of $(srcdir). + Call $(builddir)/vlc-config instead of $(srcdir)/vlc-config, because generated files end in $(builddir). + Added -Imozilla to the mozilla plugin link flags. + Look for mozilla/vlcintf.idl in $(srcdir). * configure.ac: + Set VLC_CONFIG to $(builddir)/vlc-config instead of $(srcdir)/vlc-config. * toolbox: + Look for Makefile.am in ${srcdir}, and Makefile in ${builddir}. + Prepend ${srcdir} to header files we handle. * m4/vlc.m4: + Look for vlc-config.in.in in ${srcdir} but generate vlc-config.in in ${builddir}. * modules/gui/skins/src/dialogs.cpp, modules/gui/wxwindows/interface.cpp: + Include the pixmap with a path relative to the current directory. This commit should fix builds that use --srcdir (Closes: #319).
2003-06-28 15:04:52 +02:00
$(srcdir)/toolbox --update-includes
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include)
* Makefile.am: + Call $(srcdir)/toolbox from $(builddir) instead of $(srcdir). + Call $(builddir)/vlc-config instead of $(srcdir)/vlc-config, because generated files end in $(builddir). + Added -Imozilla to the mozilla plugin link flags. + Look for mozilla/vlcintf.idl in $(srcdir). * configure.ac: + Set VLC_CONFIG to $(builddir)/vlc-config instead of $(srcdir)/vlc-config. * toolbox: + Look for Makefile.am in ${srcdir}, and Makefile in ${builddir}. + Prepend ${srcdir} to header files we handle. * m4/vlc.m4: + Look for vlc-config.in.in in ${srcdir} but generate vlc-config.in in ${builddir}. * modules/gui/skins/src/dialogs.cpp, modules/gui/wxwindows/interface.cpp: + Include the pixmap with a path relative to the current directory. This commit should fix builds that use --srcdir (Closes: #319).
2003-06-28 15:04:52 +02:00
$(srcdir)/toolbox --update-includes
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in
* Makefile.am: + Call $(srcdir)/toolbox from $(builddir) instead of $(srcdir). + Call $(builddir)/vlc-config instead of $(srcdir)/vlc-config, because generated files end in $(builddir). + Added -Imozilla to the mozilla plugin link flags. + Look for mozilla/vlcintf.idl in $(srcdir). * configure.ac: + Set VLC_CONFIG to $(builddir)/vlc-config instead of $(srcdir)/vlc-config. * toolbox: + Look for Makefile.am in ${srcdir}, and Makefile in ${builddir}. + Prepend ${srcdir} to header files we handle. * m4/vlc.m4: + Look for vlc-config.in.in in ${srcdir} but generate vlc-config.in in ${builddir}. * modules/gui/skins/src/dialogs.cpp, modules/gui/wxwindows/interface.cpp: + Include the pixmap with a path relative to the current directory. This commit should fix builds that use --srcdir (Closes: #319).
2003-06-28 15:04:52 +02:00
$(srcdir)/toolbox --update-includes
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
* ./bootstrap, ./Makefile.am: workarounds for automake 1.5.
2002-10-02 14:59:59 +02:00
# These dependencies are mandatory
$(SOURCES): include/vlc_symbols.h
* ./configure.ac.in, ./src/libvlc.c: attempt at activating gettext support under platforms without libintl such as Win32. Use --with-included-gettext to test. Might break compilation on systems I don't have access to.
2002-10-16 17:10:39 +02:00
$(SOURCES_libvlc): src/misc/modules_plugin.h src/misc/modules_builtin.h $(LIB_intl)
* ./bootstrap, ./Makefile.am: workarounds for automake 1.5.
2002-10-02 14:59:59 +02:00
* ./configure.ac.in, ./src/libvlc.c: attempt at activating gettext support under platforms without libintl such as Win32. Use --with-included-gettext to test. Might break compilation on systems I don't have access to.
2002-10-16 17:10:39 +02:00
###############################################################################
# Optional libintl - FIXME, bad dependencies
###############################################################################
intl/libintl.a: FORCE
* Makefile.am: + Forward AM_MAKEFLAGS through recursive makefiles. + Removed the plugins and builtins rules. This causes libintl to be built before the plugins. * bootstrap: + Enabled recursive builds of plugins and builtins. * vlc-config.in.in: + Fixed a typo. * debian/changelog: + Next upload will fix bug #199427.
2003-07-01 14:50:56 +02:00
cd $(top_builddir)/intl && $(MAKE) $(AM_MAKEFLAGS)
* ./configure.ac.in, ./src/libvlc.c: attempt at activating gettext support under platforms without libintl such as Win32. Use --with-included-gettext to test. Might break compilation on systems I don't have access to.
2002-10-16 17:10:39 +02:00
if BUILD_INTL
LIB_intl = intl/libintl.a
endif
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
###############################################################################
# MacOS X project
###############################################################################
EXTRA_DIST += \
extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib \
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 \
* Updated French and German translations courtesy of their maintainers * THANKS: added Jean-Pierre Kuypers, French translator * NEWS: updated for 0.5.3 release. Please check.
2003-04-06 17:43:02 +02:00
extras/MacOSX/Resources/English.lproj/vlc.scriptTerminology \
* added vlc.ebuild, vlc.spec.redhat to dist. * added all the new icons to the dist. * on make dist i would like to do mv vlc.ebuild vlc-${VERSION}.ebuild I don't know how to do this. Who does?
2003-05-15 02:46:23 +02:00
extras/MacOSX/Resources/a52.icns \
extras/MacOSX/Resources/aac.icns \
extras/MacOSX/Resources/asf.icns \
extras/MacOSX/Resources/asx.icns \
extras/MacOSX/Resources/avi.icns \
extras/MacOSX/Resources/bin.icns \
extras/MacOSX/Resources/cue.icns \
extras/MacOSX/Resources/dat.icns \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
extras/MacOSX/Resources/divx.icns \
* added vlc.ebuild, vlc.spec.redhat to dist. * added all the new icons to the dist. * on make dist i would like to do mv vlc.ebuild vlc-${VERSION}.ebuild I don't know how to do this. Who does?
2003-05-15 02:46:23 +02:00
extras/MacOSX/Resources/dv.icns \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
extras/MacOSX/Resources/generic.icns \
* added vlc.ebuild, vlc.spec.redhat to dist. * added all the new icons to the dist. * on make dist i would like to do mv vlc.ebuild vlc-${VERSION}.ebuild I don't know how to do this. Who does?
2003-05-15 02:46:23 +02:00
extras/MacOSX/Resources/m3u.icns \
extras/MacOSX/Resources/mov.icns \
extras/MacOSX/Resources/mp3.icns \
extras/MacOSX/Resources/mp4.icns \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
extras/MacOSX/Resources/mpeg.icns \
extras/MacOSX/Resources/mpeg1.icns \
extras/MacOSX/Resources/mpeg2.icns \
extras/MacOSX/Resources/mpeg4.icns \
* added vlc.ebuild, vlc.spec.redhat to dist. * added all the new icons to the dist. * on make dist i would like to do mv vlc.ebuild vlc-${VERSION}.ebuild I don't know how to do this. Who does?
2003-05-15 02:46:23 +02:00
extras/MacOSX/Resources/mpg.icns \
extras/MacOSX/Resources/ogg.icns \
extras/MacOSX/Resources/ogm.icns \
extras/MacOSX/Resources/pls.icns \
extras/MacOSX/Resources/srt.icns \
extras/MacOSX/Resources/sub.icns \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
extras/MacOSX/Resources/vlc.icns \
* added vlc.ebuild, vlc.spec.redhat to dist. * added all the new icons to the dist. * on make dist i would like to do mv vlc.ebuild vlc-${VERSION}.ebuild I don't know how to do this. Who does?
2003-05-15 02:46:23 +02:00
extras/MacOSX/Resources/vob.icns \
extras/MacOSX/Resources/wma.icns \
extras/MacOSX/Resources/wmv.icns \
* New VLC brush-metal interface, courtesy of David Weber <david_weber@gmx.de> * Updated Japanese translation, courtesy of Fumio Nakayama <endymion@ca2.so-net.ne.jp>
2003-01-08 01:41:25 +01:00
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 \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
extras/MacOSX/Resources/pause.png \
extras/MacOSX/Resources/play.png \
* New VLC brush-metal interface, courtesy of David Weber <david_weber@gmx.de> * Updated Japanese translation, courtesy of Fumio Nakayama <endymion@ca2.so-net.ne.jp>
2003-01-08 01:41:25 +01:00
extras/MacOSX/Resources/prefs.png \
* moved macosx-dmg to extras/MacOSX/macosx-dmg * added some macosx files to DIST that were probably missing in the tar ;)
2003-03-24 20:58:42 +01:00
extras/MacOSX/Resources/slow.png \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
extras/MacOSX/Resources/stop.png \
* New VLC brush-metal interface, courtesy of David Weber <david_weber@gmx.de> * Updated Japanese translation, courtesy of Fumio Nakayama <endymion@ca2.so-net.ne.jp>
2003-01-08 01:41:25 +01:00
extras/MacOSX/Resources/vlc_hg.png \
* All : added an about VLC panel. It scrolls the names and the work of the AUTHORS file. * AUTHORS: updated my own info
2003-04-09 22:53:28 +02:00
extras/MacOSX/Resources/about_bg.png \
* moved macosx-dmg to extras/MacOSX/macosx-dmg * added some macosx files to DIST that were probably missing in the tar ;)
2003-03-24 20:58:42 +01:00
extras/MacOSX/Resources/vlc.scriptSuite \
* Updated French and German translations courtesy of their maintainers * THANKS: added Jean-Pierre Kuypers, French translator * NEWS: updated for 0.5.3 release. Please check.
2003-04-06 17:43:02 +02:00
extras/MacOSX/Resources/README \
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
extras/MacOSX/vlc.pbproj/project.pbxproj \
* moved macosx-dmg to extras/MacOSX/macosx-dmg * added some macosx files to DIST that were probably missing in the tar ;)
2003-03-24 20:58:42 +01:00
extras/MacOSX/macosx-dmg \
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
$(NULL)
###############################################################################
* ./msvc/*, ./evc/*: moved eMbedded Visual Studio files to the toplevel evc/ directory because the two project files are starting to diverge. * ./evc/vlc.c: created a specific vlc.c file for Windows CE. * ./src/misc/messages.c: as WinCE doesn't have stdout or stderr, the message queue outputs to a logfile (until we have a proper interface).
2002-11-13 16:28:24 +01:00
# MS Visual Studio and eMbedded Visual Studio projects
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
###############################################################################
EXTRA_DIST += \
msvc/vlc.dsw \
* ./bootstrap: bootstrap now requires the --config flag. With no arguments it simply outputs a usage message. * ./src/*: fixed a bunch of (legitimate) warnings under VC++. * ./evc/*, ./msvc/*: split the workspaces into three projects (libvlc, vlc and plugins -- plugins doesn't build anything yet).
2002-11-13 21:51:05 +01:00
msvc/libvlc.dsp.in \
msvc/plugins.dsp.in \
* ./Makefile.am: added missing files for make dist. * ./configure.ac.in: removed unpopular warnings. * ./po/*: updated potfiles.
2002-12-13 11:09:14 +01:00
msvc/vlc.dsp.in \
* ./Makefile.am: fixed distribution of MSVC files.
2003-01-17 00:37:59 +01:00
msvc/config.h.in \
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
msvc/modules_builtin_msvc.h \
* ./msvc/*, ./evc/*: moved eMbedded Visual Studio files to the toplevel evc/ directory because the two project files are starting to diverge. * ./evc/vlc.c: created a specific vlc.c file for Windows CE. * ./src/misc/messages.c: as WinCE doesn't have stdout or stderr, the message queue outputs to a logfile (until we have a proper interface).
2002-11-13 16:28:24 +01:00
evc/vlc.vcw \
* ./bootstrap: bootstrap now requires the --config flag. With no arguments it simply outputs a usage message. * ./src/*: fixed a bunch of (legitimate) warnings under VC++. * ./evc/*, ./msvc/*: split the workspaces into three projects (libvlc, vlc and plugins -- plugins doesn't build anything yet).
2002-11-13 21:51:05 +01:00
evc/libvlc.vcp.in \
* ./msvc/*, ./evc/*: moved eMbedded Visual Studio files to the toplevel evc/ directory because the two project files are starting to diverge. * ./evc/vlc.c: created a specific vlc.c file for Windows CE. * ./src/misc/messages.c: as WinCE doesn't have stdout or stderr, the message queue outputs to a logfile (until we have a proper interface).
2002-11-13 16:28:24 +01:00
evc/vlc.vcp.in \
* ./bootstrap: bootstrap now requires the --config flag. With no arguments it simply outputs a usage message. * ./src/*: fixed a bunch of (legitimate) warnings under VC++. * ./evc/*, ./msvc/*: split the workspaces into three projects (libvlc, vlc and plugins -- plugins doesn't build anything yet).
2002-11-13 21:51:05 +01:00
evc/plugins.vcp.in \
* ./Makefile.am: added missing files for make dist. * ./configure.ac.in: removed unpopular warnings. * ./po/*: updated potfiles.
2002-12-13 11:09:14 +01:00
evc/vlc.c \
* ./Makefile.am: fixed distribution of MSVC files.
2003-01-17 00:37:59 +01:00
evc/config.h.in \
* ./bootstrap: bootstrap now requires the --config flag. With no arguments it simply outputs a usage message. * ./src/*: fixed a bunch of (legitimate) warnings under VC++. * ./evc/*, ./msvc/*: split the workspaces into three projects (libvlc, vlc and plugins -- plugins doesn't build anything yet).
2002-11-13 21:51:05 +01:00
evc/modules_builtin_evc.h \
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
$(NULL)
* Makefile.am: added a dist-hook target to include the auto-generated msvc files into the dist. added src/misc/modules_plugins.h to the dist.
2003-04-24 18:13:38 +02:00
dist-hook:
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
mv $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild
cd $(distdir) && $(srcdir)/toolbox --update-vc
* Makefile.am: added a dist-hook target to include the auto-generated msvc files into the dist. added src/misc/modules_plugins.h to the dist.
2003-04-24 18:13:38 +02:00
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
###############################################################################
# Building libvlc
###############################################################################
bin_SCRIPTS = vlc-config
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 15:50:13 +02:00
lib_LIBRARIES = lib/libvlc.a $(LIBRARIES_libvlc_pic)
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
lib_libvlc_a_SOURCES = $(SOURCES_libvlc)
* Makefile.am: added a dist-hook target to include the auto-generated msvc files into the dist. added src/misc/modules_plugins.h to the dist.
2003-04-24 18:13:38 +02:00
dist_lib_libvlc_a_SOURCES = src/misc/modules_plugin.h
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 15:50:13 +02:00
lib_libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
lib_libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
lib_libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
lib_libvlc_pic_a_SOURCES = $(SOURCES_libvlc)
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 15:50:13 +02:00
lib_libvlc_pic_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc pic`
lib_libvlc_pic_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic`
lib_libvlc_pic_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic`
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
if HAVE_BEOS
* ALL: WinCE compilation fixes (mostly nonexistent headers). A lot of work is still needed for missing functions. I only touched libvlc for the moment, plugins will come in a long long while. * ./bootstrap: moved MSVC project files generation here; use --update-msvc.
2002-11-10 19:04:24 +01:00
OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos)
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
endif
if HAVE_DARWIN
* ALL: WinCE compilation fixes (mostly nonexistent headers). A lot of work is still needed for missing functions. I only touched libvlc for the moment, plugins will come in a long long while. * ./bootstrap: moved MSVC project files generation here; use --update-msvc.
2002-11-10 19:04:24 +01:00
OPT_SOURCES_libvlc_darwin = $(SOURCES_libvlc_darwin)
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
endif
if HAVE_WIN32
* ALL: WinCE compilation fixes (mostly nonexistent headers). A lot of work is still needed for missing functions. I only touched libvlc for the moment, plugins will come in a long long while. * ./bootstrap: moved MSVC project files generation here; use --update-msvc.
2002-11-10 19:04:24 +01:00
OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32)
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
endif
if BUILD_DIRENT
* ALL: WinCE compilation fixes (mostly nonexistent headers). A lot of work is still needed for missing functions. I only touched libvlc for the moment, plugins will come in a long long while. * ./bootstrap: moved MSVC project files generation here; use --update-msvc.
2002-11-10 19:04:24 +01:00
OPT_SOURCES_libvlc_dirent = $(SOURCES_libvlc_dirent)
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
endif
if BUILD_GETOPT
* ALL: WinCE compilation fixes (mostly nonexistent headers). A lot of work is still needed for missing functions. I only touched libvlc for the moment, plugins will come in a long long while. * ./bootstrap: moved MSVC project files generation here; use --update-msvc.
2002-11-10 19:04:24 +01:00
OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt)
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
endif
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
if BUILD_MOZILLA
LIBRARIES_libvlc_pic = lib/libvlc_pic.a
endif
EXTRA_DIST += \
* ALL: WinCE compilation fixes (mostly nonexistent headers). A lot of work is still needed for missing functions. I only touched libvlc for the moment, plugins will come in a long long while. * ./bootstrap: moved MSVC project files generation here; use --update-msvc.
2002-11-10 19:04:24 +01:00
$(SOURCES_libvlc_beos) \
$(SOURCES_libvlc_darwin) \
$(SOURCES_libvlc_win32) \
$(SOURCES_libvlc_dirent) \
$(SOURCES_libvlc_getopt) \
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
$(NULL)
* ALL: WinCE compilation fixes (mostly nonexistent headers). A lot of work is still needed for missing functions. I only touched libvlc for the moment, plugins will come in a long long while. * ./bootstrap: moved MSVC project files generation here; use --update-msvc.
2002-11-10 19:04:24 +01:00
SOURCES_libvlc_beos = \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
src/misc/beos_specific.cpp \
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
$(NULL)
* ALL: WinCE compilation fixes (mostly nonexistent headers). A lot of work is still needed for missing functions. I only touched libvlc for the moment, plugins will come in a long long while. * ./bootstrap: moved MSVC project files generation here; use --update-msvc.
2002-11-10 19:04:24 +01:00
SOURCES_libvlc_darwin = \
* modules/access/udp.c: Merged the UDP and RTP plug-ins, with autodetection of RTP, * src/misc/darwin_specific.m: if $LANG isn't set, retrieve NSUserDefaults.
2002-12-30 09:56:19 +01:00
src/misc/darwin_specific.m \
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
$(NULL)
* ALL: WinCE compilation fixes (mostly nonexistent headers). A lot of work is still needed for missing functions. I only touched libvlc for the moment, plugins will come in a long long while. * ./bootstrap: moved MSVC project files generation here; use --update-msvc.
2002-11-10 19:04:24 +01:00
SOURCES_libvlc_win32 = \
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
src/misc/win32_specific.c \
$(NULL)
* ALL: WinCE compilation fixes (mostly nonexistent headers). A lot of work is still needed for missing functions. I only touched libvlc for the moment, plugins will come in a long long while. * ./bootstrap: moved MSVC project files generation here; use --update-msvc.
2002-11-10 19:04:24 +01:00
SOURCES_libvlc_dirent = \
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
src/extras/dirent.c \
src/extras/dirent.h \
$(NULL)
* ALL: WinCE compilation fixes (mostly nonexistent headers). A lot of work is still needed for missing functions. I only touched libvlc for the moment, plugins will come in a long long while. * ./bootstrap: moved MSVC project files generation here; use --update-msvc.
2002-11-10 19:04:24 +01:00
SOURCES_libvlc_getopt = \
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
src/extras/getopt.c \
src/extras/getopt.h \
src/extras/getopt1.c \
$(NULL)
* ALL: WinCE compilation fixes (mostly nonexistent headers). A lot of work is still needed for missing functions. I only touched libvlc for the moment, plugins will come in a long long while. * ./bootstrap: moved MSVC project files generation here; use --update-msvc.
2002-11-10 19:04:24 +01:00
SOURCES_libvlc_common = \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
src/libvlc.c \
src/libvlc.h \
src/interface/interface.c \
src/interface/intf_eject.c \
src/playlist/playlist.c \
src/input/input.c \
src/input/input_ext-plugins.c \
src/input/input_ext-dec.c \
src/input/input_ext-intf.c \
src/input/input_dec.c \
src/input/input_programs.c \
src/input/input_clock.c \
src/input/input_info.c \
src/video_output/video_output.c \
src/video_output/vout_pictures.c \
src/video_output/vout_pictures.h \
src/video_output/video_text.c \
src/video_output/video_text.h \
src/video_output/vout_subpictures.c \
* Implementation of a frame-dropping algorithm for the libmpeg2 plug-in (incomplete).
2003-04-15 00:22:32 +02:00
src/video_output/vout_synchro.c \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
src/audio_output/common.c \
src/audio_output/dec.c \
src/audio_output/filters.c \
src/audio_output/input.c \
src/audio_output/mixer.c \
src/audio_output/output.c \
src/audio_output/intf.c \
src/stream_output/stream_output.c \
All: Support for SAP advertising in stream output add sap, or sap="Name" in the stream output options
2003-05-20 18:20:33 +02:00
src/stream_output/announce.c \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
src/misc/mtime.c \
src/misc/modules.c \
src/misc/threads.c \
src/misc/cpu.c \
src/misc/configuration.c \
src/misc/iso_lang.c \
* ALL: WinCE compilation fixes (mostly nonexistent headers). A lot of work is still needed for missing functions. I only touched libvlc for the moment, plugins will come in a long long while. * ./bootstrap: moved MSVC project files generation here; use --update-msvc.
2002-11-10 19:04:24 +01:00
src/misc/iso-639_def.h \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
src/misc/messages.c \
src/misc/objects.c \
Changes to the libvlc API: * ./include/vlc/vlc.h: changed the naming conventions for libvlc. Now exported functions start with VLC_ instead of vlc_ to avoid conflicts. * ./include/vlc/vlc.h: removed the vlc_object_t, vlc_list_t, vlc_error_t and vlc_t types; they are now internal types only. * ./include/vlc/vlc.h: merged the reentrant and non-reentrant libvlc calls. In non-reentrant mode, we just use 0 as the first argument. In reentrant mode, we use an object's ID. (see below) Internal changes: * ./src/libvlc.c, ./src/misc/objects.c: instead of manipulating vlc_object_t pointers, we manipulate their i_object_id. When needed, an object is retrieved using vlc_object_get (I hope the lookup isn't too expensive, that's why I designed the pp_objects layout to allow log2(n) seeks). * ./src/misc/objects.c: activated the per-object variable storage. Unused yet, unless you want to try "getfoo" and "setfoo blablah" in vlc -I rc. * ./include/vlc_objects.h: moved the vlc_object_t and vlc_list_t definitions here. Misc: * ./src/vlc.c, ./mozilla/vlcshell.cpp: removed inclusion of config.h in code portions not part of libvlc; it was just required for the COPYRIGHT_MESSAGE string which is now available from VLC_Version().
2002-10-12 00:32:56 +02:00
src/misc/variables.c \
* ./include/vlc/vlc.h, ./src/libvlc.c: added VLC_Error() to the libvlc API. * ./include/main.h: removed p_vlc->i_status because it was not sufficient to represent all the possible states of p_vlc; each part should be tested separately upon destruction. * ./src/misc/objects.c: fixed a signed/unsigned bug that prevented creation of VLC_OBJECT_GENERIC objects. * ./src/misc/variables.c: added the VLC_VAR_COMMAND type which is simply a variable that stores a function pointer, and calls it when var_Get is called for it. The function argument is taken in val.psz_string. * ./src/misc/objects.c: vlc_dumpstructure and vlc_liststructure are no longer exported to the rest of the program; instead, they're VLC_VAR_COMMAND vars ("tree" and "list"). * ./modules/control/rc/rc.c: moved a few commands to VLC_VAR_COMMAND vars.
2002-10-14 18:46:56 +02:00
src/misc/error.c \
* ./src/extras/libc.c: if configure is called with --with-included-gettext, we export vlc_dgettext to plugins so that their messages can be translated as well.
2002-12-27 16:31:56 +01:00
src/extras/libc.c \
* ALL: WinCE compilation fixes (mostly nonexistent headers). A lot of work is still needed for missing functions. I only touched libvlc for the moment, plugins will come in a long long while. * ./bootstrap: moved MSVC project files generation here; use --update-msvc.
2002-11-10 19:04:24 +01:00
$(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) \
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
$(NULL)
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
###############################################################################
# Building vlc
###############################################################################
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 15:50:13 +02:00
bin_PROGRAMS = vlc
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
vlc_SOURCES = src/vlc.c
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 15:50:13 +02:00
vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin`
vlc_LDADD = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
* ./Makefile.am: another workaround for an old automake 1.5 bug (bug #279).
2002-10-02 15:26:14 +02:00
# We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
# old automake-1.5 bug (automake/279).
* Makefile.am: + Forward AM_MAKEFLAGS through recursive makefiles. + Removed the plugins and builtins rules. This causes libintl to be built before the plugins. * bootstrap: + Enabled recursive builds of plugins and builtins. * vlc-config.in.in: + Fixed a typo. * debian/changelog: + Next upload will fix bug #199427.
2003-07-01 14:50:56 +02:00
DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
* ./Makefile.am: another workaround for an old automake 1.5 bug (bug #279).
2002-10-02 15:26:14 +02:00
* Makefile.am: + If a builtin has been rebuilt, rebuild vlc. + Do not rebuild the Mozilla plugin's xpt when the Makefile changes.
2003-07-03 04:56:35 +02:00
vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin
@rm -f $(top_builddir)/vlc$(EXEEXT)
* bootstrap, Makefile.am: Slightly reduced build verbosity.
2003-07-03 13:23:09 +02:00
@case `$(VLC_CONFIG) --linkage vlc builtin` in \
c++) echo $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
objc) echo $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
c|*) echo $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 15:50:13 +02:00
esac
ALL: fixed i18n under BeOS
2003-04-18 17:25:51 +02:00
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
if HAVE_BEOS
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
xres -o $@ $(srcdir)/share/vlc_beos.rsrc
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
mimeset -f $@
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
rm -Rf $(srcdir)/locale ; mkdir -p "$(srcdir)/locale"
ALL: fixed i18n under BeOS
2003-04-18 17:25:51 +02:00
for i in $(ALL_LINGUAS); do \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
mkdir -p "$(srcdir)/locale/$${i}/LC_MESSAGES" ; \
cp "$(srcdir)/po/$${i}.gmo" \
"$(srcdir)/locale/$${i}/LC_MESSAGES/vlc.mo" || true ; \
ALL: fixed i18n under BeOS
2003-04-18 17:25:51 +02:00
done
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
endif
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 15:50:13 +02:00
# Install the modules and the symlinks
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
install-exec-local:
* Makefile.am: + Call $(srcdir)/toolbox from $(builddir) instead of $(srcdir). + Call $(builddir)/vlc-config instead of $(srcdir)/vlc-config, because generated files end in $(builddir). + Added -Imozilla to the mozilla plugin link flags. + Look for mozilla/vlcintf.idl in $(srcdir). * configure.ac: + Set VLC_CONFIG to $(builddir)/vlc-config instead of $(srcdir)/vlc-config. * toolbox: + Look for Makefile.am in ${srcdir}, and Makefile in ${builddir}. + Prepend ${srcdir} to header files we handle. * m4/vlc.m4: + Look for vlc-config.in.in in ${srcdir} but generate vlc-config.in in ${builddir}. * modules/gui/skins/src/dialogs.cpp, modules/gui/wxwindows/interface.cpp: + Include the pixmap with a path relative to the current directory. This commit should fix builds that use --srcdir (Closes: #319).
2003-06-28 15:04:52 +02:00
for i in "" `$(VLC_CONFIG) --target plugin` ; do if test -n "$$i" ; then \
* bootstrap, Makefile.am: Slightly reduced build verbosity.
2003-07-03 13:23:09 +02:00
echo $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f2 -d/`" ; \
$(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f2 -d/`" ; \
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 15:50:13 +02:00
fi ; done
* Makefile.am: Do not try to install PIC builtins if --enable-mozilla was not specified.
2003-07-07 20:14:17 +02:00
for i in "" `$(VLC_CONFIG) --target builtin` ; do if test -n "$$i" ; then \
* Makefile.am: Fixed the installation of plugins that were going one directory too low.
2003-07-03 11:37:46 +02:00
echo $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
* vlc-config.in.in: Reverted one of my first Solaris workarounds rendered obsolescent by the latest ones.
2003-07-01 20:28:43 +02:00
$(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 15:50:13 +02:00
fi ; done
* Makefile.am: Do not try to install PIC builtins if --enable-mozilla was not specified.
2003-07-07 20:14:17 +02:00
if BUILD_MOZILLA
for i in "" `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \
echo $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
$(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
fi ; done
endif
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 15:50:13 +02:00
rm -f "$(DESTDIR)$(bindir)/$$i" && \
ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
fi ; done
if HAVE_DARWIN
# Create the MacOS X app
ALL: - changed vlc.app into VLC.app modules/gui/macosx/vout.m: fixed a potential issue with the hiding of the mousecursor.
2003-02-11 16:35:29 +01:00
vlc_app_DATA = VLC.app
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
vlc_appdir = $(bindir)
* Makefile.am: + Forward AM_MAKEFLAGS through recursive makefiles. + Removed the plugins and builtins rules. This causes libintl to be built before the plugins. * bootstrap: + Enabled recursive builds of plugins and builtins. * vlc-config.in.in: + Fixed a typo. * debian/changelog: + Next upload will fix bug #199427.
2003-07-01 14:50:56 +02:00
VLC.app: vlc
ALL: - changed vlc.app into VLC.app modules/gui/macosx/vout.m: fixed a potential issue with the hiding of the mousecursor.
2003-02-11 16:35:29 +01:00
rm -Rf VLC.app
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
cd $(srcdir)/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'
cp -r $(srcdir)/extras/MacOSX/build/vlc.bundle $(srcdir)/VLC.app
$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS
$(INSTALL) vlc $(srcdir)/VLC.app/Contents/MacOS/VLC
$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules
* Makefile.am: + Call $(srcdir)/toolbox from $(builddir) instead of $(srcdir). + Call $(builddir)/vlc-config instead of $(srcdir)/vlc-config, because generated files end in $(builddir). + Added -Imozilla to the mozilla plugin link flags. + Look for mozilla/vlcintf.idl in $(srcdir). * configure.ac: + Set VLC_CONFIG to $(builddir)/vlc-config instead of $(srcdir)/vlc-config. * toolbox: + Look for Makefile.am in ${srcdir}, and Makefile in ${builddir}. + Prepend ${srcdir} to header files we handle. * m4/vlc.m4: + Look for vlc-config.in.in in ${srcdir} but generate vlc-config.in in ${builddir}. * modules/gui/skins/src/dialogs.cpp, modules/gui/wxwindows/interface.cpp: + Include the pixmap with a path relative to the current directory. This commit should fix builds that use --srcdir (Closes: #319).
2003-06-28 15:04:52 +02:00
for i in "" `$(VLC_CONFIG) --target plugin` ; do \
* vlc-config.in.in: Reverted one of my first Solaris workarounds rendered obsolescent by the latest ones.
2003-07-01 20:28:43 +02:00
if test -n "$$i" ; then $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" \
* Makefile.am: create directories before installing stuff in them. * m4/Makefile.am: distribute our generated private.m4 file.
2003-06-27 20:27:31 +02:00
"$(srcdir)/VLC.app/Contents/MacOS/modules" ; \
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 15:50:13 +02:00
fi ; done
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share
$(INSTALL) -m 644 $(srcdir)/share/*.psf $(srcdir)/share/*.rle \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
$(srcdir)/VLC.app/Contents/MacOS/share
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/locale
Fixed the "locales have disappeared" problem under OS X.
2003-03-21 08:54:24 +01:00
for i in $(ALL_LINGUAS); do \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
mkdir -p $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
cp $(srcdir)/po/$${i}.gmo $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
mkdir -p $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
ln -sf ../English.lproj/InfoPlist.strings $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
ln -sf ../English.lproj/MainMenu.nib $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
ln -sf ../English.lproj/vlc.scriptTerminology $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
* Italien translation, courtesy of Bruno <allevb@tin.it>, * Compilation fixes for gettext 0.11.5 on MacOS X.
2002-12-27 01:17:49 +01:00
done
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
printf "APPLVLC#" >| $(srcdir)/VLC.app/Contents/PkgInfo
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
endif
if HAVE_WIN32
* ./bootstrap, ./Makefile.am: workarounds for automake 1.5.
2002-10-02 14:59:59 +02:00
DATA_win32_rc = $(noinst_share_vlc_win32_rc_DATA)
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
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
Makefile.am: pass version strings to windres share/vlc_win32_rc.rc: provide some version info in the vlc binary If all is well, this should not break msvc build, but binaries built with msvc will have version 0.0.0
2003-07-06 18:35:38 +02:00
$(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 $@
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
endif
* Makefile.am: "make dist-woody" builds a tarball suitable for a Debian woody package build. * bootstrap: + Remove config.h.in and config.h before running autoheader. + Added "set -e" for better error tracking. + Call autoheader and automake after autoconf so that the first build does not need to call autoheader. * debian/woody-buildpackage: + Removed that script and put the code in toolbox. * debian/control: + Added a build-dependency on libmatroska-dev. * debian/rules: + Activated Matroska support. + Re-enabled dh_installchangelogs.
2003-07-05 16:47:53 +02:00
###############################################################################
# Building specific source packages
###############################################################################
dist-woody: distdir
$(remove_distdir_woody)
mv $(distdir) $(PACKAGE)-woody-$(VERSION)
$(srcdir)/toolbox --make-woody $(PACKAGE)-woody-$(VERSION)
$(AMTAR) chof - $(PACKAGE)-woody-$(VERSION) \
| GZIP=$(GZIP_ENV) gzip -c >$(PACKAGE)-woody-$(VERSION).tar.gz
$(remove_distdir_woody)
remove_distdir_woody = \
{ test ! -d $(PACKAGE)-woody-$(VERSION) \
|| { find $(PACKAGE)-woody-$(VERSION) -type d ! -perm -200 \
-exec chmod u+w {} ';' \
&& rm -fr $(PACKAGE)-woody-$(VERSION); }; }
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-25 22:02:35 +01:00
###############################################################################
# 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:
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
@if test -e "$(srcdir)/tmp"; then \
echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
false; \
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-25 22:02:35 +01:00
else \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
echo "OK."; mkdir -p "$(srcdir)/tmp"; \
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-25 22:02:35 +01:00
fi
# Create installation script
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
cp "$(srcdir)/install-win32" "$(srcdir)/tmp/nsi"
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-25 22:02:35 +01:00
# Copy relevant files
* Makefile.am: + If a builtin has been rebuilt, rebuild vlc. + Do not rebuild the Mozilla plugin's xpt when the Makefile changes.
2003-07-03 04:56:35 +02:00
cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/tmp/"
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
$(STRIP) "$(srcdir)/tmp/vlc$(EXEEXT)"
cp "$(srcdir)/INSTALL.win32" "$(srcdir)/tmp/INSTALL.txt"
unix2dos "$(srcdir)/tmp/INSTALL.txt"
* configure.ac.in, Makefile.am, install-win32: fixed the package-win32 make target, and included the locales in the installer script. * src/libvlc.c: on win32 we look for the locales in vlc's directory.
2003-02-26 20:39:43 +01:00
for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
do cp "$(srcdir)/$$file" "$(srcdir)/tmp/$${file}.txt" ; \
unix2dos "$(srcdir)/tmp/$${file}.txt" ; done
* configure.ac.in, Makefile.am, install-win32: fixed the package-win32 make target, and included the locales in the installer script. * src/libvlc.c: on win32 we look for the locales in vlc's directory.
2003-02-26 20:39:43 +01:00
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
mkdir -p "$(srcdir)/tmp/plugins"
* Makefile.am: + Call $(srcdir)/toolbox from $(builddir) instead of $(srcdir). + Call $(builddir)/vlc-config instead of $(srcdir)/vlc-config, because generated files end in $(builddir). + Added -Imozilla to the mozilla plugin link flags. + Look for mozilla/vlcintf.idl in $(srcdir). * configure.ac: + Set VLC_CONFIG to $(builddir)/vlc-config instead of $(srcdir)/vlc-config. * toolbox: + Look for Makefile.am in ${srcdir}, and Makefile in ${builddir}. + Prepend ${srcdir} to header files we handle. * m4/vlc.m4: + Look for vlc-config.in.in in ${srcdir} but generate vlc-config.in in ${builddir}. * modules/gui/skins/src/dialogs.cpp, modules/gui/wxwindows/interface.cpp: + Include the pixmap with a path relative to the current directory. This commit should fix builds that use --srcdir (Closes: #319).
2003-06-28 15:04:52 +02:00
for i in "" `$(VLC_CONFIG) --target plugin` ; do \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
if test -n "$$i" ; then \
* vlc-config.in.in: Reverted one of my first Solaris workarounds rendered obsolescent by the latest ones.
2003-07-01 20:28:43 +02:00
$(INSTALL) "$(srcdir)/$$i$(LIBEXT)" "$(srcdir)/tmp/plugins/" ; \
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 15:50:13 +02:00
fi ; done
* configure.ac.in, Makefile.am, install-win32: fixed the package-win32 make target, and included the locales in the installer script. * src/libvlc.c: on win32 we look for the locales in vlc's directory.
2003-02-26 20:39:43 +01:00
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
for i in "" $(srcdir)/tmp/plugins/*$(LIBEXT) ; \
do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
* Makefile.am, install-win32: added the default skin to the win32 package.
2003-04-06 19:14:43 +02:00
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
mkdir -p "$(srcdir)/tmp/share"
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
cp $(srcdir)/share/*.rle $(srcdir)/tmp/share/ ;
* configure.ac.in, Makefile.am, install-win32: fixed the package-win32 make target, and included the locales in the installer script. * src/libvlc.c: on win32 we look for the locales in vlc's directory.
2003-02-26 20:39:43 +01:00
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
mkdir $(srcdir)/tmp/locale
* configure.ac.in, Makefile.am, install-win32: fixed the package-win32 make target, and included the locales in the installer script. * src/libvlc.c: on win32 we look for the locales in vlc's directory.
2003-02-26 20:39:43 +01:00
for i in $(ALL_LINGUAS); do \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
mkdir -p "$(srcdir)/tmp/locale/$${i}/LC_MESSAGES" ; \
cp "$(srcdir)/po/$${i}.gmo" \
"$(srcdir)/tmp/locale/$${i}/LC_MESSAGES/vlc.mo" || true ; \
* configure.ac.in, Makefile.am, install-win32: fixed the package-win32 make target, and included the locales in the installer script. * src/libvlc.c: on win32 we look for the locales in vlc's directory.
2003-02-26 20:39:43 +01:00
done
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
mkdir -p $(srcdir)/tmp/skins/default
for i in $(srcdir)/share/skins/default/*.*; do \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
cp $$i $(srcdir)/tmp/skins/default/ || true ; \
* Makefile.am, install-win32: added the default skin to the win32 package.
2003-04-06 19:14:43 +02:00
done
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
for i in $(srcdir)/doc/skins/*.txt; do \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
cp $$i $(srcdir)/tmp/skins/ || true ; \
* Makefile.am, install-win32: added the default skin to the win32 package.
2003-04-06 19:14:43 +02:00
done
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-25 22:02:35 +01:00
# Create package
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} $(srcdir)/tmp/nsi
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-25 22:02:35 +01:00
# Clean up
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
rm -Rf $(srcdir)/tmp
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-25 22:02:35 +01:00
package-beos:
# Check that tmp isn't in the way
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
@if test -e $(srcdir)/tmp; then \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
false; \
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-25 22:02:35 +01:00
else \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
echo "OK."; mkdir $(srcdir)/tmp; \
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-25 22:02:35 +01:00
fi
* Makefile.am: fixed 'make package-beos' * modules/gui/beos/*: added _()s so the whole interface is translated * src/libvlc.c: ask gettext for UTF-8 strings (under BeOS only for now) FIXME: currently, untranslated strings are not converted to UTF-8
2003-04-22 18:36:16 +02:00
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-25 22:02:35 +01:00
# Copy relevant files
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
mkdir -p $(srcdir)/tmp/vlc
cd $(srcdir) && \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/
* Makefile.am: fixed 'make package-beos' * modules/gui/beos/*: added _()s so the whole interface is translated * src/libvlc.c: ask gettext for UTF-8 strings (under BeOS only for now) FIXME: currently, untranslated strings are not converted to UTF-8
2003-04-22 18:36:16 +02:00
# We cannot use ${PLUGIN_FILES}, it looks like it is too long for the BeOS shell...
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
if [ `find $(srcdir)/modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
mkdir -p $(srcdir)/tmp/vlc/plugins; \
find $(srcdir)/modules -name "lib*_plugin.so" | xargs -i{} cp {} $(srcdir)/tmp/vlc/plugins/; \
* Makefile.am: fixed 'make package-beos' * modules/gui/beos/*: added _()s so the whole interface is translated * src/libvlc.c: ask gettext for UTF-8 strings (under BeOS only for now) FIXME: currently, untranslated strings are not converted to UTF-8
2003-04-22 18:36:16 +02:00
fi
for i in $(ALL_LINGUAS); do \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
mkdir -p $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES ; \
cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
* Makefile.am: fixed 'make package-beos' * modules/gui/beos/*: added _()s so the whole interface is translated * src/libvlc.c: ask gettext for UTF-8 strings (under BeOS only for now) FIXME: currently, untranslated strings are not converted to UTF-8
2003-04-22 18:36:16 +02:00
done
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
mkdir -p $(srcdir)/tmp/vlc/share
cp $(srcdir)/share/*.rle $(srcdir)/tmp/vlc/share/
* Makefile.am: fixed 'make package-beos' * modules/gui/beos/*: added _()s so the whole interface is translated * src/libvlc.c: ask gettext for UTF-8 strings (under BeOS only for now) FIXME: currently, untranslated strings are not converted to UTF-8
2003-04-22 18:36:16 +02:00
# Create package with debug symbols
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/*
mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION}
* Makefile.am: minor change in BeOS packages generation * doc/release-howto.txt: remove outdated info about how to build BeOS packages
2003-05-24 17:11:00 +02:00
(cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} )
mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/
* Makefile.am: fixed 'make package-beos' * modules/gui/beos/*: added _()s so the whole interface is translated * src/libvlc.c: ask gettext for UTF-8 strings (under BeOS only for now) FIXME: currently, untranslated strings are not converted to UTF-8
2003-04-22 18:36:16 +02:00
# Create package without debug symbols
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
strip $(srcdir)/tmp/vlc-${VERSION}/vlc
if [ -d $(srcdir)/tmp/vlc-${VERSION}/plugins ]; then \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
strip $(srcdir)/tmp/vlc-${VERSION}/plugins/lib*_plugin.so; \
Makefile.am: fixed BeOS package generation when all modules are built-in
2003-05-06 04:17:11 +02:00
fi
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
xres -o $(srcdir)/tmp/vlc-${VERSION}/vlc $(srcdir)/share/vlc_beos.rsrc
mimeset -f $(srcdir)/tmp/vlc-${VERSION}/* $(srcdir)/tmp/vlc-${VERSION}/*/*
* Makefile.am: minor change in BeOS packages generation * doc/release-howto.txt: remove outdated info about how to build BeOS packages
2003-05-24 17:11:00 +02:00
(cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/
* Makefile.am: fixed 'make package-beos' * modules/gui/beos/*: added _()s so the whole interface is translated * src/libvlc.c: ask gettext for UTF-8 strings (under BeOS only for now) FIXME: currently, untranslated strings are not converted to UTF-8
2003-04-22 18:36:16 +02:00
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-25 22:02:35 +01:00
# Clean up
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
rm -Rf $(srcdir)/tmp
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-25 22:02:35 +01:00
package-macosx:
# Check that tmp isn't in the way
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
@if test -e "$(srcdir)/tmp"; then \
echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
false; \
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-25 22:02:35 +01:00
else \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
echo "OK."; mkdir -p "$(srcdir)/tmp"; \
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-25 22:02:35 +01:00
fi
# Copy relevant files
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
cp -R "$(srcdir)/VLC.app" "$(srcdir)/tmp/"
cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-25 22:02:35 +01:00
# Create disk image
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
$(srcdir)/extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" $(srcdir)/tmp/*
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-25 22:02:35 +01:00
# Clean up
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
rm -Rf $(srcdir)/tmp
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-25 22:02:35 +01:00
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
###############################################################################
# Building the Mozilla plugin
###############################################################################
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 15:50:13 +02:00
noinst_LIBRARIES = $(noinst_LIBRARIES_mozilla)
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 15:50:13 +02:00
MOSTLYCLEANFILES = $(LIBRARIES_mozilla)
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
EXTRA_DIST += $(SOURCES_mozilla) mozilla/vlcintf.idl
BUILT_SOURCES += $(BUILT_SOURCES_mozilla)
SOURCES_mozilla = \
mozilla/vlcshell.cpp \
mozilla/vlcplugin.cpp \
mozilla/vlcplugin.h \
mozilla/vlcpeer.cpp \
mozilla/vlcpeer.h \
* ./mozilla/*: moved support files in a separate directory. * ./mozilla/support/npmac.cpp: added a hacked version of Mozilla's npmac.cpp that builds with g++ instead of CodeWarrior.
2003-04-09 18:18:36 +02:00
mozilla/support/classinfo.h \
* ./mozilla/vlcshell.cpp: ported the Mozilla plugin to Windows. For the moment it spawns a separate window and seems to behave nastily (read: crashes) when the target has sound, but the javascript interface works perfectly, for instance. To build it, I installed Mozilla development files in my mingw32 dir and hacked mozilla-config so that it uses these files. I also hacked jri_md.h and jni_md.h to put "defined(_MSC_VER) || defined(__MINGW32__)" where it read "defined(_MSC_VER)". No other changes were necessary.
2002-10-22 23:10:28 +02:00
$(SOURCES_mozilla_win32) \
* ./mozilla/*: moved support files in a separate directory. * ./mozilla/support/npmac.cpp: added a hacked version of Mozilla's npmac.cpp that builds with g++ instead of CodeWarrior.
2003-04-09 18:18:36 +02:00
$(SOURCES_mozilla_macosx) \
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-09 17:34:53 +01:00
$(SOURCES_mozilla_unix) \
$(NULL)
* ./mozilla/vlcshell.cpp: ported the Mozilla plugin to Windows. For the moment it spawns a separate window and seems to behave nastily (read: crashes) when the target has sound, but the javascript interface works perfectly, for instance. To build it, I installed Mozilla development files in my mingw32 dir and hacked mozilla-config so that it uses these files. I also hacked jri_md.h and jni_md.h to put "defined(_MSC_VER) || defined(__MINGW32__)" where it read "defined(_MSC_VER)". No other changes were necessary.
2002-10-22 23:10:28 +02:00
# 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)
* ./mozilla/*: moved support files in a separate directory. * ./mozilla/support/npmac.cpp: added a hacked version of Mozilla's npmac.cpp that builds with g++ instead of CodeWarrior.
2003-04-09 18:18:36 +02:00
SOURCES_mozilla_win32 = mozilla/support/npwin.cpp
* ./mozilla/vlcshell.cpp: ported the Mozilla plugin to Windows. For the moment it spawns a separate window and seems to behave nastily (read: crashes) when the target has sound, but the javascript interface works perfectly, for instance. To build it, I installed Mozilla development files in my mingw32 dir and hacked mozilla-config so that it uses these files. I also hacked jri_md.h and jni_md.h to put "defined(_MSC_VER) || defined(__MINGW32__)" where it read "defined(_MSC_VER)". No other changes were necessary.
2002-10-22 23:10:28 +02:00
CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32
else
* ./mozilla/*: moved support files in a separate directory. * ./mozilla/support/npmac.cpp: added a hacked version of Mozilla's npmac.cpp that builds with g++ instead of CodeWarrior.
2003-04-09 18:18:36 +02:00
if HAVE_DARWIN
# We don't define LIBRARIES_mozilla because we'll be using project builder
SOURCES_mozilla_macosx = mozilla/support/npmac.cpp
else
* ./mozilla/vlcshell.cpp: ported the Mozilla plugin to Windows. For the moment it spawns a separate window and seems to behave nastily (read: crashes) when the target has sound, but the javascript interface works perfectly, for instance. To build it, I installed Mozilla development files in my mingw32 dir and hacked mozilla-config so that it uses these files. I also hacked jri_md.h and jni_md.h to put "defined(_MSC_VER) || defined(__MINGW32__)" where it read "defined(_MSC_VER)". No other changes were necessary.
2002-10-22 23:10:28 +02:00
LIBRARIES_mozilla = mozilla/libvlcplugin$(LIBEXT)
* ./mozilla/*: moved support files in a separate directory. * ./mozilla/support/npmac.cpp: added a hacked version of Mozilla's npmac.cpp that builds with g++ instead of CodeWarrior.
2003-04-09 18:18:36 +02:00
SOURCES_mozilla_unix = mozilla/support/npunix.c
endif
* ./mozilla/vlcshell.cpp: ported the Mozilla plugin to Windows. For the moment it spawns a separate window and seems to behave nastily (read: crashes) when the target has sound, but the javascript interface works perfectly, for instance. To build it, I installed Mozilla development files in my mingw32 dir and hacked mozilla-config so that it uses these files. I also hacked jri_md.h and jni_md.h to put "defined(_MSC_VER) || defined(__MINGW32__)" where it read "defined(_MSC_VER)". No other changes were necessary.
2002-10-22 23:10:28 +02:00
endif
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
if BUILD_MOZILLA
* ./bootstrap, ./Makefile.am: we don't build static libraries if their only goal is to provide dependencies for shared libraries.
2002-10-25 11:24:29 +02:00
if UNTRUE
noinst_LIBRARIES_mozilla = mozilla/libplugin.a
endif
* ./Makefile.am: we don't try to distribute mozilla/vlcintf.h since it's created at compile time.
2002-12-27 13:44:36 +01:00
mozilla_libplugin_a_SOURCES = $(SOURCES_mozilla)
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 15:50:13 +02:00
mozilla_libplugin_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla pic` \
* Makefile.am: + Call $(srcdir)/toolbox from $(builddir) instead of $(srcdir). + Call $(builddir)/vlc-config instead of $(srcdir)/vlc-config, because generated files end in $(builddir). + Added -Imozilla to the mozilla plugin link flags. + Look for mozilla/vlcintf.idl in $(srcdir). * configure.ac: + Set VLC_CONFIG to $(builddir)/vlc-config instead of $(srcdir)/vlc-config. * toolbox: + Look for Makefile.am in ${srcdir}, and Makefile in ${builddir}. + Prepend ${srcdir} to header files we handle. * m4/vlc.m4: + Look for vlc-config.in.in in ${srcdir} but generate vlc-config.in in ${builddir}. * modules/gui/skins/src/dialogs.cpp, modules/gui/wxwindows/interface.cpp: + Include the pixmap with a path relative to the current directory. This commit should fix builds that use --srcdir (Closes: #319).
2003-06-28 15:04:52 +02:00
$(CPPFLAGS_mozilla_EXTRA) -Imozilla
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 15:50:13 +02:00
mozilla_libplugin_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \
* Makefile.am: + Call $(srcdir)/toolbox from $(builddir) instead of $(srcdir). + Call $(builddir)/vlc-config instead of $(srcdir)/vlc-config, because generated files end in $(builddir). + Added -Imozilla to the mozilla plugin link flags. + Look for mozilla/vlcintf.idl in $(srcdir). * configure.ac: + Set VLC_CONFIG to $(builddir)/vlc-config instead of $(srcdir)/vlc-config. * toolbox: + Look for Makefile.am in ${srcdir}, and Makefile in ${builddir}. + Prepend ${srcdir} to header files we handle. * m4/vlc.m4: + Look for vlc-config.in.in in ${srcdir} but generate vlc-config.in in ${builddir}. * modules/gui/skins/src/dialogs.cpp, modules/gui/wxwindows/interface.cpp: + Include the pixmap with a path relative to the current directory. This commit should fix builds that use --srcdir (Closes: #319).
2003-06-28 15:04:52 +02:00
$(CPPFLAGS_mozilla_EXTRA) -Imozilla
* configure.ac: + Fixed a == test bashism. + Cosmetic changes. * toolbox, vlc-config.in.in: Cosmetic changes. * Makefile.am: Fixed the Mozilla plugin build (happy bootstrap).
2003-07-01 21:17:32 +02:00
mozilla_libplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(DATA_npvlc_rc)
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
BUILT_SOURCES_mozilla = mozilla/vlcintf.h
* ./bootstrap, ./Makefile.am: workarounds for automake 1.5.
2002-10-02 14:59:59 +02:00
$(SOURCES_mozilla): mozilla/vlcintf.h
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
* ./mozilla/vlcshell.cpp: ported the Mozilla plugin to Windows. For the moment it spawns a separate window and seems to behave nastily (read: crashes) when the target has sound, but the javascript interface works perfectly, for instance. To build it, I installed Mozilla development files in my mingw32 dir and hacked mozilla-config so that it uses these files. I also hacked jri_md.h and jni_md.h to put "defined(_MSC_VER) || defined(__MINGW32__)" where it read "defined(_MSC_VER)". No other changes were necessary.
2002-10-22 23:10:28 +02:00
mozilla_plugin_DATA = $(LIBRARIES_mozilla)
mozilla_plugindir = $(libdir)/mozilla/plugins
* ./Makefile.am: fixed missing build dependencies for the Mozilla plugin. * ./src/misc/variables.c: implemented min/max and steps for integer and float variables.
2002-10-28 14:25:56 +01:00
$(LIBRARIES_mozilla): $(mozilla_libplugin_a_OBJECTS) \
* Makefile.am: + If a builtin has been rebuilt, rebuild vlc. + Do not rebuild the Mozilla plugin's xpt when the Makefile changes.
2003-07-03 04:56:35 +02:00
$(mozilla_libplugin_a_DEPENDENCIES) stamp-pic
* ./Makefile.am: fixed a typo that caused HAVE_DEBUG to imply HAVE_RELEASE. * ./bootstrap: fixed calls to $(LINK) which had duplicate -o options.
2002-10-29 19:12:07 +01:00
$(CXXLINK) $(mozilla_libplugin_a_OBJECTS) $(DATA_npvlc_rc) \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-27 18:26:02 +02:00
lib/libvlc_pic.a -shared \
`$(VLC_CONFIG) --libs vlc mozilla builtin pic`
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
mozilla_vlcintf_xpt_DATA = mozilla/vlcintf.xpt
mozilla_vlcintf_xptdir = $(libdir)/mozilla/components
* Makefile.am: + If a builtin has been rebuilt, rebuild vlc. + Do not rebuild the Mozilla plugin's xpt when the Makefile changes.
2003-07-03 04:56:35 +02:00
mozilla/vlcintf.xpt: mozilla/vlcintf.idl
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
$(XPIDL) -I/usr/share/idl/mozilla -m typelib \
* Makefile.am: + Call $(srcdir)/toolbox from $(builddir) instead of $(srcdir). + Call $(builddir)/vlc-config instead of $(srcdir)/vlc-config, because generated files end in $(builddir). + Added -Imozilla to the mozilla plugin link flags. + Look for mozilla/vlcintf.idl in $(srcdir). * configure.ac: + Set VLC_CONFIG to $(builddir)/vlc-config instead of $(srcdir)/vlc-config. * toolbox: + Look for Makefile.am in ${srcdir}, and Makefile in ${builddir}. + Prepend ${srcdir} to header files we handle. * m4/vlc.m4: + Look for vlc-config.in.in in ${srcdir} but generate vlc-config.in in ${builddir}. * modules/gui/skins/src/dialogs.cpp, modules/gui/wxwindows/interface.cpp: + Include the pixmap with a path relative to the current directory. This commit should fix builds that use --srcdir (Closes: #319).
2003-06-28 15:04:52 +02:00
-o mozilla/vlcintf $(srcdir)/mozilla/vlcintf.idl
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
* Makefile.am: + If a builtin has been rebuilt, rebuild vlc. + Do not rebuild the Mozilla plugin's xpt when the Makefile changes.
2003-07-03 04:56:35 +02:00
mozilla/vlcintf.h: mozilla/vlcintf.idl
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
$(XPIDL) -I/usr/share/idl/mozilla -m header \
* Makefile.am: + Call $(srcdir)/toolbox from $(builddir) instead of $(srcdir). + Call $(builddir)/vlc-config instead of $(srcdir)/vlc-config, because generated files end in $(builddir). + Added -Imozilla to the mozilla plugin link flags. + Look for mozilla/vlcintf.idl in $(srcdir). * configure.ac: + Set VLC_CONFIG to $(builddir)/vlc-config instead of $(srcdir)/vlc-config. * toolbox: + Look for Makefile.am in ${srcdir}, and Makefile in ${builddir}. + Prepend ${srcdir} to header files we handle. * m4/vlc.m4: + Look for vlc-config.in.in in ${srcdir} but generate vlc-config.in in ${builddir}. * modules/gui/skins/src/dialogs.cpp, modules/gui/wxwindows/interface.cpp: + Include the pixmap with a path relative to the current directory. This commit should fix builds that use --srcdir (Closes: #319).
2003-06-28 15:04:52 +02:00
-o mozilla/vlcintf $(srcdir)/mozilla/vlcintf.idl
* ./mozilla/vlcshell.cpp: ported the Mozilla plugin to Windows. For the moment it spawns a separate window and seems to behave nastily (read: crashes) when the target has sound, but the javascript interface works perfectly, for instance. To build it, I installed Mozilla development files in my mingw32 dir and hacked mozilla-config so that it uses these files. I also hacked jri_md.h and jni_md.h to put "defined(_MSC_VER) || defined(__MINGW32__)" where it read "defined(_MSC_VER)". No other changes were necessary.
2002-10-22 23:10:28 +02:00
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
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 14:35:06 +02:00
$(WINDRES) --include-dir $(srcdir)/mozilla -i $< -o $@
* ./mozilla/vlcshell.cpp: ported the Mozilla plugin to Windows. For the moment it spawns a separate window and seems to behave nastily (read: crashes) when the target has sound, but the javascript interface works perfectly, for instance. To build it, I installed Mozilla development files in my mingw32 dir and hacked mozilla-config so that it uses these files. I also hacked jri_md.h and jni_md.h to put "defined(_MSC_VER) || defined(__MINGW32__)" where it read "defined(_MSC_VER)". No other changes were necessary.
2002-10-22 23:10:28 +02:00
endif
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 13:05:42 +02:00
endif
* Makefile.am: + If a builtin has been rebuilt, rebuild vlc. + Do not rebuild the Mozilla plugin's xpt when the Makefile changes.
2003-07-03 04:56:35 +02:00
###############################################################################
# Stamp rules
###############################################################################
clean: clean-stamps
clean-stamp:
rm -f stamp-builtin stamp-pic
stamp-builtin: FORCE
@for dep in "" `$(VLC_CONFIG) --target builtin`; do \
if test "$${dep}" -nt "$(top_builddir)/vlc$(EXEEXT)"; then \
rm -f $@; \
break; \
fi; \
done
@if test ! -f $@; then printf "" > $@; fi
stamp-pic: FORCE
@for dep in "" `$(VLC_CONFIG) --target builtin pic`; do \
if test "$${dep}" -nt "$(LIBRARIES_mozilla)"; then \
rm -f $@; \
break; \
fi; \
done
@if test ! -f $@; then printf "" > $@; fi
* ./configure.ac.in, ./src/libvlc.c: attempt at activating gettext support under platforms without libintl such as Win32. Use --with-included-gettext to test. Might break compilation on systems I don't have access to.
2002-10-16 17:10:39 +02:00
###############################################################################
# Force rule
###############################################################################
FORCE: