Commit Graph

627 Commits

Author SHA1 Message Date
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