Diff for /embedaddon/mpd/src/Makefile between versions 1.1.1.4.2.1 and 1.1.1.5

version 1.1.1.4.2.1, 2017/01/23 15:59:24 version 1.1.1.5, 2019/10/22 13:49:55
Line 9 Line 9
   
 PROG?=                  mpd5  PROG?=                  mpd5
 PREFIX?=                /usr/local  PREFIX?=                /usr/local
   LOCALBASE?=             ${PREFIX}
 BINDIR?=                ${PREFIX}/sbin  BINDIR?=                ${PREFIX}/sbin
 VERSION=                5.8  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  BINOWN!=                /usr/bin/id -n -u
 BINGRP!=                /usr/bin/id -n -g  BINGRP!=                /usr/bin/id -n -g
   
 # Default configuration directory  # Default configuration directory
   
MPD_CONF_DIR?=          /etc/mpd5MPD_CONF_DIR?=          ${PREFIX}/etc/mpd5
   
 # Define supported physical layer types  # Define supported physical layer types
   
Line 60  USE_TCP_WRAP=  yes Line 70  USE_TCP_WRAP=  yes
 USE_AUTH_PAM=           yes  USE_AUTH_PAM=           yes
 USE_AUTH_SYSTEM=        yes  USE_AUTH_SYSTEM=        yes
   
 # Build with builtin libpdel  
 NOLIBPDEL=              yes  
   
 # Build without builtin web server.  # Build without builtin web server.
 #NOWEB=                 yes  #NOWEB=                 yes
   
Line 72  SYSLOG_FACILITY= LOG_DAEMON Line 79  SYSLOG_FACILITY= LOG_DAEMON
   
 # Print wide protocol names instead of short names.  # Print wide protocol names instead of short names.
 # Comment this line, to save about 10 KB space  # Comment this line, to save about 10 KB space
CFLAGS+=                -DPROTO_NAME_LISTCFLAGS+=        -DPROTO_NAME_LIST
   
 # Reduce some internal structures size to save more memory  # Reduce some internal structures size to save more memory
 # This is to limit amount of active sessions  # This is to limit amount of active sessions
SMALL_SYSTEM=           yes#SMALL_SYSTEM=           yes
   
 # Compiler & linker flags  # Compiler & linker flags
   
Line 97  CFLAGS+= -DUSE_OPIE Line 104  CFLAGS+= -DUSE_OPIE
 .if exists ( /usr/lib/libpam.so ) && defined ( USE_AUTH_PAM )  .if exists ( /usr/lib/libpam.so ) && defined ( USE_AUTH_PAM )
 LDADD+=         -lpam  LDADD+=         -lpam
 DPADD+=         ${LIBPAM}  DPADD+=         ${LIBPAM}
CFLAGS+=                -DUSE_PAMCFLAGS+=        -DUSE_PAM
 .endif  .endif
   
 .if defined ( USE_AUTH_SYSTEM )  .if defined ( USE_AUTH_SYSTEM )
 ## based on /etc/password  ## based on /etc/password
 LDADD+=         -lcrypt  LDADD+=         -lcrypt
 DPADD+=         ${LIBCRYPT} ${LIBUTIL}  DPADD+=         ${LIBCRYPT} ${LIBUTIL}
CFLAGS+=                -DUSE_SYSTEMCFLAGS+=        -DUSE_SYSTEM
 .endif  .endif
   
 LDADD+=         -lnetgraph -lutil  LDADD+=         -lnetgraph -lutil
 DPADD+=         ${LIBNETGRAPH}  DPADD+=         ${LIBNETGRAPH}
   
LDADD+=         -lradiusLDADD+=         -L/usr/lib -lradius
 DPADD+=         ${LIBRADIUS}  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'`)"  MPD_VERSION!=   echo -n "${VERSION} (`id -un`@`uname -n` `LC_TIME=C date +'%R %v'`)"
   
CFLAGS+=                -DPATH_CONF_DIR='"${MPD_CONF_DIR}"'CFLAGS+=        -DPATH_CONF_DIR='"${MPD_CONF_DIR}"'
CFLAGS+=                -DMPD_VERSION='"${MPD_VERSION}"'CFLAGS+=        -DMPD_VERSION='"${MPD_VERSION}"'
CFLAGS+=                -gCFLAGS+=        -g
CFLAGS+=                -Wall \CFLAGS+=        -Wall \
                 -Wcast-align \                  -Wcast-align \
                 -Wchar-subscripts \                  -Wchar-subscripts \
                 -Wformat \                  -Wformat \
Line 135  CFLAGS+=  -Wall \ Line 135  CFLAGS+=  -Wall \
                 -Wnested-externs \                  -Wnested-externs \
                 -Wpointer-arith \                  -Wpointer-arith \
                 -Wwrite-strings \                  -Wwrite-strings \
                -pthread \                -pthread
                -I${PREFIX}/include 
   
 .if defined ( MPD_VENDOR )  .if defined ( MPD_VENDOR )
CFLAGS+=                -DMPD_VENDOR='"${MPD_VENDOR}"'CFLAGS+=        -DMPD_VENDOR='"${MPD_VENDOR}"'
 .endif  .endif
   
 .if defined ( SYSLOG_FACILITY )  .if defined ( SYSLOG_FACILITY )
CFLAGS+=                -DSYSLOG_FACILITY='"${SYSLOG_FACILITY}"'CFLAGS+=        -DSYSLOG_FACILITY='"${SYSLOG_FACILITY}"'
 .endif  .endif
   
 # Standard sources  # Standard sources
Line 155  STDSRCS=        assert.c auth.c bund.c rep.c ccp.c cha Line 154  STDSRCS=        assert.c auth.c bund.c rep.c ccp.c cha
                 util.c vars.c eap.c msoft.c ippool.c                  util.c vars.c eap.c msoft.c ippool.c
   
 .if defined ( NOWEB )  .if defined ( NOWEB )
CFLAGS+=                -DNOWEBCFLAGS+=        -DNOWEB
 .else  .else
 STDSRCS+=       web.c  STDSRCS+=       web.c
 LDADD+=         -lssl  LDADD+=         -lssl
 .endif  .endif
   
.if defined ( NOLIBPDEL )CFLAGS+=        -DNOLIBPDEL -I./contrib/libpdel
CFLAGS+=                -DNOLIBPDEL -I./contrib/libpdel 
 PDPATH1=        contrib/libpdel/util:contrib/libpdel/structs  PDPATH1=        contrib/libpdel/util:contrib/libpdel/structs
 PDPATH2=        contrib/libpdel/structs/type  PDPATH2=        contrib/libpdel/structs/type
 .if defined ( NOWEB )  .if defined ( NOWEB )
Line 200  PDELSRCS+= http_connection.c \ Line 198  PDELSRCS+= http_connection.c \
                 string_fp.c \                  string_fp.c \
                 timeout_fp.c                  timeout_fp.c
 .endif  .endif
 .endif  
   
 # Add sources and flags for the various physical layer types  # Add sources and flags for the various physical layer types
   
 .if defined ( PHYSTYPE_MODEM )  .if defined ( PHYSTYPE_MODEM )
 SRCS+=          modem.c chat.c  SRCS+=          modem.c chat.c
CFLAGS+=                -DPHYSTYPE_MODEMCFLAGS+=        -DPHYSTYPE_MODEM
 .endif  .endif
 .if defined ( PHYSTYPE_UDP )  .if defined ( PHYSTYPE_UDP )
 SRCS+=          udp.c  SRCS+=          udp.c
CFLAGS+=                -DPHYSTYPE_UDPCFLAGS+=        -DPHYSTYPE_UDP
 .endif  .endif
 .if defined ( PHYSTYPE_TCP )  .if defined ( PHYSTYPE_TCP )
 SRCS+=          tcp.c  SRCS+=          tcp.c
CFLAGS+=                -DPHYSTYPE_TCPCFLAGS+=        -DPHYSTYPE_TCP
 .endif  .endif
 .if defined ( PHYSTYPE_NG_SOCKET )  .if defined ( PHYSTYPE_NG_SOCKET )
 SRCS+=          ng.c  SRCS+=          ng.c
CFLAGS+=                -DPHYSTYPE_NG_SOCKETCFLAGS+=        -DPHYSTYPE_NG_SOCKET
 .endif  .endif
 .if defined ( PHYSTYPE_PPTP )  .if defined ( PHYSTYPE_PPTP )
 SRCS+=          pptp.c pptp_ctrl.c  SRCS+=          pptp.c pptp_ctrl.c
CFLAGS+=                -DPHYSTYPE_PPTPCFLAGS+=        -DPHYSTYPE_PPTP
CFLAGS+=                -DRANDOMIZE_CIDCFLAGS+=        -DRANDOMIZE_CID
#CFLAGS+=               -DLOOK_LIKE_NT#CFLAGS+=       -DLOOK_LIKE_NT
 .endif  .endif
 .if defined ( PHYSTYPE_PPPOE )  .if defined ( PHYSTYPE_PPPOE )
 SRCS+=          pppoe.c  SRCS+=          pppoe.c
CFLAGS+=                -DPHYSTYPE_PPPOECFLAGS+=        -DPHYSTYPE_PPPOE
 .endif  .endif
 .if defined ( PHYSTYPE_L2TP )  .if defined ( PHYSTYPE_L2TP )
 SRCS+=          l2tp.c l2tp_avp.c l2tp_ctrl.c  SRCS+=          l2tp.c l2tp_avp.c l2tp_ctrl.c
CFLAGS+=                -DPHYSTYPE_L2TPCFLAGS+=        -DPHYSTYPE_L2TP
 .endif  .endif
   
 # CCP  # CCP
   
 .if defined ( CCP_DEFLATE ) && defined ( USE_NG_DEFLATE )  .if defined ( CCP_DEFLATE ) && defined ( USE_NG_DEFLATE )
 SRCS+=          ccp_deflate.c  SRCS+=          ccp_deflate.c
CFLAGS+=                -DCCP_DEFLATECFLAGS+=        -DCCP_DEFLATE
CFLAGS+=         -DUSE_NG_DEFLATECFLAGS+=        -DUSE_NG_DEFLATE
 .endif  .endif
   
 .if defined ( CCP_MPPC ) && defined ( USE_NG_MPPC )  .if defined ( CCP_MPPC ) && defined ( USE_NG_MPPC )
 SRCS+=          ccp_mppc.c  SRCS+=          ccp_mppc.c
CFLAGS+=                -DCCP_MPPCCFLAGS+=        -DCCP_MPPC
CFLAGS+=         -DUSE_NG_MPPCCFLAGS+=        -DUSE_NG_MPPC
 .endif  .endif
   
 .if defined ( CCP_PRED1 )  .if defined ( CCP_PRED1 )
 SRCS+=          ccp_pred1.c  SRCS+=          ccp_pred1.c
CFLAGS+=                -DCCP_PRED1CFLAGS+=        -DCCP_PRED1
 .if defined ( USE_NG_PRED1 )  .if defined ( USE_NG_PRED1 )
CFLAGS+=         -DUSE_NG_PRED1CFLAGS+=        -DUSE_NG_PRED1
 .endif  .endif
 .endif  .endif
   
Line 262  CFLAGS+=         -DUSE_NG_PRED1 Line 259  CFLAGS+=         -DUSE_NG_PRED1
 .if defined ( ECP_DES )  .if defined ( ECP_DES )
 SRCS+=          ecp_dese.c  SRCS+=          ecp_dese.c
 SRCS+=          ecp_dese_bis.c  SRCS+=          ecp_dese_bis.c
CFLAGS+=                -DECP_DESCFLAGS+=        -DECP_DES
 NEED_DES=       yes  NEED_DES=       yes
 .endif  .endif
   
 # Features  # Features
   
 .if defined ( USE_NG_BPF )  .if defined ( USE_NG_BPF )
CFLAGS+=                -DUSE_NG_BPFCFLAGS+=        -DUSE_NG_BPF
 LDADD+=         -lpcap  LDADD+=         -lpcap
 DPADD+=         ${LIBPCAP}  DPADD+=         ${LIBPCAP}
 .endif  .endif
 .if defined ( USE_NG_CAR )  .if defined ( USE_NG_CAR )
CFLAGS+=         -DUSE_NG_CARCFLAGS+=        -DUSE_NG_CAR
 .endif  .endif
 .if defined ( USE_NG_IPACCT )  .if defined ( USE_NG_IPACCT )
CFLAGS+=         -DUSE_NG_IPACCTCFLAGS+=        -DUSE_NG_IPACCT -nostdinc -I/usr/include -I${LOCALBASE}/include
 .endif  .endif
 .if defined ( USE_NG_NAT )  .if defined ( USE_NG_NAT )
 SRCS+=          nat.c  SRCS+=          nat.c
CFLAGS+=         -DUSE_NG_NATCFLAGS+=        -DUSE_NG_NAT
 .endif  .endif
 .if defined ( USE_NG_NETFLOW )  .if defined ( USE_NG_NETFLOW )
CFLAGS+=         -DUSE_NG_NETFLOWCFLAGS+=        -DUSE_NG_NETFLOW
 .endif  .endif
 .if defined ( USE_NG_TCPMSS )  .if defined ( USE_NG_TCPMSS )
CFLAGS+=         -DUSE_NG_TCPMSSCFLAGS+=        -DUSE_NG_TCPMSS
 .endif  .endif
 .if defined ( USE_NG_VJC )  .if defined ( USE_NG_VJC )
CFLAGS+=         -DUSE_NG_VJCCFLAGS+=        -DUSE_NG_VJC
 .endif  .endif
 .if defined ( USE_IPFW )  .if defined ( USE_IPFW )
CFLAGS+=         -DUSE_IPFWCFLAGS+=        -DUSE_IPFW
 .endif  .endif
 .if defined ( USE_FETCH )  .if defined ( USE_FETCH )
CFLAGS+=         -DUSE_FETCHCFLAGS+=        -DUSE_FETCH
 LDADD+=         -lfetch  LDADD+=         -lfetch
 DPADD+=         ${LIBFETCH}  DPADD+=         ${LIBFETCH}
 .endif  .endif
 .if defined ( SMALL_SYSTEM )  .if defined ( SMALL_SYSTEM )
CFLAGS+=         -DSMALL_SYSTEMCFLAGS+=        -DSMALL_SYSTEM
 .endif  .endif
   
 # Add in required support files and libraries  # Add in required support files and libraries
Line 316  CFLAGS+= -DUSE_BACKTRACE Line 313  CFLAGS+= -DUSE_BACKTRACE
 # Now add standard sources  # Now add standard sources
   
 SRCS+=          ${STDSRCS}  SRCS+=          ${STDSRCS}
   
 .if defined ( NOLIBPDEL )  
 SRCS+=          ${PDELSRCS}  SRCS+=          ${PDELSRCS}
 .endif  
   
 .include <bsd.prog.mk>  .include <bsd.prog.mk>

Removed from v.1.1.1.4.2.1  
changed lines
  Added in v.1.1.1.5


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>