Update for latest changes to linking dependencies.
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Wed, 9 Apr 2008 16:39:07 +0000 (16:39 +0000)
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Wed, 9 Apr 2008 16:39:07 +0000 (16:39 +0000)
git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@26365 b3059339-0415-0410-9bf9-f77b7e298cf2

TOOLS/Makefile

index 747327d..0921316 100644 (file)
@@ -13,7 +13,8 @@ OBJS = alaw-gen$(EXESUF) \
        subrip$(EXESUF) \
 #      vivodump$(EXESUF) \
 
-COMMON_LIBS = ../mp_msg.o ../mp_fifo.o ../osdep/libosdep.a -ltermcap -lm
+COMMON_LIBS = ../mp_msg.o ../mp_fifo.o ../osdep/$(TIMER) ../osdep/$(GETCH) \
+              -ltermcap -lm
 
 all: $(OBJS)
 
@@ -24,8 +25,7 @@ subrip$(EXESUF): subrip.c
 
 #FIXME: Linking is broken, help welcome.
 vivodump$(EXESUF): vivodump.c
-       $(CC) $(CFLAGS) -o $@ $< ../libmpdemux/libmpdemux.a \
-          ../stream/stream.a $(COMMON_LIBS)
+       $(CC) $(CFLAGS) -o $@ $< ../libmpdemux/libmpdemux.a $(COMMON_LIBS)
 
 fastmemcpybench: fastmemcpybench.c
        $(CC) $(CFLAGS) $< -o fastmem-mmx$(EXESUF)  -DNAME=\"mmx\"      -DHAVE_MMX