| 1 | diff -u -r ../rtmpdump-2.4/librtmp/Makefile ./librtmp/Makefile |
| 2 | --- ../rtmpdump-2.4/librtmp/Makefile 2011-07-11 20:24:33.000000000 -0400 |
| 3 | +++ ./librtmp/Makefile 2016-09-26 10:28:04.467062011 -0400 |
| 4 | @@ -1,20 +1,14 @@ |
| 5 | VERSION=v2.4 |
| 6 | |
| 7 | -prefix=/usr/local |
| 8 | - |
| 9 | incdir=$(prefix)/include/librtmp |
| 10 | bindir=$(prefix)/bin |
| 11 | libdir=$(prefix)/lib |
| 12 | -mandir=$(prefix)/man |
| 13 | +mandir=$(prefix)/share/man |
| 14 | BINDIR=$(DESTDIR)$(bindir) |
| 15 | INCDIR=$(DESTDIR)$(incdir) |
| 16 | LIBDIR=$(DESTDIR)$(libdir) |
| 17 | MANDIR=$(DESTDIR)$(mandir) |
| 18 | |
| 19 | -CC=$(CROSS_COMPILE)gcc |
| 20 | -LD=$(CROSS_COMPILE)ld |
| 21 | -AR=$(CROSS_COMPILE)ar |
| 22 | - |
| 23 | SYS=posix |
| 24 | CRYPTO=OPENSSL |
| 25 | #CRYPTO=GNUTLS |
| 26 | @@ -67,8 +61,8 @@ |
| 27 | |
| 28 | DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) |
| 29 | OPT=-O2 |
| 30 | -CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF) |
| 31 | -LDFLAGS=$(XLDFLAGS) |
| 32 | +CFLAGS+=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF) |
| 33 | +LDFLAGS+=$(XLDFLAGS) |
| 34 | |
| 35 | |
| 36 | OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o |
| 37 | diff -u -r ../rtmpdump-2.4/Makefile ./Makefile |
| 38 | --- ../rtmpdump-2.4/Makefile 2011-07-11 20:24:33.000000000 -0400 |
| 39 | +++ ./Makefile 2016-09-26 10:54:28.163216901 -0400 |
| 40 | @@ -1,10 +1,5 @@ |
| 41 | VERSION=v2.4 |
| 42 | |
| 43 | -prefix=/usr/local |
| 44 | - |
| 45 | -CC=$(CROSS_COMPILE)gcc |
| 46 | -LD=$(CROSS_COMPILE)ld |
| 47 | - |
| 48 | SYS=posix |
| 49 | #SYS=mingw |
| 50 | |
| 51 | @@ -21,12 +16,12 @@ |
| 52 | |
| 53 | DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) |
| 54 | OPT=-O2 |
| 55 | -CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) |
| 56 | -LDFLAGS=-Wall $(XLDFLAGS) |
| 57 | +CFLAGS+=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) |
| 58 | +LDFLAGS+=-Wall $(XLDFLAGS) |
| 59 | |
| 60 | bindir=$(prefix)/bin |
| 61 | sbindir=$(prefix)/sbin |
| 62 | -mandir=$(prefix)/man |
| 63 | +mandir=$(prefix)/share/man |
| 64 | |
| 65 | BINDIR=$(DESTDIR)$(bindir) |
| 66 | SBINDIR=$(DESTDIR)$(sbindir) |
| 67 | @@ -38,7 +33,7 @@ |
| 68 | LIB_RTMP=-Llibrtmp -lrtmp |
| 69 | LIBS=$(LIB_RTMP) $(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS) |
| 70 | |
| 71 | -THREADLIB_posix=-lpthread |
| 72 | +THREADLIB_posix= |
| 73 | THREADLIB_darwin=-lpthread |
| 74 | THREADLIB_mingw= |
| 75 | THREADLIB=$(THREADLIB_$(SYS)) |