$NetBSD: patch-Makefile,v 1.8 2018/09/23 21:09:33 wiz Exp $ Use PREFIX and PKGMANDIR. Remove OPT. Libtoolize Choose gnutls. --- Makefile.orig 2018-09-23 10:40:58.000000000 +0000 +++ Makefile @@ -1,6 +1,6 @@ VERSION=v2.4 -prefix=/usr/local +prefix=${PREFIX} CC=$(CROSS_COMPILE)gcc LD=$(CROSS_COMPILE)ld @@ -8,9 +8,9 @@ LD=$(CROSS_COMPILE)ld SYS=posix #SYS=mingw -CRYPTO=OPENSSL +#CRYPTO=OPENSSL #CRYPTO=POLARSSL -#CRYPTO=GNUTLS +CRYPTO=GNUTLS LIBZ=-lz LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ) LIB_OPENSSL=-lssl -lcrypto $(LIBZ) @@ -20,13 +20,12 @@ DEF_=-DNO_CRYPTO CRYPTO_DEF=$(DEF_$(CRYPTO)) DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) -OPT=-O2 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) LDFLAGS=-Wall $(XLDFLAGS) bindir=$(prefix)/bin sbindir=$(prefix)/sbin -mandir=$(prefix)/man +mandir=$(prefix)/${PKGMANDIR} BINDIR=$(DESTDIR)$(bindir) SBINDIR=$(DESTDIR)$(sbindir) @@ -44,7 +43,7 @@ THREADLIB_mingw= THREADLIB=$(THREADLIB_$(SYS)) SLIBS=$(THREADLIB) $(LIBS) -LIBRTMP=librtmp/librtmp.a +LIBRTMP=librtmp/librtmp.la INCRTMP=librtmp/rtmp_sys.h librtmp/rtmp.h librtmp/log.h librtmp/amf.h EXT_posix= @@ -60,11 +59,11 @@ $(PROGS): $(LIBRTMP) install: $(PROGS) -mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8 - cp rtmpdump$(EXT) $(BINDIR) - cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) + cd librtmp; $(MAKE) install $(MAKEFLAGS) + $(LIBTOOL) --tag=CC --mode=install $(INSTALL) rtmpdump$(EXT) $(BINDIR) + $(LIBTOOL) --tag=CC --mode=install $(INSTALL) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) cp rtmpdump.1 $(MANDIR)/man1 cp rtmpgw.8 $(MANDIR)/man8 - @cd librtmp; $(MAKE) install clean: rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) @@ -76,19 +75,16 @@ $(LIBRTMP): FORCE @cd librtmp; $(MAKE) all rtmpdump: rtmpdump.o - $(CC) $(LDFLAGS) -o $@$(EXT) $@.o $(LIBS) + $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS) rtmpsrv: rtmpsrv.o thread.o - $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS) + $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) rtmpsuck: rtmpsuck.o thread.o - $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS) + $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) rtmpgw: rtmpgw.o thread.o - $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS) + $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) -rtmpgw.o: rtmpgw.c $(INCRTMP) Makefile -rtmpdump.o: rtmpdump.c $(INCRTMP) Makefile -rtmpsrv.o: rtmpsrv.c $(INCRTMP) Makefile -rtmpsuck.o: rtmpsuck.c $(INCRTMP) Makefile -thread.o: thread.c thread.h +%.lo: %.c + $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<