summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-08-12 15:03:34 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-08-12 15:03:34 +0300
commite09fe1ce0413609b891f4abf2f5df5f1996622a0 (patch)
tree4624712ba8f4773463272c44513a86af6accc9da /Makefile
parent9425571f41d5cca40ec75537cdac3e474948f047 (diff)
parentf88bf0c7b7faf4b6f58c8b4c9c0f3892e07dc5ba (diff)
downloadmpv-e09fe1ce0413609b891f4abf2f5df5f1996622a0.tar.bz2
mpv-e09fe1ce0413609b891f4abf2f5df5f1996622a0.tar.xz
Merge svn changes up to r27458
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index a55d2944a5..a7998061cf 100644
--- a/Makefile
+++ b/Makefile
@@ -598,6 +598,7 @@ SRCS_MPLAYER-$(VIDIX_PM3) += vidix/pm3_vid.c
SRCS_MPLAYER-$(VIDIX_RADEON) += vidix/radeon_vid.c
SRCS_MPLAYER-$(VIDIX_RAGE128) += vidix/rage128_vid.c
SRCS_MPLAYER-$(VIDIX_S3) += vidix/s3_vid.c
+SRCS_MPLAYER-$(VIDIX_SH_VEU) += vidix/sh_veu_vid.c
SRCS_MPLAYER-$(VIDIX_SIS) += vidix/sis_vid.c vidix/sis_bridge.c
SRCS_MPLAYER-$(VIDIX_UNICHROME) += vidix/unichrome_vid.c
@@ -1058,7 +1059,13 @@ dhahelperwinclean:
+# Do not include dependencies when they are about to be removed anyway
+# or if SKIP_DEPS was set to "yes" on the command line.
+ifneq ($(MAKECMDGOALS),distclean)
+ifneq ($(SKIP_DEPS),yes)
-include $(DEPS)
+endif
+endif
.PHONY: all doxygen *install* *tools drivers dhahelper*
.PHONY: checkheaders *clean dep depend tests