# HG changeset patch # User diego # Date 1188215917 0 # Node ID 94cc5e5774ade8ec6d36b2b8d3c4d857e080b7fc # Parent 3ef118371df9260d5914629b6c3406aabf4581ad Move common link libs/objects into a variable. diff -r 3ef118371df9 -r 94cc5e5774ad TOOLS/Makefile --- a/TOOLS/Makefile Mon Aug 27 11:52:21 2007 +0000 +++ b/TOOLS/Makefile Mon Aug 27 11:58:37 2007 +0000 @@ -12,18 +12,19 @@ subrip$(EXESUF) \ # vivodump$(EXESUF) \ +COMMON_LIBS = ../mp_msg.o ../mp_fifo.o ../osdep/libosdep.a -ltermcap -lm + all: $(OBJS) subrip$(EXESUF): subrip.c - $(CC) $(CFLAGS) -g -o $@ $< ../vobsub.o ../spudec.o ../mp_msg.o \ + $(CC) $(CFLAGS) -g -o $@ $< ../vobsub.o ../spudec.o \ ../unrarlib.o ../libswscale/libswscale.a ../libavutil/libavutil.a \ - ../libmpcodecs/img_format.o ../mp_fifo.o ../osdep/libosdep.a \ - -ltermcap -lm + ../libmpcodecs/img_format.o $(COMMON_LIBS) #FIXME: Linking is broken, help welcome. vivodump$(EXESUF): vivodump.c - $(CC) $(CFLAGS) -o $@ $< ../mp_msg.o ../libmpdemux/libmpdemux.a \ - ../stream/stream.a ../mp_fifo.o ../osdep/libosdep.a -ltermcap -lm + $(CC) $(CFLAGS) -o $@ $< ../libmpdemux/libmpdemux.a \ + ../stream/stream.a $(COMMON_LIBS) fastmemcpybench: fastmemcpybench.c $(CC) $(CFLAGS) -g $< -o fastmem-mmx$(EXESUF) -DNAME=\"mmx\" -DHAVE_MMX @@ -59,10 +60,7 @@ ../libavutil/libavutil.a \ ../m_option.o \ ../m_struct.o \ - ../mp_msg.o \ - ../mp_fifo.o \ - ../osdep/libosdep.a \ - -ltermcap -lm \ + $(COMMON_LIBS) ifeq ($(TARGET_WIN32),yes) NETSTREAM_DEPS += -lwsock32