aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
Commit message (Collapse)AuthorAge
* Make MPlayer build with a complete FFmpeg checkout in ffmpeg/Gravatar Uoti Urpala2008-04-28
| | | | | | | | | | | | 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/.
* Merge svn changes up to r26555Gravatar Uoti Urpala2008-04-28
|\
| * Merge mp3lib/Makefile into top-level Makefile.Gravatar diego2008-04-27
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26555 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge liba52/Makefile into top-level Makefile.Gravatar diego2008-04-27
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26554 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libmpeg2/Makefile into top-level Makefile.Gravatar diego2008-04-26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26551 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge vidix/Makefile into top-level Makefile.Gravatar diego2008-04-26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26548 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark alltools target as phony.Gravatar diego2008-04-26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26546 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only compile libmpcodecs/ve_qtvideo.c on Windows.Gravatar diego2008-04-26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26545 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add alltools target and variable to build non-linking tools.Gravatar diego2008-04-26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26544 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only add vidix to parts when VIDIX is enabled.Gravatar diego2008-04-26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26543 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Take Objective C files into account when generating dependencies.Gravatar diego2008-04-26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26542 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26540Gravatar Uoti Urpala2008-04-26
|\| | | | | | | | | | | Conflicts: Makefile
| * Only add loader to parts if WIN32DLL is enabled.Gravatar diego2008-04-25
| | | | | | | | | | | | | | 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
| * Merge dvdread/Makefile into top-level Makefile.Gravatar diego2008-04-25
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26528 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libfaad2/Makefile into top-level Makefile.Gravatar diego2008-04-24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26526 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename make variable DVDCSS_INTERNAL --> LIBDVDCSS_INTERNAL.Gravatar diego2008-04-24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26525 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libdvdcss/Makefile into top-level Makefile.Gravatar diego2008-04-24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26524 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libmpdemux/Makefile into top-level Makefile.Gravatar diego2008-04-24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26523 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Explicitly include dependency information in top-level Makefile.Gravatar diego2008-04-24
| | | | | | | | | | | | | | The inclusion is skipped in mpcommon.mak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26522 b3059339-0415-0410-9bf9-f77b7e298cf2
| * dependency generation infrastructure for C++ filesGravatar diego2008-04-24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26521 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Include mpcommon.mak before declaring dependencies, which require mpcommon.mak.Gravatar diego2008-04-24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26520 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure necessary header files are created before recursing.Gravatar diego2008-04-24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26519 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Expand conditional addition of elements to variables with a form that permitsGravatar diego2008-04-24
| | | | | | | | | | | | | | 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
| * Merge stream/Makefile into top-level Makefile.Gravatar diego2008-04-24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26515 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libmpcodecs/Makefile into top-level Makefile.Gravatar diego2008-04-24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26514 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26510Gravatar Uoti Urpala2008-04-23
|\| | | | | | | | | r26469 and r26470 (which revert files to inferior versions "because it's policy") are ignored.
* | Makefile: Compile and link talloc.cGravatar Uoti Urpala2008-04-23
| |
* | Start of new option systemGravatar Uoti Urpala2008-04-23
| | | | | | | | | | | | | | | | 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.
| * There is no need to remove .a files from subdirectories, they are onlyGravatar diego2008-04-23
| | | | | | | | | | | | | | created in the directories using recursive make. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26510 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libvo/Makefile into top-level Makefile.Gravatar diego2008-04-23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26509 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libao2/Makefile into top-level Makefile.Gravatar diego2008-04-23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26507 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge tremor/Makefile into top-level Makefile.Gravatar diego2008-04-22
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26503 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only add loader to PARTS on x86.Gravatar diego2008-04-22
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26501 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Create standard recursive rules from a template.Gravatar diego2008-04-22
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26499 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use directory name as library name template.Gravatar diego2008-04-22
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26498 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify phony target declaration.Gravatar diego2008-04-22
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26496 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add an unconditional phony recurse rule and make the binaries depend on it.Gravatar diego2008-04-22
| | | | | | | | | | | | | | | | | | 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
| * Merge TOOLS/Makefile into the top-level Makefile.Gravatar diego2008-04-22
|/ | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26487 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add dependency information to recursive rules. While more eager than strictlyGravatar diego2008-04-19
| | | | | | | | 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
* Add missing recursive rule for libmpcodecs/libmpencoders.a.Gravatar diego2008-04-19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26466 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Sort recursive rules alphabetically.Gravatar diego2008-04-19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26465 b3059339-0415-0410-9bf9-f77b7e298cf2
* per-file dependencies (for the non-recursive parts)Gravatar diego2008-04-18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26464 b3059339-0415-0410-9bf9-f77b7e298cf2
* Always generate dependency information. This also allows dropping theGravatar diego2008-04-18
| | | | | | | hackish list of incorrect pseudo-dependencies. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26462 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l: Rename remaining instances of $i to $lang.Gravatar diego2008-04-18
| | | | | | | patch by Andrew Savchenko, Bircoph list ru git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26457 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add libpostproc to list of pseudo-dependencies.Gravatar diego2008-04-13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26445 b3059339-0415-0410-9bf9-f77b7e298cf2
* Declare all clean targets phony in mpcommon.mak.Gravatar diego2008-04-13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26444 b3059339-0415-0410-9bf9-f77b7e298cf2
* The TAGS and tags targets are not phony.Gravatar diego2008-04-13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26443 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add gui subdirectories to DIRS instead of manually cleaning them.Gravatar diego2008-04-13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26442 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace shell for loop by proper make foreach construct.Gravatar diego2008-04-13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26441 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add Makefile variable for DVB OSD menu, saves one ifeq.Gravatar diego2008-04-13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26434 b3059339-0415-0410-9bf9-f77b7e298cf2