| 1 | diff -u -r ../rtmpdump-2.3/librtmp/Makefile ./librtmp/Makefile |
| 2 | --- ../rtmpdump-2.3/librtmp/Makefile 2010-06-30 16:01:28.000000000 -0400 |
| 3 | +++ ./librtmp/Makefile 2016-08-24 09:46:18.124955620 -0400 |
| 4 | @@ -1,11 +1,5 @@ |
| 5 | VERSION=v2.3 |
| 6 | |
| 7 | -prefix=/usr/local |
| 8 | - |
| 9 | -CC=$(CROSS_COMPILE)gcc |
| 10 | -LD=$(CROSS_COMPILE)ld |
| 11 | -AR=$(CROSS_COMPILE)ar |
| 12 | - |
| 13 | SYS=posix |
| 14 | CRYPTO=OPENSSL |
| 15 | #CRYPTO=GNUTLS |
| 16 | @@ -44,7 +38,7 @@ |
| 17 | incdir=$(prefix)/include/librtmp |
| 18 | bindir=$(prefix)/bin |
| 19 | libdir=$(prefix)/lib |
| 20 | -mandir=$(prefix)/man |
| 21 | +mandir=$(prefix)/share/man |
| 22 | BINDIR=$(DESTDIR)$(bindir) |
| 23 | INCDIR=$(DESTDIR)$(incdir) |
| 24 | LIBDIR=$(DESTDIR)$(libdir) |
| 25 | diff -u -r ../rtmpdump-2.3/Makefile ./Makefile |
| 26 | --- ../rtmpdump-2.3/Makefile 2010-06-30 15:58:35.000000000 -0400 |
| 27 | +++ ./Makefile 2016-08-24 09:35:22.150906938 -0400 |
| 28 | @@ -1,10 +1,5 @@ |
| 29 | VERSION=v2.3 |
| 30 | |
| 31 | -prefix=/usr/local |
| 32 | - |
| 33 | -CC=$(CROSS_COMPILE)gcc |
| 34 | -LD=$(CROSS_COMPILE)ld |
| 35 | - |
| 36 | SYS=posix |
| 37 | #SYS=mingw |
| 38 | |
| 39 | @@ -20,12 +15,12 @@ |
| 40 | |
| 41 | DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) |
| 42 | OPT=-O2 |
| 43 | -CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) |
| 44 | -LDFLAGS=-Wall $(XLDFLAGS) |
| 45 | +CFLAGS+=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) |
| 46 | +LDFLAGS+=-Wall $(XLDFLAGS) |
| 47 | |
| 48 | bindir=$(prefix)/bin |
| 49 | sbindir=$(prefix)/sbin |
| 50 | -mandir=$(prefix)/man |
| 51 | +mandir=$(prefix)/share/man |
| 52 | |
| 53 | BINDIR=$(DESTDIR)$(bindir) |
| 54 | SBINDIR=$(DESTDIR)$(sbindir) |
| 55 | @@ -35,7 +30,7 @@ |
| 56 | LIBS_mingw=-lws2_32 -lwinmm -lgdi32 |
| 57 | LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS) |
| 58 | |
| 59 | -THREADLIB_posix=-lpthread |
| 60 | +THREADLIB_posix= |
| 61 | THREADLIB_mingw= |
| 62 | THREADLIB=$(THREADLIB_$(SYS)) |
| 63 | SLIBS=$(THREADLIB) $(LIBS) |