--- embedaddon/mpd/src/Makefile 2016/11/02 09:50:34 1.1.1.4 +++ embedaddon/mpd/src/Makefile 2019/10/22 13:49:55 1.1.1.5 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.1.4 2016/11/02 09:50:34 misho Exp $ +# $Id: Makefile,v 1.1.1.5 2019/10/22 13:49:55 misho Exp $ # # Makefile for mpd, multi-link PPP daemon for FreeBSD # @@ -9,17 +9,27 @@ PROG?= mpd5 PREFIX?= /usr/local +LOCALBASE?= ${PREFIX} BINDIR?= ${PREFIX}/sbin VERSION= 5.8 -NOMAN= -MK_MAN=no +.if defined(OSVERSION) +.if ${OSVERSION} > 1100100 +MK_MAN= no +.else +NO_MAN= +.endif +.else +MK_MAN= no +NO_MAN= +.endif + BINOWN!= /usr/bin/id -n -u BINGRP!= /usr/bin/id -n -g # Default configuration directory -MPD_CONF_DIR?= /etc/mpd5 +MPD_CONF_DIR?= ${PREFIX}/etc/mpd5 # Define supported physical layer types @@ -60,9 +70,6 @@ USE_TCP_WRAP= yes USE_AUTH_PAM= yes USE_AUTH_SYSTEM= yes -# Build with builtin libpdel -NOLIBPDEL= yes - # Build without builtin web server. #NOWEB= yes @@ -72,11 +79,11 @@ SYSLOG_FACILITY= LOG_DAEMON # Print wide protocol names instead of short names. # Comment this line, to save about 10 KB space -CFLAGS+= -DPROTO_NAME_LIST +CFLAGS+= -DPROTO_NAME_LIST # Reduce some internal structures size to save more memory # This is to limit amount of active sessions -SMALL_SYSTEM= yes +#SMALL_SYSTEM= yes # Compiler & linker flags @@ -97,14 +104,14 @@ CFLAGS+= -DUSE_OPIE .if exists ( /usr/lib/libpam.so ) && defined ( USE_AUTH_PAM ) LDADD+= -lpam DPADD+= ${LIBPAM} -CFLAGS+= -DUSE_PAM +CFLAGS+= -DUSE_PAM .endif .if defined ( USE_AUTH_SYSTEM ) ## based on /etc/password LDADD+= -lcrypt DPADD+= ${LIBCRYPT} ${LIBUTIL} -CFLAGS+= -DUSE_SYSTEM +CFLAGS+= -DUSE_SYSTEM .endif LDADD+= -lnetgraph -lutil @@ -113,19 +120,12 @@ DPADD+= ${LIBNETGRAPH} LDADD+= -L/usr/lib -lradius DPADD+= ${LIBRADIUS} -## libpdel needs ssl and libexpat (libxml2 cannot be used) -.if !defined ( NOLIBPDEL ) -LDADD+= -L${PREFIX}/lib -LDADD+= -lpdel -LDADD+= -lexpat -.endif - MPD_VERSION!= echo -n "${VERSION} (`id -un`@`uname -n` `LC_TIME=C date +'%R %v'`)" -CFLAGS+= -DPATH_CONF_DIR='"${MPD_CONF_DIR}"' -CFLAGS+= -DMPD_VERSION='"${MPD_VERSION}"' -CFLAGS+= -g -CFLAGS+= -Wall \ +CFLAGS+= -DPATH_CONF_DIR='"${MPD_CONF_DIR}"' +CFLAGS+= -DMPD_VERSION='"${MPD_VERSION}"' +CFLAGS+= -g +CFLAGS+= -Wall \ -Wcast-align \ -Wchar-subscripts \ -Wformat \ @@ -135,15 +135,14 @@ CFLAGS+= -Wall \ -Wnested-externs \ -Wpointer-arith \ -Wwrite-strings \ - -pthread \ - -I${PREFIX}/include + -pthread .if defined ( MPD_VENDOR ) -CFLAGS+= -DMPD_VENDOR='"${MPD_VENDOR}"' +CFLAGS+= -DMPD_VENDOR='"${MPD_VENDOR}"' .endif .if defined ( SYSLOG_FACILITY ) -CFLAGS+= -DSYSLOG_FACILITY='"${SYSLOG_FACILITY}"' +CFLAGS+= -DSYSLOG_FACILITY='"${SYSLOG_FACILITY}"' .endif # Standard sources @@ -155,14 +154,13 @@ STDSRCS= assert.c auth.c bund.c rep.c ccp.c cha util.c vars.c eap.c msoft.c ippool.c .if defined ( NOWEB ) -CFLAGS+= -DNOWEB +CFLAGS+= -DNOWEB .else STDSRCS+= web.c LDADD+= -lssl .endif -.if defined ( NOLIBPDEL ) -CFLAGS+= -DNOLIBPDEL -I./contrib/libpdel +CFLAGS+= -DNOLIBPDEL -I./contrib/libpdel PDPATH1= contrib/libpdel/util:contrib/libpdel/structs PDPATH2= contrib/libpdel/structs/type .if defined ( NOWEB ) @@ -200,60 +198,59 @@ PDELSRCS+= http_connection.c \ string_fp.c \ timeout_fp.c .endif -.endif # Add sources and flags for the various physical layer types .if defined ( PHYSTYPE_MODEM ) SRCS+= modem.c chat.c -CFLAGS+= -DPHYSTYPE_MODEM +CFLAGS+= -DPHYSTYPE_MODEM .endif .if defined ( PHYSTYPE_UDP ) SRCS+= udp.c -CFLAGS+= -DPHYSTYPE_UDP +CFLAGS+= -DPHYSTYPE_UDP .endif .if defined ( PHYSTYPE_TCP ) SRCS+= tcp.c -CFLAGS+= -DPHYSTYPE_TCP +CFLAGS+= -DPHYSTYPE_TCP .endif .if defined ( PHYSTYPE_NG_SOCKET ) SRCS+= ng.c -CFLAGS+= -DPHYSTYPE_NG_SOCKET +CFLAGS+= -DPHYSTYPE_NG_SOCKET .endif .if defined ( PHYSTYPE_PPTP ) SRCS+= pptp.c pptp_ctrl.c -CFLAGS+= -DPHYSTYPE_PPTP -CFLAGS+= -DRANDOMIZE_CID -#CFLAGS+= -DLOOK_LIKE_NT +CFLAGS+= -DPHYSTYPE_PPTP +CFLAGS+= -DRANDOMIZE_CID +#CFLAGS+= -DLOOK_LIKE_NT .endif .if defined ( PHYSTYPE_PPPOE ) SRCS+= pppoe.c -CFLAGS+= -DPHYSTYPE_PPPOE +CFLAGS+= -DPHYSTYPE_PPPOE .endif .if defined ( PHYSTYPE_L2TP ) SRCS+= l2tp.c l2tp_avp.c l2tp_ctrl.c -CFLAGS+= -DPHYSTYPE_L2TP +CFLAGS+= -DPHYSTYPE_L2TP .endif # CCP .if defined ( CCP_DEFLATE ) && defined ( USE_NG_DEFLATE ) SRCS+= ccp_deflate.c -CFLAGS+= -DCCP_DEFLATE -CFLAGS+= -DUSE_NG_DEFLATE +CFLAGS+= -DCCP_DEFLATE +CFLAGS+= -DUSE_NG_DEFLATE .endif .if defined ( CCP_MPPC ) && defined ( USE_NG_MPPC ) SRCS+= ccp_mppc.c -CFLAGS+= -DCCP_MPPC -CFLAGS+= -DUSE_NG_MPPC +CFLAGS+= -DCCP_MPPC +CFLAGS+= -DUSE_NG_MPPC .endif .if defined ( CCP_PRED1 ) SRCS+= ccp_pred1.c -CFLAGS+= -DCCP_PRED1 +CFLAGS+= -DCCP_PRED1 .if defined ( USE_NG_PRED1 ) -CFLAGS+= -DUSE_NG_PRED1 +CFLAGS+= -DUSE_NG_PRED1 .endif .endif @@ -262,46 +259,46 @@ CFLAGS+= -DUSE_NG_PRED1 .if defined ( ECP_DES ) SRCS+= ecp_dese.c SRCS+= ecp_dese_bis.c -CFLAGS+= -DECP_DES +CFLAGS+= -DECP_DES NEED_DES= yes .endif # Features .if defined ( USE_NG_BPF ) -CFLAGS+= -DUSE_NG_BPF +CFLAGS+= -DUSE_NG_BPF LDADD+= -lpcap DPADD+= ${LIBPCAP} .endif .if defined ( USE_NG_CAR ) -CFLAGS+= -DUSE_NG_CAR +CFLAGS+= -DUSE_NG_CAR .endif .if defined ( USE_NG_IPACCT ) -CFLAGS+= -DUSE_NG_IPACCT +CFLAGS+= -DUSE_NG_IPACCT -nostdinc -I/usr/include -I${LOCALBASE}/include .endif .if defined ( USE_NG_NAT ) SRCS+= nat.c -CFLAGS+= -DUSE_NG_NAT +CFLAGS+= -DUSE_NG_NAT .endif .if defined ( USE_NG_NETFLOW ) -CFLAGS+= -DUSE_NG_NETFLOW +CFLAGS+= -DUSE_NG_NETFLOW .endif .if defined ( USE_NG_TCPMSS ) -CFLAGS+= -DUSE_NG_TCPMSS +CFLAGS+= -DUSE_NG_TCPMSS .endif .if defined ( USE_NG_VJC ) -CFLAGS+= -DUSE_NG_VJC +CFLAGS+= -DUSE_NG_VJC .endif .if defined ( USE_IPFW ) -CFLAGS+= -DUSE_IPFW +CFLAGS+= -DUSE_IPFW .endif .if defined ( USE_FETCH ) -CFLAGS+= -DUSE_FETCH +CFLAGS+= -DUSE_FETCH LDADD+= -lfetch DPADD+= ${LIBFETCH} .endif .if defined ( SMALL_SYSTEM ) -CFLAGS+= -DSMALL_SYSTEM +CFLAGS+= -DSMALL_SYSTEM .endif # Add in required support files and libraries @@ -316,9 +313,6 @@ CFLAGS+= -DUSE_BACKTRACE # Now add standard sources SRCS+= ${STDSRCS} - -.if defined ( NOLIBPDEL ) SRCS+= ${PDELSRCS} -.endif .include