1
mirror of https://github.com/mpv-player/mpv synced 2024-10-18 10:25:02 +02:00
Commit Graph

747 Commits

Author SHA1 Message Date
diego
4abe690d64 Simplify installation rules with $<.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26809 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 16:01:46 +00:00
diego
43686e0867 Do not remove gmplayer.1, it is never installed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26808 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 15:53:55 +00:00
ben
a7807bac14 Sort alphabetically
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26805 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 14:55:26 +00:00
diego
925ab6050f There is no need to ignore errors from 'rm -f' commands.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26804 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 14:23:45 +00:00
diego
fdb2bbc502 Remove skin download instructions, they have no place in the Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26803 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 14:14:15 +00:00
ben
dc6d14fb1b Add support for AppleIR Remote as an input under Linux systems.
This requires Linux 2.6 with evdev and appleir drivers.
The keymapping is done to mimics the one that was done for MacOSX.

WARNING: Most distributions do not seems to bother and only let root
access to the device. Modify udev rules accordingly if you want regular
user to be able to use the remote.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26795 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-18 11:53:00 +00:00
diego
5c5c0bce57 Fix typo in install-gui target dependency.
patch by andrew, andrew.david.45 gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26754 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-13 07:58:41 +00:00
diego
08d224b68d Remove unused file, it has never been compiled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26740 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-11 14:25:47 +00:00
michael
57a3542801 AVOptions support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26723 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 18:54:10 +00:00
reimar
f85e3daca5 Add . to windres include path (otherwise version.h is not found).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26714 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 12:38:35 +00:00
diego
f7924f3fdd Add some comment headings to divide the Makefile into logical chapters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26708 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-09 17:51:44 +00:00
diego
82b8b8dbe7 cosmetics: Move some stuff around for more logical grouping.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26707 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-09 17:47:19 +00:00
diego
f6318795de FFmpeg parts no longer require extra -I CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26704 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-09 12:39:04 +00:00
diego
ed5f632ca1 Remove useless output.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26696 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-08 21:22:13 +00:00
diego
2fb6c0aabf Make the checkheaders target work non-recursively.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26662 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-03 15:57:54 +00:00
diego
d8fccf4d46 Only compile and use libmpeg2 AltiVec code when AltiVec is available. The
AltiVec code needs -maltivec to compile, but then AltiVec instructions
appear in other places of the code causing MPlayer to sigill.
Somehow upstream libmpeg2 manages not to sigill under what appear to be
the same circumstances. Enlightenment welcome.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26657 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-03 15:23:22 +00:00
reimar
a7b11f3927 realrtsp depends on librtsp/rtsp.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26633 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-01 16:22:52 +00:00
diego
011e976df9 Remove recurse target. Instead, make FFmpeg parts depend on the phony recurse
target so that their directories will be recursed unconditionally.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26632 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-01 14:02:35 +00:00
diego
a379dc48bc Build libmpeg2 AltiVec code on PPC always, not just when AltiVec is available.
libmpeg2 decides on the correct functions to use at runtime.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26628 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-01 13:38:02 +00:00
diego
cbc297c09d Remove tools on distclean, not on clean.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26622 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 17:54:02 +00:00
diego
473a0b4e14 Add testclean target and make distclean depend upon it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26621 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 17:53:38 +00:00
diego
c181f0c0cb Introduce TEST_OBJS variable for objects to link all test files against
and share it with the tools.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26620 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 17:51:45 +00:00
diego
4d3d65af03 Set libdvdcss CFLAGS for dvdread from configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26619 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 15:36:17 +00:00
diego
c3c8df3691 whitespace cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26618 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 14:42:16 +00:00
diego
9a79136888 Add new tests target to build all test programs and remove them on distclean.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26617 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 14:37:34 +00:00
diego
ac514e5d60 Link loader test files against mp_msg-mencoder.o instead of mp_msg.o.
The former does not pick up GUI dependencies.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26616 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 14:34:18 +00:00
diego
65b752b95b Add compilation rule for libvo/aspecttest and (hackishly) fix linking.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26615 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 14:29:17 +00:00
diego
6671a91eaf Add $(EXESUF) to test rules.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26613 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 14:12:11 +00:00
diego
b5ea65c04f Remove unused fast_memcpy() function and link against the object that
contains fast_memcpy() instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26610 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 14:00:32 +00:00
diego
d9c0228488 cosmetics: Move some variable declarations to better places.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26609 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 13:58:26 +00:00
diego
089034fcd5 The recurse target does not depend on help_mp.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26606 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 12:38:38 +00:00
diego
06b5ea6b44 Make the default target depend on the recurse target again so that the
all necessary subdirectories are recursed by default.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26605 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 12:37:49 +00:00
diego
887c305ee7 Explicitly declare which dependency files need generated headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26604 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 12:19:04 +00:00
diego
63ffa0af9e Rebuild version.h only when the working directory was updated.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26601 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 10:57:45 +00:00
diego
2e30b5c260 Move CFLAGS setting to configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26599 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 22:27:50 +00:00
diego
092b951e23 Link tools against mp_msg-mencoder.o instead of mp_msg.o.
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
2008-04-29 09:19:03 +00:00
diego
39723967ed Merge mpcommon.mak into Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26595 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 08:53:08 +00:00
diego
b4c9a8858f cosmetics: Move version.h/help_mp.h generation rules to a better place.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26594 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 08:35:58 +00:00
diego
d663d7facb 10l: Add missing \ for line continuation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26593 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 08:05:44 +00:00
diego
281fe4b483 Do not rebuild version.h at every Makefile change.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26592 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 08:04:59 +00:00
diego
838d308e41 Convert clean/distclean into non-recursive targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26591 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 07:37:35 +00:00
diego
e1d2feecca Remove generated headers and generated helper binaries only on distclean.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26590 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 07:10:55 +00:00
diego
532b9ab814 Remove unnecessary dependency declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26589 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 07:00:27 +00:00
diego
7398abf389 Get rid of now obsolete library rules and variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26587 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 18:34:59 +00:00
diego
71272215d4 cosmetics: Reorder commands in (dist)clean targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26586 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 18:12:45 +00:00
diego
2c5869a10b Remove '-' prefix from 'rm -f' commands for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26585 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 18:12:07 +00:00
diego
75e96820c4 Merge now redundant clean and distclean rules into the top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26583 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 17:54:14 +00:00
diego
d4f42c4d46 Remove code for .depend generation, inclusion and related hacks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26581 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 15:42:36 +00:00
diego
17e278294a Run 'make depend', not 'make .depend' in FFmpeg subdirectories.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26579 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 15:36:00 +00:00
diego
d5dfadb697 Remove unnecessary CFLAGS hack.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26578 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 15:20:15 +00:00
diego
238670ae7c Merge loader/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26573 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 14:01:58 +00:00
diego
928c5fb69d Restore line mistakenly commented out in the last commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26572 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 13:31:00 +00:00
diego
558e30b12c Make sure all autogenerated .h and .c files exist in the vidix subdirectory
before trying to create object or dependency files there.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26571 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 13:28:36 +00:00
diego
df22d5fd5d Make OBJS depend on the recurse target instead of just the all target.
This fixes 'make mplayer' and 'make mencoder'.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26557 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 11:22:25 +00:00
diego
caca521296 Remove .S files from list of files to generate dependencies for.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26556 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 10:44:59 +00:00
diego
ae09115f2b Merge mp3lib/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26555 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-27 22:53:18 +00:00
diego
835f0aaae6 Merge liba52/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26554 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-27 11:46:56 +00:00
diego
83740c48da Merge libmpeg2/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26551 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 18:02:23 +00:00
diego
3f94c61854 Merge vidix/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26548 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 12:47:24 +00:00
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
diego
36d1b39c9e cosmetics: Rename some shell variables to give them more descriptive names.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26355 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 22:11:17 +00:00
diego
c4a51ba068 cosmetics: Merge shell commands into one line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26354 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 22:08:23 +00:00
diego
fa4f36202e Do not suppress command output.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26353 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 22:07:03 +00:00
diego
ff191b8495 Merge osdep/Makefile into the top-level Makefile, thus getting rid
of recursive make in the osdep/ subdirectory.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26352 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 18:25:30 +00:00
diego
f827599b48 Build all parts in the libmenu subdirectory nonrecursively.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26343 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-07 08:28:54 +00:00
diego
c9b0ef9bca Get rid of recursive make for the input/ subdirectory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26340 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-06 23:09:06 +00:00
diego
730bff7914 100l: Revert previous accidental commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26337 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-06 21:52:50 +00:00
diego
f4d87d3e88 Rename RTJPEG files so that filenames consist of lowercase name only.
Parts of the build system assume lowercase-only filenames.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26336 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-06 18:17:59 +00:00
diego
84376fec0b Add multiple inclusion guards to help_mp.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26333 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 16:29:10 +00:00
diego
63f2517dd2 Remove now useless PARTS-yes line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26319 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-01 22:00:54 +00:00
reimar
f8fe49b504 Compile codec-cfg binary with -O, avoids problems due to compilers
not being well tested with optimizations disabled (e.g. ICC 10.1.008
generates a non-existing "rorw $8, %st(7)" instruction).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26090 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-24 13:04:29 +00:00
ben
b04ef6f779 allow generation of ctags and etags
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25661 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-10 18:40:26 +00:00
diego
f9455f34d0 Remove internal unrarlib copy, the new unrarexec code is a strict superset.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25468 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-20 10:10:26 +00:00
ulion
df0f80508e Support using unrar executable to access rar-compressed vobsub files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25389 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-14 08:16:39 +00:00
uau
d33703496c Add audio filter scaletempo
Patch by Robert Juliano, juliano.1 osu edu


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24924 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-01 06:52:38 +00:00
cehoyos
0174a38b37 Silence make's 'Please run configure again' if it was already run.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24288 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-29 10:12:24 +00:00
diego
84157efa5a Clean up the way get_path is handled: Compile get_path.c to an object to link
against instead of directly #including the C file and replace the many extern
declarations by a proper header file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24262 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 11:20:24 +00:00
diego
f9c89b761f Also remove generated tools on distclean.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23719 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-04 18:53:39 +00:00
diego
0b89e7d75e Compile internal FFmpeg libraries only when configure enabled the static
version of the libraries.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23299 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-11 23:15:11 +00:00
reimar
1640f55dec mplayer.rc depends on version.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23238 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-05 20:40:37 +00:00
diego
1e7e180106 Reuse common Makefile infrastructure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23200 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-01 19:16:35 +00:00
diego
81a86e4f1e cosmetics: Move depend target (preparation for upcoming change).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23199 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-01 19:15:29 +00:00
diego
167bafa26f cosmetics: Rename Makefile variable CONFIG_ASS --> ASS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23111 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-25 08:38:04 +00:00
diego
5a8c8aadef cosmetics: Remove CONFIG_ prefix from FFmpeg library Makefile variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23110 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-25 08:35:35 +00:00
diego
5c9abf7f9f Gui --> gui
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23095 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-23 07:42:42 +00:00
diego
8f9626479d cosmetics: Sort PARTS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23091 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-22 21:48:20 +00:00
diego
0a6bfeaace Remove duplicate entries from PARTS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23089 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-22 20:57:38 +00:00
diego
b2fcb6f5b1 Remove redundant setting of variables when compiling FFmpeg libraries,
it's already being taken care of by configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22984 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-12 19:40:18 +00:00
diego
1dfa149ac5 Revert previous broken removal of partial dependency list.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22980 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-12 14:42:48 +00:00
diego
c6803b94cc Remove the .norecurse hack. It bloats the Makefile, adds maintenance burden,
likely has no users and most of all does not work correctly anyway.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22967 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-11 07:16:04 +00:00
diego
2276bef69c 10l typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22953 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-09 15:08:29 +00:00
diego
bf3fff69ca Move TOOLS/cpuinfo.c into the root directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22950 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-09 11:30:26 +00:00
ben
51ba40dcd6 merged libdha and libvidix, moved all files from libdha to vidix directory
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22918 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-06 15:20:49 +00:00
ben
257a77dc3d switch to new internal vidix API, no more dlopen/dlsym, libvidix is now a fully static library with all drivers built-in
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22875 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-01 11:06:06 +00:00
diego
b6d1ff3eec Merge all VIDIX drivers into libvidix.a.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22867 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-31 23:48:48 +00:00
diego
7bbb6e7043 Move the generation of OBJS_* from SRCS_* up before the addition of OBJS_*-yes
to OBJS_*.  The content of OBJS_*-yes was getting clobbered.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22862 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-31 18:12:16 +00:00
diego
d898f5c990 Build libdha statically like all the other libraries.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22855 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-31 13:37:29 +00:00
rathann
259cfbe7e2 Code cleanup: don't include a .c file in mplayer.c and fix a few
"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
2007-03-29 17:16:11 +00:00
diego
1cab6eae95 Linking hotfix, libavutil needs to come after libavcodec/libavformat.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22816 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-24 20:29:43 +00:00
diego
937a267a2b cosmetics: Reorder parts of the Makefile in order to group parts sensibly together.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22814 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-24 19:59:36 +00:00
diego
0b3c94b3fb Unconditionally add all subdirectories to PARTS. This way make clean always
descends into all subdirectories.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22813 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-24 19:56:00 +00:00