summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-04-09 02:38:33 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-04-09 02:38:37 +0300
commit0e8c38c19bb851a6433922a8068dd4887e79699d (patch)
treede605f3b78aef8281a94633da945acfda0dba641 /Makefile
parent6dd56815b44471026b4bd7623b4c56dfc98f2731 (diff)
parentca242e5f73d3bff1006b373b123b4749a33f5bd7 (diff)
downloadmpv-0e8c38c19bb851a6433922a8068dd4887e79699d.tar.bz2
mpv-0e8c38c19bb851a6433922a8068dd4887e79699d.tar.xz
Merge svn changes up to r29154
Synchronizes runtime CPU detection handling in the build system with latest FFmpeg.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 90022d6b3c..d884632178 100644
--- a/Makefile
+++ b/Makefile
@@ -867,7 +867,9 @@ version.h: version.sh
###### dependency declarations / specific CFLAGS ######
# Make sure all generated header files are created.
-$(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): codecs.conf.h help_mp.h version.h
+codec-cfg.d codec-cfg.o: codecs.conf.h
+$(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h
+mpcommon.d mpcommon.o vobsub.d vobsub.o stream/stream_cddb.d stream/stream_cddb.o stream/network.d stream/network.o libmpdemux/muxer_avi.d libmpdemux/muxer_avi.o gui/win32/gui.d gui/win32/gui.o: version.h
libdvdcss/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS)
libdvdnav/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\"