diego
03bfbfb8ca
Mark alltools target as phony.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26546 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 10:59:33 +00:00
diego
21c9bd3b8b
Only compile libmpcodecs/ve_qtvideo.c on Windows.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26545 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 10:53:32 +00:00
diego
be85def657
Add alltools target and variable to build non-linking tools.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26544 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 09:31:05 +00:00
diego
062a179f5f
Only add vidix to parts when VIDIX is enabled.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26543 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 09:27:58 +00:00
diego
6b593fd363
Take Objective C files into account when generating dependencies.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26542 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 09:19:41 +00:00
diego
ffed0ab3d2
Only add loader to parts if WIN32DLL is enabled.
...
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
2008-04-25 16:58:31 +00:00
diego
61d97d630e
Merge dvdread/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26528 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:25:17 +00:00
diego
49aea49605
Merge libfaad2/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26526 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 23:11:16 +00:00
diego
cc339fac3a
Rename make variable DVDCSS_INTERNAL --> LIBDVDCSS_INTERNAL.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26525 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 22:30:50 +00:00
diego
4267826b6b
Merge libdvdcss/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26524 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 22:27:01 +00:00
diego
aaf2c51e8a
Merge libmpdemux/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26523 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 22:05:43 +00:00
diego
83f7e53eca
Explicitly include dependency information in top-level Makefile.
...
The inclusion is skipped in mpcommon.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26522 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 21:58:45 +00:00
diego
e7f6edf300
dependency generation infrastructure for C++ files
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26521 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 21:46:50 +00:00
diego
b5653b5698
Include mpcommon.mak before declaring dependencies, which require mpcommon.mak.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26520 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 17:41:19 +00:00
diego
1b7adb6822
Make sure necessary header files are created before recursing.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26519 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 17:26:57 +00:00
diego
9551fc7e63
Expand conditional addition of elements to variables with a form that permits
...
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
2008-04-24 15:32:44 +00:00
diego
ab5d23b620
Merge stream/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26515 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 13:38:12 +00:00
diego
20ef914470
Merge libmpcodecs/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26514 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 13:04:50 +00:00
diego
c051bef87c
There is no need to remove .a files from subdirectories, they are only
...
created in the directories using recursive make.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26510 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 10:09:12 +00:00
diego
4e2837a2e8
Merge libvo/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26509 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 10:07:50 +00:00
diego
2bcda50ffe
Merge libao2/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26507 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 09:33:51 +00:00
diego
36add9a774
Merge tremor/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26503 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 23:05:27 +00:00
diego
a7dc8352ef
Only add loader to PARTS on x86.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26501 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 22:39:26 +00:00
diego
a936979f76
Create standard recursive rules from a template.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26499 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 22:00:37 +00:00
diego
916058bd22
Use directory name as library name template.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26498 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 21:51:41 +00:00
diego
da8d898ffe
Simplify phony target declaration.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26496 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 21:21:46 +00:00
diego
2d58dcd67c
Add an unconditional phony recurse rule and make the binaries depend on it.
...
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
2008-04-22 21:20:42 +00:00
diego
88961299aa
Merge TOOLS/Makefile into the top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26487 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 08:50:38 +00: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
