summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
...
| * Revert mistakenly committed temporary local change.diego2008-08-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27405 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change a bunch of video/audio-output-specific preprocessor directives fromdiego2008-08-031-1/+1
| | | | | | | | | | | | | | a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27399Uoti Urpala2008-08-021-4/+4
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Change a bunch of video-output-specific preprocessor directives from a HAVE_diego2008-08-021-4/+4
| | | | | | | | | | | | | | prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27397 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27374Uoti Urpala2008-07-301-5/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h cfg-mplayer.h command.c configure libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vf_vo.c libmpdemux/demuxer.h libmpdemux/stheader.h mp_core.h mplayer.c stream/stream_radio.c
| * Use conditional compilation instead of an #ifdef around the whole file.diego2008-07-301-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27371 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move CFLAGS specific to internal libdvdread and libfaad2 to the Makefile anddiego2008-07-281-2/+2
| | | | | | | | | | | | | | use them only when compiling objects from those subdirectories. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27359 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Revert to previous dependency checking behavior.diego2008-07-261-1/+0
| | | | | | | | | | | | | | | | | | Take included header files into account when generating dependency files. This has problems when header files are removed or renamed, but does not silently miscompile files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27351 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27332Uoti Urpala2008-07-211-5/+5
|\|
| * Remove "en" from list of all man page languages when generating man pagediego2008-07-191-2/+2
| | | | | | | | | | | | | | installation rules from a pattern. There is a separate rule for English above. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27330 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rewrite translation handling in the build system.diego2008-07-171-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27311 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Evaluate man page installation rule for all available languages,diego2008-07-171-4/+4
| | | | | | | | | | | | | | but only install the requested languages. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27307 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27281Uoti Urpala2008-07-151-0/+1
|\|
| * Dependency files should be refreshed when object files are rebuilt.diego2008-07-121-0/+1
| | | | | | | | | | | | | | | | Express this with Makefile syntax instead of in the dependency file generation command. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27268 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27242Uoti Urpala2008-07-091-20/+21
|\| | | | | | | | | | | | | Conflicts: Makefile configure
| * Introduce DRIVER_OBJS variable for list of all driver targets.diego2008-07-061-4/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27223 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify codecs.conf.h generation rule.diego2008-07-061-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27222 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge version.h dependency declarations.diego2008-07-061-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27221 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove redundant dependencies for .rc files.diego2008-07-061-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27220 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a generic rule for .rc files and use it.diego2008-07-061-2/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27219 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Merge three lines into two.diego2008-07-061-3/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27218 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Also remove dhahelper and dhahelperwin on distclean.diego2008-07-061-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27217 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename ALLPARTSLIBS variable to FFMPEGLIBS.diego2008-07-051-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27205 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Group some variable declarations together in sensible places.diego2008-07-051-4/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27204 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Declare FFmpeg dependencies in a more elegant way using the PARTS variable.diego2008-07-051-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27203 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27202Uoti Urpala2008-07-051-14/+17
|\|
| * Rename stream_livedotcom.c to stream_live555.c, the name is used everywhere.diego2008-07-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27199 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify tool generation rules with a pattern rule.diego2008-07-041-9/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27193 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only build loader tests on x86.diego2008-07-041-1/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27192 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix liba52/test linking, it needs -lm.diego2008-07-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27191 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Put common dependencies of mp3lib/test + mp3lib/test2 on a common line.diego2008-07-041-2/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27189 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Declare common netstream + vivodump dependencies in the common place.diego2008-07-041-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27186 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27184Uoti Urpala2008-07-011-2/+3
|\|
| * Fix FFmpeg subdirectory dependencies: The FFmpeg libraries depend on eachdiego2008-07-011-7/+1
| | | | | | | | | | | | | | other as well as on two header files in MPlayer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27183 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Touch FFmpeg libraries after recursing into their subdirectories.diego2008-06-241-0/+1
| | | | | | | | | | | | | | | | Otherwise, if the recursion was due to a changed file that is not built into the library, the recursion will become unconditional. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27131 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not unconditionally recurse into FFmpeg subdirectories. Instead, justdiego2008-06-241-2/+8
| | | | | | | | | | | | | | recurse if any file in the subdirectory changed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27130 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27123Uoti Urpala2008-06-231-7/+21
|\| | | | | | | | | | | | | Conflicts: libmenu/menu_filesel.c libmenu/menu_pt.c
| * renamed vidixlib.c to vidix.cben2008-06-201-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27112 b3059339-0415-0410-9bf9-f77b7e298cf2
| * allow conditionnal compilation of yuv4mpeg video out.ben2008-06-201-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27103 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add copyright and license statement.diego2008-06-171-5/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27097 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27092Uoti Urpala2008-06-171-2/+3
|\| | | | | | | | | | | | | | | Conflicts: libmpdemux/demuxer.c libvo/vo_xv.c mencoder.c
| * Add command to create dhahelper device to install-dhahelper target.diego2008-06-081-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27032 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename loader/driver.[ch] to loader/drv.[ch], otherwise loader/driver.h candiego2008-06-081-1/+1
| | | | | | | | | | | | | | conflict with the header by the same name in loader/wine/driver.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27031 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add dhahelper CFLAGS where appropriate if enabled.diego2008-06-081-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27030 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix silly typo in CFLAG_SVGALIB_HELPER variable name.diego2008-06-081-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27027 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27025Uoti Urpala2008-06-071-17/+14
|\| | | | | | | | | | | | | | | | | Conflicts: command.c libvo/vosub_vidix.c libvo/vosub_vidix.h mplayer.c
| * Restore support for compiling with svgalib_helper.diego2008-06-071-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27025 b3059339-0415-0410-9bf9-f77b7e298cf2
| * No need to set LC_ALL=C for individual shell commands,diego2008-06-071-1/+1
| | | | | | | | | | | | | | it is already set from config.mak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27013 b3059339-0415-0410-9bf9-f77b7e298cf2
| * The VIDIX PCI files should be regenerated when the awk scriptdiego2008-06-071-1/+1
| | | | | | | | | | | | | | that creates them is changed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27012 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary -o option from windres invocation.diego2008-06-061-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26998 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix the linking of TOOLS/netstream and TOOLS/vivodump.diego2008-06-061-14/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26995 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26979Uoti Urpala2008-06-041-99/+148
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the conflicts are trivial. Conflicts: Makefile cfg-mplayer.h input/input.c libmenu/vf_menu.c libmpcodecs/dec_video.c libmpcodecs/vf_expand.c libmpcodecs/vf_vo.c libmpdemux/demux_mkv.c libmpdemux/demuxer.c libmpdemux/demuxer.h libvo/vo_directfb2.c libvo/vo_gl.c libvo/vo_winvidix.c libvo/vo_xv.c libvo/vo_xvidix.c libvo/vo_xvmc.c libvo/x11_common.c mplayer.c osdep/timer-linux.c stream/cache2.c
| * Add install-dhahelperwin target to simplify dhahelper installation on Windows.diego2008-05-301-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26936 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge vidix/dhahelperwin/Makefile into top-level Makefile.diego2008-05-301-1/+31
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26935 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge vidix/dhahelper/Makefile into top-level Makefile.diego2008-05-301-0/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26934 b3059339-0415-0410-9bf9-f77b7e298cf2
| * The install-drivers target should depend on the drivers target.diego2008-05-291-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26916 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge drivers/Makefile into top-level Makefile.diego2008-05-281-2/+36
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26914 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move messages header file creation to a separate shell script.diego2008-05-271-11/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26910 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Revert declaration .NOTPARALLEL. Unfortunately this special target does notdiego2008-05-271-3/+0
| | | | | | | | | | | | | | have the expected sane semantics, but has a global effect instead... git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26904 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark VIDIX_PCI_FILES targets as NOTPARALLEL. They are all createddiego2008-05-271-0/+3
| | | | | | | | | | | | | | simultaneously by the same command. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26903 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Move toolsclean target to a better place.diego2008-05-271-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26896 b3059339-0415-0410-9bf9-f77b7e298cf2