Uoti Urpala
1715c2a336
Merge svn changes up to r27949
...
Conflicts:
common.mak
libvo/vo_xv.c
libvo/x11_common.c
libvo/x11_common.h
stream/cache2.c
2008-11-17 20:50:23 +02:00
bircoph
29f16f45f1
Add yasm support to the build system.
...
This allows to use yasm assembler optimizations from FFmpeg code,
in particular, from libavcodec/fft.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27940 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-16 13:04:16 +00:00
Uoti Urpala
0301309425
Merge svn changes up to 27824
...
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
2008-10-25 05:12:34 +03:00
diego
6fa340d54c
Create LIBDIR for binary codecs upon make install.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27793 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 20:25:41 +00:00
Uoti Urpala
ebb4abf208
Merge svn changes up to r27682
...
Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.
Conflicts:
command.c
mplayer.c
2008-10-02 05:17:23 +03:00
diego
0189fa7cac
10l: Remove deleted file libmpeg2/motion_comp_iwmmxt.c from Makefile as well.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27678 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-01 06:47:26 +00:00
Uoti Urpala
849dc0ba31
Merge svn changes up to r27649
...
Conflicts:
Makefile
configure
libvo/x11_common.c
2008-09-20 16:13:33 +03:00
rathann
c8d9bf0f50
Add shared libswscale support.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27632 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-16 22:30:22 +00:00
rathann
a5e9a8d0ca
External liba52 support, part 2 of 2.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27620 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-15 16:32:31 +00:00
diego
853d571d48
Use standard -I flags to compile codec-cfg.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27618 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-15 15:34:26 +00:00
Uoti Urpala
b56858342f
Merge svn changes up to r27514
2008-09-03 10:16:30 +03:00
rathann
97e5f304ce
Rename internal libdvdread fork from dvdread to libdvdread
...
to avoid clashing with external libdvdread.
(Sync with libdvdread r1122)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27498 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-30 12:22:21 +00:00
diego
c7c06f3050
Remove SKIP_DEPS trick. The same effect can be achieved without it.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27471 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-18 06:30:10 +00:00
diego
5c30ab6feb
FFmpeg no longer has fastmemcpy support, so no longer trigger recursing
...
into the FFmpeg directories if libvo/fastmemcpy.h changed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27465 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-14 20:42:54 +00:00
Uoti Urpala
e09fe1ce04
Merge svn changes up to r27458
2008-08-12 15:03:34 +03:00
ben
8903c510f8
Add VIDIX driver for SuperH Mobile VEU hardware block.
...
Patch by Magnus Damm <magnus dot damm at gmail dot com>.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27452 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-11 23:10:03 +00:00
diego
6d01235f44
Skip dependency generation if we just run distclean or if skipping
...
is requested explicitly on the command line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27443 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-09 13:53:19 +00:00
Uoti Urpala
17d3e4b36d
Merge svn changes up to r27441
...
Conflicts:
cfg-common-opts.h
command.c
configure
input/input.c
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpdemux/stheader.h
libvo/sub.c
libvo/video_out.c
libvo/vo_xv.c
libvo/vosub_vidix.c
libvo/x11_common.c
libvo/x11_common.h
mp_core.h
mplayer.c
stream/stream.h
2008-08-08 02:13:09 +03:00
diego
af76be6e19
Add separate variables for CFLAGS that are specific to internal libraries
...
and only add them to CFLAGS when compiling objects from those libraries.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27436 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 21:46:06 +00:00
diego
b3e99753a3
cosmetics: Rename some CFLAGS-related variables.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27434 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 21:03:14 +00:00
diego
2d6b7f320b
10l: Remove stray backslash at end of line.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27433 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 20:32:02 +00:00
diego
d04687fc92
Merge two redundantly declared lines into one.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27432 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:36:31 +00:00
diego
a64801ec63
cosmetics: Sort things into alphabetical order in various places.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27431 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:35:34 +00:00
diego
e0b1c9a6b7
Give a CONFIG_ prefix to preprocessor directives that lacked one and
...
change arbitrary prefixes to CONFIG_.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:20:50 +00:00
diego
5641e60698
Ahem, the MACOSX_FINDER_SUPPORT directive was renamed to MACOSX_FINDER.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27426 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 10:57:40 +00:00
diego
34fb06087b
Revert mistakenly committed temporary local change.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27405 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-03 16:20:34 +00:00
diego
02135001b4
Change a bunch of video/audio-output-specific preprocessor directives from
...
a HAVE_ prefix to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-03 15:21:40 +00:00
Uoti Urpala
6cce822505
Merge svn changes up to r27399
...
Conflicts:
libmpcodecs/vd.c
libmpcodecs/ve_raw.c
libvo/video_out.c
libvo/x11_common.c
mplayer.c
2008-08-02 22:04:35 +03:00
diego
e588ab056d
Change a bunch of video-output-specific preprocessor directives from a HAVE_
...
prefix to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27397 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-02 17:38:11 +00:00
Uoti Urpala
04f3909a72
Merge svn changes up to r27374
...
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
2008-07-30 16:39:24 +03:00
diego
771cd67118
Use conditional compilation instead of an #ifdef around the whole file.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27371 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 10:26:23 +00:00
diego
3a313f4def
Move CFLAGS specific to internal libdvdread and libfaad2 to the Makefile and
...
use them only when compiling objects from those subdirectories.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27359 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-28 16:57:22 +00:00
diego
65f404c85f
Revert to previous dependency checking behavior.
...
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
2008-07-26 18:36:48 +00:00
Uoti Urpala
2d4656e070
Merge svn changes up to r27332
2008-07-21 15:03:49 +03:00
diego
611c79b782
Remove "en" from list of all man page languages when generating man page
...
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
2008-07-19 11:32:33 +00:00
diego
adc68058bd
Rewrite translation handling in the build system.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27311 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-17 12:36:54 +00:00
diego
33ff3271b1
Evaluate man page installation rule for all available languages,
...
but only install the requested languages.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27307 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-17 11:54:42 +00:00
Uoti Urpala
92f0cba26b
Merge svn changes up to r27281
2008-07-15 02:59:27 +03:00
diego
4952dbf19a
Dependency files should be refreshed when object files are rebuilt.
...
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
2008-07-12 08:23:10 +00:00
Uoti Urpala
ca3feba5c3
Merge svn changes up to r27242
...
Conflicts:
Makefile
configure
2008-07-09 18:32:51 +03:00
diego
5400ae771d
Introduce DRIVER_OBJS variable for list of all driver targets.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27223 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-06 13:41:08 +00:00
diego
24383a02d1
Simplify codecs.conf.h generation rule.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27222 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-06 13:36:17 +00:00
diego
bc6147198a
Merge version.h dependency declarations.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27221 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-06 13:31:53 +00:00
diego
bceae3b7e8
Remove redundant dependencies for .rc files.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27220 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-06 13:28:45 +00:00
diego
60fc51e29f
Add a generic rule for .rc files and use it.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27219 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-06 13:26:30 +00:00
diego
2d603c2473
cosmetics: Merge three lines into two.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27218 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-06 13:18:29 +00:00
diego
67cf52cccb
Also remove dhahelper and dhahelperwin on distclean.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27217 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-06 13:06:05 +00:00
diego
b0ab09e0fc
Rename ALLPARTSLIBS variable to FFMPEGLIBS.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27205 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-05 09:08:22 +00:00
diego
7c9ad57710
Group some variable declarations together in sensible places.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27204 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-05 09:07:24 +00:00
diego
da6a5a6979
Declare FFmpeg dependencies in a more elegant way using the PARTS variable.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27203 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-05 08:02:06 +00:00
Uoti Urpala
8ea134bd23
Merge svn changes up to r27202
2008-07-05 02:55:56 +03:00
diego
f3bf43f443
Rename stream_livedotcom.c to stream_live555.c, the name is used everywhere.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27199 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 20:14:00 +00:00
diego
3a9b304974
Simplify tool generation rules with a pattern rule.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27193 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 14:35:44 +00:00
diego
2a8bfbaa94
Only build loader tests on x86.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27192 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 14:33:03 +00:00
diego
65a826f348
Fix liba52/test linking, it needs -lm.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27191 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 14:22:54 +00:00
diego
90db8eb5f2
Put common dependencies of mp3lib/test + mp3lib/test2 on a common line.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27189 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 13:42:19 +00:00
diego
48436708a6
Declare common netstream + vivodump dependencies in the common place.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27186 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 13:02:12 +00:00
Uoti Urpala
7de350c673
Merge svn changes up to r27184
2008-07-01 16:18:21 +03:00
diego
768a2f3851
Fix FFmpeg subdirectory dependencies: The FFmpeg libraries depend on each
...
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
2008-07-01 10:02:05 +00:00
diego
26243c40fa
Touch FFmpeg libraries after recursing into their subdirectories.
...
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
2008-06-24 08:55:06 +00:00
diego
ef15210ef1
Do not unconditionally recurse into FFmpeg subdirectories. Instead, just
...
recurse if any file in the subdirectory changed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27130 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-24 08:48:04 +00:00
Uoti Urpala
de560e8167
Merge svn changes up to r27123
...
Conflicts:
libmenu/menu_filesel.c
libmenu/menu_pt.c
2008-06-23 03:58:44 +03:00
ben
86d8472fb3
renamed vidixlib.c to vidix.c
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27112 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-20 20:17:38 +00:00
ben
2bd0d969a6
allow conditionnal compilation of yuv4mpeg video out.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27103 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-20 19:33:32 +00:00
diego
f405167bbc
Add copyright and license statement.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27097 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-17 11:40:04 +00:00
Uoti Urpala
68e70b3ec3
Merge svn changes up to r27092
...
Conflicts:
libmpdemux/demuxer.c
libvo/vo_xv.c
mencoder.c
2008-06-17 05:04:32 +03:00
diego
2400f5b0d6
Add command to create dhahelper device to install-dhahelper target.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27032 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-08 14:18:51 +00:00
diego
4b34771463
Rename loader/driver.[ch] to loader/drv.[ch], otherwise loader/driver.h can
...
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
2008-06-08 10:43:30 +00:00
diego
108fff3efb
Add dhahelper CFLAGS where appropriate if enabled.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27030 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-08 10:41:09 +00:00
diego
cbef90d71f
Fix silly typo in CFLAG_SVGALIB_HELPER variable name.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27027 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-08 09:28:08 +00:00
Uoti Urpala
af3fcdf2de
Merge svn changes up to r27025
...
Conflicts:
command.c
libvo/vosub_vidix.c
libvo/vosub_vidix.h
mplayer.c
2008-06-07 19:57:57 +03:00
diego
4653f5ed75
Restore support for compiling with svgalib_helper.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27025 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 14:32:06 +00:00
diego
0ed0cb1af4
No need to set LC_ALL=C for individual shell commands,
...
it is already set from config.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27013 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 12:01:29 +00:00
diego
15729258fc
The VIDIX PCI files should be regenerated when the awk script
...
that creates them is changed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27012 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 11:53:29 +00:00
diego
8c2a0db59a
Remove unnecessary -o option from windres invocation.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26998 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-06 17:15:32 +00:00
diego
f9810c0dfb
Fix the linking of TOOLS/netstream and TOOLS/vivodump.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26995 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-06 13:28:25 +00:00
Uoti Urpala
d5c868325c
Merge svn changes up to r26979
...
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
2008-06-04 08:10:48 +03:00
diego
74aa81596c
Add install-dhahelperwin target to simplify dhahelper installation on Windows.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26936 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-30 20:10:36 +00:00
diego
13d53795d9
Merge vidix/dhahelperwin/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26935 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-30 20:09:31 +00:00
diego
5d87f6d9ca
Merge vidix/dhahelper/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26934 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-30 19:39:00 +00:00
diego
6feacc0cc4
The install-drivers target should depend on the drivers target.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26916 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-29 00:33:29 +00:00
diego
61b101497d
Merge drivers/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26914 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-28 12:40:15 +00:00
diego
1bb19a7f48
Move messages header file creation to a separate shell script.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26910 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 22:03:21 +00:00
diego
c9aed45201
Revert declaration .NOTPARALLEL. Unfortunately this special target does not
...
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
2008-05-27 16:46:30 +00:00
diego
b27e02e1b4
Mark VIDIX_PCI_FILES targets as NOTPARALLEL. They are all created
...
simultaneously by the same command.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26903 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 16:24:40 +00:00
diego
3447bd1d05
cosmetics: Move toolsclean target to a better place.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26896 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 11:37:50 +00:00
diego
d1f1b61d02
Update comment heading.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26895 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 11:31:57 +00:00
diego
e79064d885
cosmetics: Consistently place '-o $@' in compiler command line.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26894 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 11:29:23 +00:00
diego
5d7c1d1a37
Simplify codec-cfg-test command with $^.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26893 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 11:28:00 +00:00
diego
e236fc558e
Fix codecs2html linking.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26892 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 11:25:18 +00:00
diego
853c366adb
Merge doxygen_clean rule into distclean.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26891 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 11:24:07 +00:00
diego
2b085d7897
codecs2html and codec-cfg-test are removed by toolsclean. Do not remove
...
them redundantly upon distclean.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26890 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 11:22:55 +00:00
diego
4937b16c44
Add codecs2html to TESTS variable.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26889 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 11:21:19 +00:00
diego
00b5f90451
Fix dependency declaration for codecs2html.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26888 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 11:20:27 +00:00
diego
d3ff5799f9
cosmetics: Move some rules to better places.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26887 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 11:19:35 +00:00
diego
a10452836d
Add missing -I. to fix codecs2html compilation.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26886 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 11:14:24 +00:00
diego
cdbbd38e9b
Add codec-cfg-test to list of TESTS.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26885 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 11:13:43 +00:00
diego
196593fbd4
Correct dependency declaration for codec-cfg-test.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26884 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 11:09:17 +00:00
diego
250f52082d
There is no need to ignore the return value of an 'rm -rf' command.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26883 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 11:05:43 +00:00
diego
f4bd0813d5
Fix codec-cfg-test linking.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26882 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 09:11:13 +00:00
diego
db37cb2fe7
Link codec-cfg programs against mp_msg-mencoder.o instead of mp_msg.o.
...
The latter can pick up GUI dependencies.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26881 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 09:04:47 +00:00
reimar
793e5b324e
Get rid of "define RECURSIVE_RULE" since a lot of make version have problems
...
with it, especially with -j n.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26858 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-23 14:52:12 +00:00
diego
745662aafa
If character set conversion for help_mp.h is required, do it on the whole
...
file including the parts added from the English master file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26836 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-19 00:07:17 +00:00
diego
ab36efa0d7
The multiple inclusion guard in help_mp.h has to cover the whole file,
...
including the non-translated parts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26835 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-19 00:05:18 +00:00
diego
7016801bae
Simplify help_mp.h generation commands by using $@.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26834 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 23:58:05 +00:00
diego
ad9dc7735d
Do not hide that we are running a helper script.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26833 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 23:55:01 +00:00
diego
5f7c758c80
Move the logic that decides if untranslated messages need to be added to
...
help_mp.h into the helper script that generates those messages.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26832 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 23:33:46 +00:00
diego
955495414e
Replace hack to disable iconv conversion of messages with something more sane.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26831 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 23:16:30 +00:00
diego
929365575a
Remove unused strip target.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26828 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 17:40:00 +00:00
diego
5ae188e479
Merge directory installation commands.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26827 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 17:38:16 +00:00
diego
fec125516b
one less level of indirection for install and program targets
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26826 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 17:35:54 +00:00
diego
b96c2f2ed0
install-mplayer and install-mencoder targets should depend on install-dirs.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26823 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 17:16:43 +00:00
diego
7ac3e16660
Do not install DATADIR always, the GUI installation target takes care of this.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26822 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 17:12:49 +00:00
diego
74c67fee1f
Install the required man page directories in the man page targets.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26821 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 17:05:55 +00:00
diego
6a8693845c
Replace hackish shell loops for man page installation with make constructs.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26820 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 17:05:16 +00:00
diego
2ac55e2331
Create directories for the translated man pages in the install-dirs target.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26819 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 16:43:17 +00:00
diego
049d820592
Introduce make variable common to the GTK and Windows GUI and use it
...
in the appropriate places.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26817 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 16:25:20 +00:00
diego
63b29dabbc
install-mencoder-man depends on install-mplayer-man.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26816 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 16:20:17 +00:00
diego
3661a18bd7
Replace shell for loop with proper foreach make construct in uninstall target.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26815 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 16:16:39 +00:00
diego
69c70193c7
Always uninstall English man pages instead of never.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26814 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 16:13:46 +00:00
diego
f931f2440e
Remove (hopefully obsolete) codecs.conf workaround.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26813 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 16:08:46 +00:00
diego
a6458b3065
Introduce a pattern rule for install-mplayer and install-mencoder targets.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26812 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 16:06:31 +00:00
diego
cdf6e749bc
Separate install-mencoder and install-mencoder-man targets.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26811 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 16:04:51 +00:00
diego
b53e8a4d01
The install-gui target depends on the install-mplayer target.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26810 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 16:03:44 +00:00
diego
4abe690d64
Simplify installation rules with $<.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26809 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 16:01:46 +00:00
diego
43686e0867
Do not remove gmplayer.1, it is never installed.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26808 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 15:53:55 +00:00
ben
a7807bac14
Sort alphabetically
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26805 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 14:55:26 +00:00
diego
925ab6050f
There is no need to ignore errors from 'rm -f' commands.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26804 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 14:23:45 +00:00
diego
fdb2bbc502
Remove skin download instructions, they have no place in the Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26803 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 14:14:15 +00:00
ben
dc6d14fb1b
Add support for AppleIR Remote as an input under Linux systems.
...
This requires Linux 2.6 with evdev and appleir drivers.
The keymapping is done to mimics the one that was done for MacOSX.
WARNING: Most distributions do not seems to bother and only let root
access to the device. Modify udev rules accordingly if you want regular
user to be able to use the remote.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26795 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 11:53:00 +00:00
Uoti Urpala
a41db36b22
Merge svn changes up to r26783
...
Conflicts:
Makefile
common.mak
configure
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_mkv.c
libvo/vo_xv.c
mplayer.c
2008-05-15 21:19:35 +03:00
diego
5c5c0bce57
Fix typo in install-gui target dependency.
...
patch by andrew, andrew.david.45 gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26754 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-13 07:58:41 +00:00
diego
08d224b68d
Remove unused file, it has never been compiled.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26740 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-11 14:25:47 +00:00
michael
57a3542801
AVOptions support.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26723 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 18:54:10 +00:00
reimar
f85e3daca5
Add . to windres include path (otherwise version.h is not found).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26714 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 12:38:35 +00:00
diego
f7924f3fdd
Add some comment headings to divide the Makefile into logical chapters.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26708 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-09 17:51:44 +00:00
diego
82b8b8dbe7
cosmetics: Move some stuff around for more logical grouping.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26707 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-09 17:47:19 +00:00
diego
f6318795de
FFmpeg parts no longer require extra -I CFLAGS.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26704 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-09 12:39:04 +00:00
diego
ed5f632ca1
Remove useless output.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26696 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-08 21:22:13 +00:00
Uoti Urpala
267a3f4c9c
Merge svn changes up to r26680
...
Conflicts:
Makefile
configure
osdep/timer-darwin.c
2008-05-07 13:15:37 +03:00
diego
2fb6c0aabf
Make the checkheaders target work non-recursively.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26662 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-03 15:57:54 +00:00
diego
d8fccf4d46
Only compile and use libmpeg2 AltiVec code when AltiVec is available. The
...
AltiVec code needs -maltivec to compile, but then AltiVec instructions
appear in other places of the code causing MPlayer to sigill.
Somehow upstream libmpeg2 manages not to sigill under what appear to be
the same circumstances. Enlightenment welcome.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26657 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-03 15:23:22 +00:00
reimar
a7b11f3927
realrtsp depends on librtsp/rtsp.c
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26633 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-01 16:22:52 +00:00
diego
011e976df9
Remove recurse target. Instead, make FFmpeg parts depend on the phony recurse
...
target so that their directories will be recursed unconditionally.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26632 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-01 14:02:35 +00:00
diego
a379dc48bc
Build libmpeg2 AltiVec code on PPC always, not just when AltiVec is available.
...
libmpeg2 decides on the correct functions to use at runtime.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26628 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-01 13:38:02 +00:00
Uoti Urpala
bec3b84f5e
Merge svn changes up to r26624
...
Conflicts:
Makefile
2008-05-01 08:18:50 +03:00
diego
cbc297c09d
Remove tools on distclean, not on clean.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26622 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 17:54:02 +00:00
diego
473a0b4e14
Add testclean target and make distclean depend upon it.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26621 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 17:53:38 +00:00
diego
c181f0c0cb
Introduce TEST_OBJS variable for objects to link all test files against
...
and share it with the tools.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26620 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 17:51:45 +00:00
diego
4d3d65af03
Set libdvdcss CFLAGS for dvdread from configure.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26619 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 15:36:17 +00:00
diego
c3c8df3691
whitespace cosmetics
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26618 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 14:42:16 +00:00
diego
9a79136888
Add new tests target to build all test programs and remove them on distclean.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26617 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 14:37:34 +00:00
diego
ac514e5d60
Link loader test files against mp_msg-mencoder.o instead of mp_msg.o.
...
The former does not pick up GUI dependencies.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26616 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 14:34:18 +00:00
diego
65b752b95b
Add compilation rule for libvo/aspecttest and (hackishly) fix linking.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26615 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 14:29:17 +00:00
diego
6671a91eaf
Add $(EXESUF) to test rules.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26613 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 14:12:11 +00:00
diego
b5ea65c04f
Remove unused fast_memcpy() function and link against the object that
...
contains fast_memcpy() instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26610 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 14:00:32 +00:00
diego
d9c0228488
cosmetics: Move some variable declarations to better places.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26609 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 13:58:26 +00:00
diego
089034fcd5
The recurse target does not depend on help_mp.h.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26606 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 12:38:38 +00:00
diego
06b5ea6b44
Make the default target depend on the recurse target again so that the
...
all necessary subdirectories are recursed by default.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26605 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 12:37:49 +00:00
diego
887c305ee7
Explicitly declare which dependency files need generated headers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26604 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 12:19:04 +00:00
diego
63ffa0af9e
Rebuild version.h only when the working directory was updated.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26601 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 10:57:45 +00:00
Uoti Urpala
431bf1f5b6
Merge svn changes up to r26599
2008-04-30 06:09:04 +03:00
diego
2e30b5c260
Move CFLAGS setting to configure.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26599 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 22:27:50 +00:00
diego
092b951e23
Link tools against mp_msg-mencoder.o instead of mp_msg.o.
...
The latter may depend on the GUI and cause link failures.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26596 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 09:19:03 +00:00
diego
39723967ed
Merge mpcommon.mak into Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26595 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 08:53:08 +00:00
diego
b4c9a8858f
cosmetics: Move version.h/help_mp.h generation rules to a better place.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26594 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 08:35:58 +00:00
diego
d663d7facb
10l: Add missing \ for line continuation.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26593 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 08:05:44 +00:00
diego
281fe4b483
Do not rebuild version.h at every Makefile change.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26592 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 08:04:59 +00:00
diego
838d308e41
Convert clean/distclean into non-recursive targets.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26591 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 07:37:35 +00:00
diego
e1d2feecca
Remove generated headers and generated helper binaries only on distclean.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26590 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 07:10:55 +00:00
diego
532b9ab814
Remove unnecessary dependency declaration.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26589 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 07:00:27 +00:00
Uoti Urpala
c57224ddec
Makefile: Fix RECURSIVE_RULE with nested subdirectories
...
The rule produces dependencies for .a files in subdirectories. After
moving FFmpeg subdirectories under ffmpeg/ "$(part)/$(part).a:" gave
results like "ffmpeg/libavutil/ffmpeg/libavutil.a:". Fix it to produce
"ffmpeg/libavutil/libavutil.a".
2008-04-29 05:39:13 +03:00
Uoti Urpala
06a35804f3
Merge svn changes up to r26587
...
Conflicts:
Makefile
configure
osdep/timer-darwin.c
2008-04-29 05:03:57 +03:00
diego
7398abf389
Get rid of now obsolete library rules and variables.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26587 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 18:34:59 +00:00
diego
71272215d4
cosmetics: Reorder commands in (dist)clean targets.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26586 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 18:12:45 +00:00
diego
2c5869a10b
Remove '-' prefix from 'rm -f' commands for consistency.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26585 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 18:12:07 +00:00
diego
75e96820c4
Merge now redundant clean and distclean rules into the top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26583 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 17:54:14 +00:00
diego
d4f42c4d46
Remove code for .depend generation, inclusion and related hacks.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26581 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 15:42:36 +00:00
diego
17e278294a
Run 'make depend', not 'make .depend' in FFmpeg subdirectories.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26579 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 15:36:00 +00:00
diego
d5dfadb697
Remove unnecessary CFLAGS hack.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26578 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 15:20:15 +00:00
diego
238670ae7c
Merge loader/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26573 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 14:01:58 +00:00
diego
928c5fb69d
Restore line mistakenly commented out in the last commit.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26572 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 13:31:00 +00:00
diego
558e30b12c
Make sure all autogenerated .h and .c files exist in the vidix subdirectory
...
before trying to create object or dependency files there.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26571 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 13:28:36 +00:00
diego
df22d5fd5d
Make OBJS depend on the recurse target instead of just the all target.
...
This fixes 'make mplayer' and 'make mencoder'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26557 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 11:22:25 +00:00
diego
caca521296
Remove .S files from list of files to generate dependencies for.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26556 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 10:44:59 +00:00
Uoti Urpala
5c2583a0ee
Make MPlayer build with a complete FFmpeg checkout in ffmpeg/
...
Instead of separate checkouts of the FFmpeg libavutil/, libavcodec/,
libavformat/, libpostproc/ subdirectories make MPlayer build with a
complete checkout of FFmpeg under ffmpeg/.
configure now creates config.mak and config.h at both the top level
and in ffmpeg/. The config.h files are identical. The config.mak for
FFmpeg has different include paths. The top-level common.mak and
subdir.mak are now used by libswscale only; the directories under
ffmpeg/ use the versions in ffmpeg/.
2008-04-28 12:16:12 +03:00
Uoti Urpala
2faffe2a7f
Merge svn changes up to r26555
2008-04-28 12:15:18 +03:00
diego
ae09115f2b
Merge mp3lib/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26555 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-27 22:53:18 +00:00
diego
835f0aaae6
Merge liba52/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26554 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-27 11:46:56 +00:00
diego
83740c48da
Merge libmpeg2/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26551 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 18:02:23 +00:00
diego
3f94c61854
Merge vidix/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26548 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 12:47:24 +00:00
diego
03bfbfb8ca
Mark alltools target as phony.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26546 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 10:59:33 +00:00
diego
21c9bd3b8b
Only compile libmpcodecs/ve_qtvideo.c on Windows.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26545 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 10:53:32 +00:00
diego
be85def657
Add alltools target and variable to build non-linking tools.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26544 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 09:31:05 +00:00
diego
062a179f5f
Only add vidix to parts when VIDIX is enabled.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26543 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 09:27:58 +00:00
diego
6b593fd363
Take Objective C files into account when generating dependencies.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26542 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 09:19:41 +00:00
Uoti Urpala
2b47fd59ab
Merge svn changes up to r26540
...
Conflicts:
Makefile
2008-04-26 09:39:09 +03:00
diego
ffed0ab3d2
Only add loader to parts if WIN32DLL is enabled.
...
Plus, some unrelated changes to mp3lib/Makefile committed by accident.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26539 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 16:58:31 +00:00
diego
61d97d630e
Merge dvdread/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26528 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:25:17 +00:00
diego
49aea49605
Merge libfaad2/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26526 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 23:11:16 +00:00
diego
cc339fac3a
Rename make variable DVDCSS_INTERNAL --> LIBDVDCSS_INTERNAL.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26525 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 22:30:50 +00:00
diego
4267826b6b
Merge libdvdcss/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26524 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 22:27:01 +00:00
diego
aaf2c51e8a
Merge libmpdemux/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26523 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 22:05:43 +00:00
diego
83f7e53eca
Explicitly include dependency information in top-level Makefile.
...
The inclusion is skipped in mpcommon.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26522 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 21:58:45 +00:00
diego
e7f6edf300
dependency generation infrastructure for C++ files
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26521 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 21:46:50 +00:00
diego
b5653b5698
Include mpcommon.mak before declaring dependencies, which require mpcommon.mak.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26520 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 17:41:19 +00:00
diego
1b7adb6822
Make sure necessary header files are created before recursing.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26519 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 17:26:57 +00:00
diego
9551fc7e63
Expand conditional addition of elements to variables with a form that permits
...
using two conditions. This allows getting rid of some ifeqs in Makefiles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26516 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 15:32:44 +00:00
diego
ab5d23b620
Merge stream/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26515 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 13:38:12 +00:00
diego
20ef914470
Merge libmpcodecs/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26514 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 13:04:50 +00:00
Uoti Urpala
70e0372a51
Merge svn changes up to r26510
...
r26469 and r26470 (which revert files to inferior versions "because
it's policy") are ignored.
2008-04-23 14:23:49 +03:00
Uoti Urpala
95a909b4fd
Makefile: Compile and link talloc.c
2008-04-23 13:41:06 +03:00
Uoti Urpala
9db0c118d3
Start of new option system
...
First part of option restructuring. The aim is to move option values
from a huge number of separate globals to a single non-global struct.
This part adds some support for parsing option values into such struct
instances, and moves one example option (fixed-vo) to the struct.
2008-04-23 13:41:05 +03:00
diego
c051bef87c
There is no need to remove .a files from subdirectories, they are only
...
created in the directories using recursive make.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26510 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 10:09:12 +00:00
diego
4e2837a2e8
Merge libvo/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26509 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 10:07:50 +00:00
diego
2bcda50ffe
Merge libao2/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26507 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 09:33:51 +00:00
diego
36add9a774
Merge tremor/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26503 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 23:05:27 +00:00
diego
a7dc8352ef
Only add loader to PARTS on x86.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26501 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 22:39:26 +00:00
diego
a936979f76
Create standard recursive rules from a template.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26499 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 22:00:37 +00:00
diego
916058bd22
Use directory name as library name template.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26498 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 21:51:41 +00:00
diego
da8d898ffe
Simplify phony target declaration.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26496 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 21:21:46 +00:00
diego
2d58dcd67c
Add an unconditional phony recurse rule and make the binaries depend on it.
...
This assures that all directories that use recursive make are descended into.
This way cross-directory dependencies are taken into account through the
.depend files that record them.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26495 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 21:20:42 +00:00
diego
88961299aa
Merge TOOLS/Makefile into the top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26487 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 08:50:38 +00:00
diego
7c76c4a6f6
Add dependency information to recursive rules. While more eager than strictly
...
necessary, this should err on the side of unneeded recursion instead of
missing a necessary rebuild.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26467 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-19 09:53:42 +00:00
diego
883033e8e3
Add missing recursive rule for libmpcodecs/libmpencoders.a.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26466 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-19 09:44:48 +00:00
diego
8c791b38fa
cosmetics: Sort recursive rules alphabetically.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26465 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-19 09:43:53 +00:00
diego
9818a95c58
per-file dependencies (for the non-recursive parts)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26464 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-18 22:49:17 +00:00
diego
a725babf25
Always generate dependency information. This also allows dropping the
...
hackish list of incorrect pseudo-dependencies.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26462 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-18 21:46:52 +00:00
diego
6187c8753b
10l: Rename remaining instances of $i to $lang.
...
patch by Andrew Savchenko, Bircoph list ru
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26457 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-18 07:16:22 +00:00
diego
93699de705
Add libpostproc to list of pseudo-dependencies.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26445 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 22:57:47 +00:00
diego
8dd605f5e4
Declare all clean targets phony in mpcommon.mak.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26444 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 21:23:27 +00:00
diego
b099ea9c85
The TAGS and tags targets are not phony.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26443 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 21:21:42 +00:00
diego
61baa13a58
Add gui subdirectories to DIRS instead of manually cleaning them.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26442 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 21:20:29 +00:00
diego
9e0b5dc7f2
Replace shell for loop by proper make foreach construct.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26441 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 21:13:05 +00:00
diego
0cf1308e21
Add Makefile variable for DVB OSD menu, saves one ifeq.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26434 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 10:44:21 +00:00
diego
7bd7e50709
Restore compilation of osdep/mplayer-rc.o.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26431 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 07:57:35 +00:00
uau
bfc3adaada
Makefile: Fix compilation on systems with dvb support
...
libmenu/menu_dvbin.c was added to sources if HAVE_DVBIN was defined,
even if LIBMENU was not defined. This caused a compilation failure on
systems with dvb support unless you ran configure with --enable-menu.
Fix by making compilation of menu_dvbin conditional on both HAVE_DVBIN
and LIBMENU.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26400 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 23:06:30 +00:00
diego
99405ac93c
Merge ./gui/Makefile into ./Makefile, one less instance of recursive make.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26398 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 17:45:02 +00:00
diego
196310b250
Ahem, libmenu objects should only be compiled when OSD menu is enabled.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26391 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 08:18:28 +00:00
ptt
14ad1adcf3
if it's 'for lang in...' it's better off to use $$lang as a variable next ;)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26383 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-10 10:55:39 +00:00
diego
b2f9633eab
10l: libass compilation should be conditional.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26379 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 18:33:26 +00:00
diego
dc8d47d1eb
Merge libaf/Makefile into Makefile, one less instance of recursive make.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26376 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 18:15:21 +00:00
diego
7bba082cb0
Restore osdep/mmap-os2.c compilation, which was accidentally removed.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26363 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 14:13:30 +00:00
diego
34db110473
cosmetics: Align columns.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26362 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 12:54:07 +00:00
diego
32824f5eca
Merge libass/Makefile into Makefile, one less recursive make directory.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26356 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 22:25:59 +00:00
diego
36d1b39c9e
cosmetics: Rename some shell variables to give them more descriptive names.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26355 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 22:11:17 +00:00
diego
c4a51ba068
cosmetics: Merge shell commands into one line.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26354 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 22:08:23 +00:00
diego
fa4f36202e
Do not suppress command output.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26353 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 22:07:03 +00:00
diego
ff191b8495
Merge osdep/Makefile into the top-level Makefile, thus getting rid
...
of recursive make in the osdep/ subdirectory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26352 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 18:25:30 +00:00
diego
f827599b48
Build all parts in the libmenu subdirectory nonrecursively.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26343 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-07 08:28:54 +00:00