comparison Makefile @ 26849:ad7c6de88369

Link codec-cfg programs against mp_msg-mencoder.o instead of mp_msg.o. The latter can pick up GUI dependencies.
author diego
date Tue, 27 May 2008 09:04:47 +0000
parents 039574a7dc1e
children 522c224661ee
comparison
equal deleted inserted replaced
26848:0adef34e9289 26849:ad7c6de88369
734 $(HOST_CC) -O -I. -DCODECS2HTML $< -o $@ 734 $(HOST_CC) -O -I. -DCODECS2HTML $< -o $@
735 735
736 codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf 736 codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
737 ./codec-cfg$(EXESUF) ./etc/codecs.conf > $@ 737 ./codec-cfg$(EXESUF) ./etc/codecs.conf > $@
738 738
739 codecs2html$(EXESUF): mp_msg.o 739 codecs2html$(EXESUF): mp_msg-mencoder.o
740 $(CC) -DCODECS2HTML codec-cfg.c $^ -o $@ 740 $(CC) -DCODECS2HTML codec-cfg.c $^ -o $@
741 741
742 codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o 742 codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg-mencoder.o osdep/getch2.o
743 $(CC) -I. -DTESTING codec-cfg.c mp_msg.o osdep/getch2.o -ltermcap -o $@ 743 $(CC) -I. -DTESTING codec-cfg.c mp_msg-mencoder.o osdep/getch2.o -ltermcap -o $@
744 744
745 osdep/mplayer-rc.o: osdep/mplayer.rc version.h 745 osdep/mplayer-rc.o: osdep/mplayer.rc version.h
746 $(WINDRES) -I. -o $@ $< 746 $(WINDRES) -I. -o $@ $<
747 747
748 # ./configure must be rerun if it changed 748 # ./configure must be rerun if it changed