Commit Graph

562 Commits

Author SHA1 Message Date
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 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
diego c9b0ef9bca Get rid of recursive make for the input/ subdirectory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26340 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-06 23:09:06 +00:00
diego 730bff7914 100l: Revert previous accidental commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26337 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-06 21:52:50 +00:00
diego f4d87d3e88 Rename RTJPEG files so that filenames consist of lowercase name only.
Parts of the build system assume lowercase-only filenames.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26336 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-06 18:17:59 +00:00
diego 84376fec0b Add multiple inclusion guards to help_mp.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26333 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 16:29:10 +00:00
diego 63f2517dd2 Remove now useless PARTS-yes line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26319 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-01 22:00:54 +00:00
reimar f8fe49b504 Compile codec-cfg binary with -O, avoids problems due to compilers
not being well tested with optimizations disabled (e.g. ICC 10.1.008
generates a non-existing "rorw $8, %st(7)" instruction).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26090 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-24 13:04:29 +00:00
ben b04ef6f779 allow generation of ctags and etags
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25661 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-10 18:40:26 +00:00
diego f9455f34d0 Remove internal unrarlib copy, the new unrarexec code is a strict superset.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25468 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-20 10:10:26 +00:00
ulion df0f80508e Support using unrar executable to access rar-compressed vobsub files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25389 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-14 08:16:39 +00:00
uau d33703496c Add audio filter scaletempo
Patch by Robert Juliano, juliano.1 osu edu


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24924 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-01 06:52:38 +00:00
cehoyos 0174a38b37 Silence make's 'Please run configure again' if it was already run.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24288 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-29 10:12:24 +00:00
diego 84157efa5a Clean up the way get_path is handled: Compile get_path.c to an object to link
against instead of directly #including the C file and replace the many extern
declarations by a proper header file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24262 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 11:20:24 +00:00
diego f9c89b761f Also remove generated tools on distclean.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23719 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-04 18:53:39 +00:00
diego 0b89e7d75e Compile internal FFmpeg libraries only when configure enabled the static
version of the libraries.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23299 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-11 23:15:11 +00:00
reimar 1640f55dec mplayer.rc depends on version.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23238 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-05 20:40:37 +00:00
diego 1e7e180106 Reuse common Makefile infrastructure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23200 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-01 19:16:35 +00:00
diego 81a86e4f1e cosmetics: Move depend target (preparation for upcoming change).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23199 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-01 19:15:29 +00:00
diego 167bafa26f cosmetics: Rename Makefile variable CONFIG_ASS --> ASS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23111 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-25 08:38:04 +00:00
diego 5a8c8aadef cosmetics: Remove CONFIG_ prefix from FFmpeg library Makefile variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23110 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-25 08:35:35 +00:00
diego 5c9abf7f9f Gui --> gui
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23095 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-23 07:42:42 +00:00
diego 8f9626479d cosmetics: Sort PARTS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23091 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-22 21:48:20 +00:00