[MPlayer-cvslog] r26365 - trunk/TOOLS/Makefile

[diego]

Author: diego
Date: Wed Apr  9 18:39:07 2008
New Revision: 26365

Log:
Update for latest changes to linking dependencies.


Modified:
   trunk/TOOLS/Makefile

Modified: trunk/TOOLS/Makefile
==============================================================================
--- trunk/TOOLS/Makefile	(original)
+++ trunk/TOOLS/Makefile	Wed Apr  9 18:39:07 2008
@@ -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