summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-27 09:04:47 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-27 09:04:47 +0000
commitdb37cb2fe7c9b05399121c20df07a5f35a454305 (patch)
treebfebe2e84ee021baf061ce140005bfc76429dcea /Makefile
parent266f32ad0dab0fb75e198a1188b963a71be51a24 (diff)
downloadmpv-db37cb2fe7c9b05399121c20df07a5f35a454305.tar.bz2
mpv-db37cb2fe7c9b05399121c20df07a5f35a454305.tar.xz
Link codec-cfg programs against mp_msg-mencoder.o instead of mp_msg.o.
The latter can pick up GUI dependencies. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26881 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 488ae0c0e7..0433d694e1 100644
--- a/Makefile
+++ b/Makefile
@@ -736,11 +736,11 @@ codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
./codec-cfg$(EXESUF) ./etc/codecs.conf > $@
-codecs2html$(EXESUF): mp_msg.o
+codecs2html$(EXESUF): mp_msg-mencoder.o
$(CC) -DCODECS2HTML codec-cfg.c $^ -o $@
-codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o
- $(CC) -I. -DTESTING codec-cfg.c mp_msg.o osdep/getch2.o -ltermcap -o $@
+codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg-mencoder.o osdep/getch2.o
+ $(CC) -I. -DTESTING codec-cfg.c mp_msg-mencoder.o osdep/getch2.o -ltermcap -o $@
osdep/mplayer-rc.o: osdep/mplayer.rc version.h
$(WINDRES) -I. -o $@ $<