Commit Graph
732 Commits
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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