From 6970e8419b9a6c793ecc9ef4ecc5cccba098118b Mon Sep 17 00:00:00 2001 From: hyc Date: Wed, 3 Mar 2010 01:34:56 +0000 Subject: [PATCH] Move rtmp.o, amf.o, log.o, hashswf.o to librtmp.a git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@278 400ebc74-4327-4243-bc38-086b20814532 --- Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 94852aa..aaa43c8 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,6 @@ LDFLAGS=-Wall $(XLDFLAGS) LIBS=-lcrypto -lz THREADLIB=-lpthread SLIBS=$(THREADLIB) $(LIBS) -RTMP_OBJS=rtmp.o log.o amf.o EXT= @@ -32,18 +31,21 @@ cross: @$(MAKE) CROSS_COMPILE=armv7a-angstrom-linux-gnueabi- INC=-I/OE/tmp/staging/armv7a-angstrom-linux-gnueabi/usr/include $(MAKEFLAGS) progs clean: - rm -f *.o rtmpdump$(EXT) streams$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) + rm -f *.o *.a rtmpdump$(EXT) streams$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) -rtmpdump: rtmpdump.o $(RTMP_OBJS) parseurl.o hashswf.o +librtmp.a: rtmp.o log.o amf.o hashswf.o + $(AR) rs $@ $? + +rtmpdump: rtmpdump.o parseurl.o librtmp.a $(CC) $(LDFLAGS) $^ -o $@$(EXT) $(LIBS) -rtmpsrv: rtmpsrv.o $(RTMP_OBJS) thread.o +rtmpsrv: rtmpsrv.o thread.o librtmp.a $(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS) -rtmpsuck: rtmpsuck.o $(RTMP_OBJS) hashswf.o thread.o +rtmpsuck: rtmpsuck.o thread.o librtmp.a $(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS) -streams: streams.o $(RTMP_OBJS) parseurl.o hashswf.o thread.o +streams: streams.o parseurl.o thread.o librtmp.a $(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS) log.o: log.c log.h Makefile -- 2.40.0