summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TOOLS/Makefile14
-rw-r--r--TOOLS/netstream/Makefile32
2 files changed, 34 insertions, 12 deletions
diff --git a/TOOLS/Makefile b/TOOLS/Makefile
index c0a25f403f..25ceb54ebd 100644
--- a/TOOLS/Makefile
+++ b/TOOLS/Makefile
@@ -2,8 +2,18 @@ include ../config.mak
CFLAGS = -I..
-OBJS = alaw-gen asfinfo avi-fix bios2dump cpuinfo dump_mp4 mem2dump movinfo \
- png2raw subrip fastmemcpybench vivodump
+OBJS = alaw-gen \
+ asfinfo \
+ avi-fix \
+ bios2dump \
+ cpuinfo \
+ dump_mp4 \
+ mem2dump \
+ movinfo \
+ png2raw \
+ subrip \
+ fastmemcpybench \
+ vivodump \
all: $(OBJS)
diff --git a/TOOLS/netstream/Makefile b/TOOLS/netstream/Makefile
index bafad47fe6..1e317d6b3d 100644
--- a/TOOLS/netstream/Makefile
+++ b/TOOLS/netstream/Makefile
@@ -18,16 +18,28 @@ all: netstream
# FIXME: linking is a mess that should be fixed properly some day
# it does not work with either GUI, live.com or libavformat enabled
-DEPS = $(MPROOT)/libmpdemux/libmpdemux.a \
- $(MPROOT)/libmpdvdkit2/libmpdvdkit.a \
- $(MPROOT)/libmpcodecs/native/minilzo.o \
- $(MPROOT)/libvo/aclib.o $(MPROOT)/libmpcodecs/img_format.o \
- $(MPROOT)/liba52/liba52.a $(MPROOT)/m_option.o \
- $(MPROOT)/m_struct.o $(MPROOT)/subreader.o \
- $(MPROOT)/mp_msg.o $(MPROOT)/osdep/shmem.o \
- $(MPROOT)/osdep/timer-*.o $(MPROOT)/osdep/strl.o \
- $(VORBIS_LIB) $(CDPARANOIA_LIB) $(Z_LIB) $(GIF_LIB) \
- $(SMBSUPPORT_LIB) $(LIVE_LIBS) $(ARCH_LIB) $(COMMON_LIBS) -lm
+DEPS = $(MPROOT)/libmpdemux/libmpdemux.a \
+ $(MPROOT)/libmpdvdkit2/libmpdvdkit.a \
+ $(MPROOT)/libmpcodecs/native/minilzo.o \
+ $(MPROOT)/libvo/aclib.o \
+ $(MPROOT)/libmpcodecs/img_format.o \
+ $(MPROOT)/liba52/liba52.a \
+ $(MPROOT)/m_option.o \
+ $(MPROOT)/m_struct.o \
+ $(MPROOT)/subreader.o \
+ $(MPROOT)/mp_msg.o \
+ $(MPROOT)/osdep/shmem.o \
+ $(MPROOT)/osdep/timer-*.o \
+ $(MPROOT)/osdep/strl.o \
+ $(VORBIS_LIB) \
+ $(CDPARANOIA_LIB) \
+ $(Z_LIB) \
+ $(GIF_LIB) \
+ $(SMBSUPPORT_LIB) \
+ $(LIVE_LIBS) \
+ $(ARCH_LIB) \
+ $(COMMON_LIBS) \
+ -lm \
ifeq ($(TARGET_WIN32),yes)
DEPS += $(MPROOT)/osdep/glob-win.o $(WIN32_LIB) -lwsock32