summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Build libdha statically like all the other libraries.diego2007-03-311-5/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22855 b3059339-0415-0410-9bf9-f77b7e298cf2
* Code cleanup: don't include a .c file in mplayer.c and fix a fewrathann2007-03-291-0/+1
| | | | | | | | | | | "implicit declaration of function ‘mplayer_put_key’" warnings Based on Attila's suggestions. Approved by Uoti and Ivan. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22841 b3059339-0415-0410-9bf9-f77b7e298cf2
* Linking hotfix, libavutil needs to come after libavcodec/libavformat.diego2007-03-241-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22816 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Reorder parts of the Makefile in order to group parts sensibly ↵diego2007-03-241-44/+45
| | | | | | together. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22814 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unconditionally add all subdirectories to PARTS. This way make clean alwaysdiego2007-03-241-15/+17
| | | | | | | descends into all subdirectories. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22813 b3059339-0415-0410-9bf9-f77b7e298cf2
* libavutil/ is not optional, compile it unconditionally.diego2007-03-241-4/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22811 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move the addition of osdep/mplayer-rc.o to a place where it actually gets ↵diego2007-03-241-3/+3
| | | | | | added to OBJS_MPLAYER. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22808 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove multistage recursion for the vidix subdirectory and recurse from thediego2007-03-241-1/+2
| | | | | | | top-level Makefile only. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22807 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move -I. to the front of CFLAGS, works around problems with headers fromdiego2007-03-191-1/+1
| | | | | | | other projects having the same names as MPlayer ones. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22742 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove commented-out -Wall CFLAGS, can be set from configure/config.mak.diego2007-03-191-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22741 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Move some parts around to make more sense overall.diego2007-03-131-19/+19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22559 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Move depend target in preparation for upcoming changes.diego2007-03-131-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22557 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename mp3lib/libMP3.a to mp3lib/libmp3.a for consistency.diego2007-03-131-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22554 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add common sources to .depend target.diego2007-03-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22543 b3059339-0415-0410-9bf9-f77b7e298cf2
* Handle common parts at the objects instead of at the sources level.diego2007-03-131-4/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22542 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf.h needs to be made before .depend.diego2007-03-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22541 b3059339-0415-0410-9bf9-f77b7e298cf2
* dirclean target was removed, don't mark as phony.diego2007-03-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22539 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove -DCODECS2HTML from .depend creation.diego2007-03-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22534 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add codec-cfg-test target.diego2007-03-111-1/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22517 b3059339-0415-0410-9bf9-f77b7e298cf2
* mplayer.c and mencoder.c are already in SRCS_MPLAYER and SRCS_MENCODERdiego2007-03-111-1/+1
| | | | | | | respectively, no need to add them separately for .depend generation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22513 b3059339-0415-0410-9bf9-f77b7e298cf2
* 'make clean' should remove generated binaries.diego2007-03-111-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22511 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge clean and dirclean targets.diego2007-03-111-4/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22510 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify strip parameter for install handling.diego2007-02-271-5/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22364 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify .depend file inclusion.diego2007-02-241-3/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22335 b3059339-0415-0410-9bf9-f77b7e298cf2
* some more consistency for the VIDIX installation.diego2007-02-231-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22329 b3059339-0415-0410-9bf9-f77b7e298cf2
* Split command/property handling from mplayer.c to a new file command.c.uau2007-02-211-0/+1
| | | | | | | | | Move some global and static variables under a struct that can be given as a parameter. Add a context argument to the property functions so that they do not have to depend on global/static variables. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22298 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move some subtitle handling from mplayer.c to mpcommon.c and share it with ↵reimar2007-02-171-0/+1
| | | | | | mencoder.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22251 b3059339-0415-0410-9bf9-f77b7e298cf2
* URL fixdiego2007-01-301-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22073 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Reorder install targets.diego2007-01-301-10/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22072 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark phony targets as such.diego2007-01-301-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22071 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace ifeq structure in the install target by a set of dependent targets.diego2007-01-301-10/+22
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22070 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not create font subdir of data directory, bitmap font support is deprecated.diego2007-01-251-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22017 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify install calls.diego2007-01-201-8/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21977 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove redundant informative output.diego2007-01-201-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21976 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't suppress make output during installation.diego2007-01-201-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21975 b3059339-0415-0410-9bf9-f77b7e298cf2
* some simplificationsdiego2007-01-201-5/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21974 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix mplayer-rc.o build.diego2006-12-071-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21528 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move the generation of osdep/mplayer-rc.o back to the top-level Makefile,diego2006-12-041-0/+6
| | | | | | | | having it as a part of osdep/libosdep.a is not enough. based on a patch by Zuxy Meng, zuxy.meng gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21489 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove suffix rules that are just copies of make builtin rules.diego2006-12-021-5/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21436 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add libav include paths to CFLAGS without indirection.diego2006-12-011-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21406 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unrecurse VIDIX installation.diego2006-11-281-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21352 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unrecurse VIDIX drivers uninstall.diego2006-11-281-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21351 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove one level of indirection on VIDIX install/uninstall.diego2006-11-281-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21350 b3059339-0415-0410-9bf9-f77b7e298cf2
* Shorten LIBAV_INC handling.diego2006-11-271-6/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21347 b3059339-0415-0410-9bf9-f77b7e298cf2
* Split muxers into a separate library that only MEncoder is linked against.diego2006-11-271-1/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21326 b3059339-0415-0410-9bf9-f77b7e298cf2
* libmpdemux has no subdirectories.diego2006-11-271-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21300 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explicit dependency information for libosd.a, this fixes MEncoder-onlydiego2006-11-261-1/+5
| | | | | | | build. Noticed by Torinthiel. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21273 b3059339-0415-0410-9bf9-f77b7e298cf2
* Linking hotfix, loader depends on osdep.diego2006-11-251-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21241 b3059339-0415-0410-9bf9-f77b7e298cf2
* FFmpeg-style conditional dependency declarationdiego2006-11-251-73/+43
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21225 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove superfluous comment.diego2006-11-251-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21222 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move osdep/mplayer.rc handling to the osdep Makefile.diego2006-11-251-6/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21205 b3059339-0415-0410-9bf9-f77b7e298cf2
* added mmap_anon to osdep lib. Used in loader for nownplourde2006-11-251-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21203 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make loader Makefile non-recursive.diego2006-11-251-11/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21201 b3059339-0415-0410-9bf9-f77b7e298cf2
* LIBS vs LDFLAGS typodiego2006-11-211-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21147 b3059339-0415-0410-9bf9-f77b7e298cf2
* Split libs that are dependencies and those that are just linker flags.diego2006-11-211-8/+10
| | | | | | | Fixes spurious rebuilds of MPlayer and MEncoder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21146 b3059339-0415-0410-9bf9-f77b7e298cf2
* Treat fontconfig and FreeType linker flags just like any other linker flag.diego2006-11-211-5/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21144 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: EXTRA_LIB_MENCODER --> EXTRALIBS_MENCODERdiego2006-11-211-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21140 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove libdha from LIBS_MPLAYER.diego2006-11-211-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21134 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move FFmpeg library dependencies into the Makefile just like everything else.diego2006-11-211-3/+19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21127 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge MPlayer-specific libs into one variable.diego2006-11-211-3/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21125 b3059339-0415-0410-9bf9-f77b7e298cf2
* Split libvo.a into two libs so that libosd.a can be used by MEncoder.diego2006-11-211-8/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21123 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove superfluous empty variable declaration.diego2006-11-211-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21122 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add VIDIX to LIBS_MPLAYER directly.diego2006-11-211-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21119 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for disabling MPlayer compilation.diego2006-11-201-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21107 b3059339-0415-0410-9bf9-f77b7e298cf2
* Oops, the loader stuff needs to be in COMMON_LIBS.diego2006-11-201-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21106 b3059339-0415-0410-9bf9-f77b7e298cf2
* Deliver dependency handling from redundancy.diego2006-11-201-25/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21105 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove MPlayer-specific dependencies from COMMON_DEPS.diego2006-11-201-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21104 b3059339-0415-0410-9bf9-f77b7e298cf2
* VIDIX is for MPlayer only.diego2006-11-201-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21103 b3059339-0415-0410-9bf9-f77b7e298cf2
* The GUI is only for MPlayer, not MEncoder.diego2006-11-201-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21102 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename variables for consistency.diego2006-11-201-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21101 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify gui and menu libs handling.diego2006-11-201-4/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21100 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Move some stuff around for better readability.diego2006-11-201-56/+52
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21099 b3059339-0415-0410-9bf9-f77b7e298cf2
* Clean up PARTS handling.diego2006-11-201-35/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21097 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unify dep/depend targets.diego2006-11-201-3/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21096 b3059339-0415-0410-9bf9-f77b7e298cf2
* Uninstall should run all parts unconditionally.diego2006-11-201-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21095 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove nonsense ifeq around MEncoder target and variable declaration.diego2006-11-201-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21094 b3059339-0415-0410-9bf9-f77b7e298cf2
* Put libdvdcss under a separate ifeq.diego2006-11-191-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21086 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename libdvdread to dvdread. We really only include only the dvdreaddiego2006-11-181-6/+6
| | | | | | | | subdirectory of libdvdread. This will also allow getting rid of some local modifications. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20997 b3059339-0415-0410-9bf9-f77b7e298cf2
* The addition of loader/ to PARTS depended on a non-existing variable.diego2006-11-101-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20835 b3059339-0415-0410-9bf9-f77b7e298cf2
* Disable linking mplayer (and internal static libavcodec) withrathann2006-11-091-1/+1
| | | | | | | | libmp3lame/faac/x264 if --disable-encoder=mp3lame/faac/x264 options are passed to configure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20827 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l: Overlooked one $(EXESUF) addition.diego2006-11-081-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20807 b3059339-0415-0410-9bf9-f77b7e298cf2
* Create binaries with proper executable suffix under Windows.diego2006-11-081-15/+19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20771 b3059339-0415-0410-9bf9-f77b7e298cf2