summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r26599Uoti Urpala2008-04-301-33/+68
|\
| * Move CFLAGS setting to configure.diego2008-04-291-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26599 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Link tools against mp_msg-mencoder.o instead of mp_msg.o.diego2008-04-291-1/+1
| | | | | | | | | | | | | | 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
| * Merge mpcommon.mak into Makefile.diego2008-04-291-1/+28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26595 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Move version.h/help_mp.h generation rules to a better place.diego2008-04-291-22/+22
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26594 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 10l: Add missing \ for line continuation.diego2008-04-291-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26593 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not rebuild version.h at every Makefile change.diego2008-04-291-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26592 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Convert clean/distclean into non-recursive targets.diego2008-04-291-3/+14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26591 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove generated headers and generated helper binaries only on distclean.diego2008-04-291-4/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26590 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary dependency declaration.diego2008-04-291-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26589 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Makefile: Fix RECURSIVE_RULE with nested subdirectoriesUoti Urpala2008-04-291-1/+1
| | | | | | | | | | | | | | 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".
* | Merge svn changes up to r26587Uoti Urpala2008-04-291-24/+60
|\| | | | | | | | | | | | | | | Conflicts: Makefile configure osdep/timer-darwin.c
| * Get rid of now obsolete library rules and variables.diego2008-04-281-3/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26587 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Reorder commands in (dist)clean targets.diego2008-04-281-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26586 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove '-' prefix from 'rm -f' commands for consistency.diego2008-04-281-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26585 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge now redundant clean and distclean rules into the top-level Makefile.diego2008-04-281-3/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26583 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove code for .depend generation, inclusion and related hacks.diego2008-04-281-3/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26581 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Run 'make depend', not 'make .depend' in FFmpeg subdirectories.diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26579 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary CFLAGS hack.diego2008-04-281-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26578 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge loader/Makefile into top-level Makefile.diego2008-04-281-5/+41
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26573 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Restore line mistakenly commented out in the last commit.diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26572 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure all autogenerated .h and .c files exist in the vidix subdirectorydiego2008-04-281-2/+5
| | | | | | | | | | | | | | before trying to create object or dependency files there. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26571 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make OBJS depend on the recurse target instead of just the all target.diego2008-04-281-1/+3
| | | | | | | | | | | | | | This fixes 'make mplayer' and 'make mencoder'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26557 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove .S files from list of files to generate dependencies for.diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26556 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Make MPlayer build with a complete FFmpeg checkout in ffmpeg/Uoti Urpala2008-04-281-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | 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 r26555Uoti Urpala2008-04-281-20/+92
|\|
| * Merge mp3lib/Makefile into top-level Makefile.diego2008-04-271-3/+16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26555 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge liba52/Makefile into top-level Makefile.diego2008-04-271-4/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26554 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libmpeg2/Makefile into top-level Makefile.diego2008-04-261-3/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26551 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge vidix/Makefile into top-level Makefile.diego2008-04-261-7/+32
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26548 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark alltools target as phony.diego2008-04-261-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26546 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only compile libmpcodecs/ve_qtvideo.c on Windows.diego2008-04-261-1/+1
| | | | | | | | 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.diego2008-04-261-2/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26544 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only add vidix to parts when VIDIX is enabled.diego2008-04-261-1/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26543 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Take Objective C files into account when generating dependencies.diego2008-04-261-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26542 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26540Uoti Urpala2008-04-261-41/+375
|\| | | | | | | | | | | Conflicts: Makefile
| * Only add loader to parts if WIN32DLL is enabled.diego2008-04-251-1/+1
| | | | | | | | | | | | | | 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.diego2008-04-251-6/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26528 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libfaad2/Makefile into top-level Makefile.diego2008-04-241-2/+41
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26526 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename make variable DVDCSS_INTERNAL --> LIBDVDCSS_INTERNAL.diego2008-04-241-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26525 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libdvdcss/Makefile into top-level Makefile.diego2008-04-241-3/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26524 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libmpdemux/Makefile into top-level Makefile.diego2008-04-241-16/+73
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26523 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Explicitly include dependency information in top-level Makefile.diego2008-04-241-0/+2
| | | | | | | | | | | | | | 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++ filesdiego2008-04-241-1/+1
| | | | | | | | 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.diego2008-04-241-2/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26520 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure necessary header files are created before recursing.diego2008-04-241-1/+1
| | | | | | | | 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 permitsdiego2008-04-241-5/+3
| | | | | | | | | | | | | | 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.diego2008-04-241-3/+68
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26515 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libmpcodecs/Makefile into top-level Makefile.diego2008-04-241-12/+163
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26514 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26510Uoti Urpala2008-04-231-78/+129
|\| | | | | | | | | r26469 and r26470 (which revert files to inferior versions "because it's policy") are ignored.
| * There is no need to remove .a files from subdirectories, they are onlydiego2008-04-231-1/+1
| | | | | | | | | | | | | | 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.diego2008-04-231-7/+16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26509 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libao2/Makefile into top-level Makefile.diego2008-04-231-2/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26507 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge tremor/Makefile into top-level Makefile.diego2008-04-221-2/+16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26503 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only add loader to PARTS on x86.diego2008-04-221-1/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26501 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Create standard recursive rules from a template.diego2008-04-221-55/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26499 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use directory name as library name template.diego2008-04-221-10/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26498 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify phony target declaration.diego2008-04-221-1/+1
| | | | | | | | 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.diego2008-04-221-24/+27
| | | | | | | | | | | | | | | | | | 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.diego2008-04-221-3/+70
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26487 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Makefile: Compile and link talloc.cUoti Urpala2008-04-231-0/+1
| |
* | Start of new option systemUoti Urpala2008-04-231-0/+1
|/ | | | | | | | 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.
* Add dependency information to recursive rules. While more eager than strictlydiego2008-04-191-22/+22
| | | | | | | | 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.diego2008-04-191-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26466 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Sort recursive rules alphabetically.diego2008-04-191-27/+27
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26465 b3059339-0415-0410-9bf9-f77b7e298cf2
* per-file dependencies (for the non-recursive parts)diego2008-04-181-3/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26464 b3059339-0415-0410-9bf9-f77b7e298cf2
* Always generate dependency information. This also allows dropping thediego2008-04-181-50/+2
| | | |