From b7ffad3d0ab50709c323a64ef24e7de919033a0a Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 27 Aug 2007 11:58:37 +0000 Subject: Move common link libs/objects into a variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24243 b3059339-0415-0410-9bf9-f77b7e298cf2 --- TOOLS/Makefile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'TOOLS') diff --git a/TOOLS/Makefile b/TOOLS/Makefile index 469bb606a4..a61fac6511 100644 --- a/TOOLS/Makefile +++ b/TOOLS/Makefile @@ -12,18 +12,19 @@ OBJS = alaw-gen$(EXESUF) \ 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 @@ NETSTREAM_DEPS = ../libmpdemux/libmpdemux.a \ ../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 -- cgit v1.2.3