Commit Graph

489 Commits

Author SHA1 Message Date
diego 12d6e5b2c0 Add common sources to .depend target.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22543 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 00:37:29 +00:00
diego 1e4055ebdd Handle common parts at the objects instead of at the sources level.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22542 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 00:34:56 +00:00
diego f07e14645d codecs.conf.h needs to be made before .depend.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22541 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-12 23:53:40 +00:00
diego 74c95fdffb dirclean target was removed, don't mark as phony.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22539 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-12 23:24:42 +00:00
diego af236fbe0f Remove -DCODECS2HTML from .depend creation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22534 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-12 18:33:50 +00:00
diego af4cbb98a0 Add codec-cfg-test target.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22517 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-11 17:44:10 +00:00
diego 7454f57944 mplayer.c and mencoder.c are already in SRCS_MPLAYER and SRCS_MENCODER
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
2007-03-11 16:26:13 +00:00
diego 8473473515 'make clean' should remove generated binaries.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22511 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-11 16:16:21 +00:00
diego d3a6ef50c3 Merge clean and dirclean targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22510 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-11 16:07:36 +00:00
diego 6f1e593089 Simplify strip parameter for install handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22364 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-27 17:10:11 +00:00
diego 50aaf4a1d4 Simplify .depend file inclusion.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22335 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-24 10:44:16 +00:00
diego ac8d43dbed some more consistency for the VIDIX installation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22329 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-23 22:14:15 +00:00
uau d5d4c6c7e2 Split command/property handling from mplayer.c to a new file command.c.
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
2007-02-21 00:49:24 +00:00
reimar 4b774aacd1 Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22251 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-17 21:04:46 +00:00
diego d82ed3ea08 URL fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22073 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-30 11:02:37 +00:00
diego 0ef2659ddc cosmetics: Reorder install targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22072 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-30 11:02:19 +00:00
diego c98258efb8 Mark phony targets as such.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22071 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-30 11:01:10 +00:00
diego 37f9005da1 Replace ifeq structure in the install target by a set of dependent targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22070 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-30 11:00:54 +00:00
diego 3c991851c4 Do not create font subdir of data directory, bitmap font support is deprecated.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22017 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-25 18:06:21 +00:00
diego 36a3d4ef74 Simplify install calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21977 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 21:57:57 +00:00
diego e34daff688 Remove redundant informative output.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21976 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 21:55:57 +00:00
diego ba848192b8 Don't suppress make output during installation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21975 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 21:55:30 +00:00
diego c87711f2f7 some simplifications
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21974 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 21:39:21 +00:00
diego 2266d94b08 Fix mplayer-rc.o build.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21528 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 13:55:39 +00:00
diego cde348cd47 Move the generation of osdep/mplayer-rc.o back to the top-level Makefile,
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
2006-12-04 11:59:23 +00:00
diego c00059b047 Remove suffix rules that are just copies of make builtin rules.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21436 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 12:08:25 +00:00
diego b125a9e129 Add libav include paths to CFLAGS without indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21406 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 01:11:42 +00:00
diego a986aade52 Unrecurse VIDIX installation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21352 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 10:04:41 +00:00
diego b6adddcbbc Unrecurse VIDIX drivers uninstall.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21351 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 09:36:39 +00:00
diego 5dbf242b15 Remove one level of indirection on VIDIX install/uninstall.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21350 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 09:33:53 +00:00
diego b78cffaa84 Shorten LIBAV_INC handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21347 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 22:57:42 +00:00
diego 02436df5fc Split muxers into a separate library that only MEncoder is linked against.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21326 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 14:26:52 +00:00
diego 3d9e9137d5 libmpdemux has no subdirectories.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21300 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 01:01:50 +00:00
diego 08544e86ac Add explicit dependency information for libosd.a, this fixes MEncoder-only
build.  Noticed by Torinthiel.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21273 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 16:31:47 +00:00
diego 838f55e20b Linking hotfix, loader depends on osdep.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21241 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 18:24:58 +00:00
diego e2d12a60b4 FFmpeg-style conditional dependency declaration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21225 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 16:49:29 +00:00
diego 27b0177662 Remove superfluous comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21222 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 16:12:36 +00:00
diego bfce0b673d Move osdep/mplayer.rc handling to the osdep Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21205 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 09:49:18 +00:00
nplourde ac04dcd625 added mmap_anon to osdep lib. Used in loader for now
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21203 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 01:22:20 +00:00
diego 58a9204e79 Make loader Makefile non-recursive.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21201 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 00:31:07 +00:00
diego db1997e695 LIBS vs LDFLAGS typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21147 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 17:58:39 +00:00
diego 37fd66bd41 Split libs that are dependencies and those that are just linker flags.
Fixes spurious rebuilds of MPlayer and MEncoder.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21146 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 17:42:20 +00:00
diego 84cbc3b50c Treat fontconfig and FreeType linker flags just like any other linker flag.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21144 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 17:20:32 +00:00
diego d021529c71 cosmetics: EXTRA_LIB_MENCODER --> EXTRALIBS_MENCODER
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21140 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 16:23:35 +00:00
diego 95de8f239f Remove libdha from LIBS_MPLAYER.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21134 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 15:40:53 +00:00
diego cc9eb2aac3 Move FFmpeg library dependencies into the Makefile just like everything else.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21127 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 12:49:46 +00:00
diego 43c4abaf0c Merge MPlayer-specific libs into one variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21125 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 12:12:19 +00:00
diego 6178e38e46 Split libvo.a into two libs so that libosd.a can be used by MEncoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21123 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:49:47 +00:00
diego 3f6df7b998 Remove superfluous empty variable declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21122 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:35:41 +00:00
diego 91a713bcc7 Add VIDIX to LIBS_MPLAYER directly.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21119 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:21:09 +00:00