Mercurial > mplayer.hg
changeset 15773:7bae32bc0ed7
Avoid overly long lines to conform with the new general Makefile style.
| author | diego |
|---|---|
| date | Sun, 19 Jun 2005 23:39:08 +0000 |
| parents | d3d30585a9d2 |
| children | ed3fec6506c4 |
| files | TOOLS/Makefile TOOLS/netstream/Makefile |
| diffstat | 2 files changed, 34 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/TOOLS/Makefile Sun Jun 19 22:52:55 2005 +0000 +++ b/TOOLS/Makefile Sun Jun 19 23:39:08 2005 +0000 @@ -2,8 +2,18 @@ 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)
--- a/TOOLS/netstream/Makefile Sun Jun 19 22:52:55 2005 +0000 +++ b/TOOLS/netstream/Makefile Sun Jun 19 23:39:08 2005 +0000 @@ -18,16 +18,28 @@ # 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