diff Makefile @ 26963:8825552ee585

Fix the linking of TOOLS/netstream and TOOLS/vivodump.

--- a/Makefile	Fri Jun 06 00:45:35 2008 +0000
+++ b/Makefile	Fri Jun 06 13:28:25 2008 +0000
@@ -898,7 +898,9 @@
         TOOLS/compare$(EXESUF) \
         TOOLS/dump_mp4$(EXESUF) \
         TOOLS/movinfo$(EXESUF) \
+        TOOLS/netstream$(EXESUF) \
         TOOLS/subrip$(EXESUF) \
+        TOOLS/vivodump$(EXESUF) \
 
 ifdef ARCH_X86
 TOOLS += TOOLS/modify_reg$(EXESUF)
@@ -907,8 +909,6 @@
 ALLTOOLS = $(TOOLS) \
            TOOLS/bmovl-test$(EXESUF) \
            TOOLS/vfw2menc$(EXESUF) \
-           TOOLS/vivodump$(EXESUF) \
-           TOOLS/netstream$(EXESUF) \
 
 tools: $(TOOLS)
 alltools: $(ALLTOOLS)
@@ -924,8 +924,13 @@
 
 TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32
 
-#FIXME: Linking is broken, help welcome.
-TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c $(TEST_OBJS)
+mplayer-nomain.o: mplayer.c
+	$(CC) $(CFLAGS) -DDISABLE_MAIN -c -o $@ $<
+
+TOOLS/netstream$(EXESUF): TOOLS/netstream.c $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS)
+TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS)
+TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF):
+	$(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(COMMON_LDFLAGS)
 
 fastmemcpybench: TOOLS/fastmemcpybench.c
 	$(CC) $(CFLAGS) $< -o TOOLS/fastmem-mmx$(EXESUF)  -DNAME=\"mmx\"      -DHAVE_MMX
@@ -947,16 +952,6 @@
 %.so.6.0: %.o
 	ld -shared -o $@ $< -ldl -lc
 
-# FIXME: netstream linking is a mess that should be fixed properly some day.
-# It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled.
-NETSTREAM_DEPS = libavutil/libavutil.a \
-                 m_option.o \
-                 m_struct.o \
-                 $(TEST_OBJS)
-
-TOOLS/netstream$(EXESUF): TOOLS/netstream.o $(NETSTREAM_DEPS)
-	$(CC) $(CFLAGS) -o $@ $^
-
 
 
 ###### drivers #######