Diff for /embedaddon/mpd/src/Makefile between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2016/11/01 09:56:12 version 1.1.1.4, 2016/11/02 09:50:34
Line 12  PREFIX?=  /usr/local Line 12  PREFIX?=  /usr/local
 BINDIR?=                ${PREFIX}/sbin  BINDIR?=                ${PREFIX}/sbin
 VERSION=                5.8  VERSION=                5.8
 NOMAN=  NOMAN=
NO_MAN=MK_MAN=no
   
 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?=          ${PREFIX}/etc/mpd5MPD_CONF_DIR?=          /etc/mpd5
   
 # Define supported physical layer types  # Define supported physical layer types
   
Line 72  SYSLOG_FACILITY= LOG_DAEMON Line 72  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
COPTS+=                 -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=           yesSMALL_SYSTEM=           yes
   
 # Compiler & linker flags  # Compiler & linker flags
   
Line 84  COPTS+=   -DPROTO_NAME_LIST Line 84  COPTS+=   -DPROTO_NAME_LIST
 ## filter TCP accept connections  ## filter TCP accept connections
 LDADD+=         -lwrap  LDADD+=         -lwrap
 DPADD+=         ${LIBWRAP}  DPADD+=         ${LIBWRAP}
COPTS+=         -DUSE_WRAPCFLAGS+=        -DUSE_WRAP
 .endif  .endif
   
 ## authentication methods: opie, pam, /etc/password  ## authentication methods: opie, pam, /etc/password
 .if defined ( USE_AUTH_OPIE )  .if defined ( USE_AUTH_OPIE )
 LDADD+=         -lopie  LDADD+=         -lopie
 DPADD+=         ${LIBOPIE}  DPADD+=         ${LIBOPIE}
COPTS+=         -DUSE_OPIECFLAGS+=        -DUSE_OPIE
 .endif  .endif
   
 .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}
COPTS+=             -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}
COPTS+=             -DUSE_SYSTEMCFLAGS+=             -DUSE_SYSTEM
 .endif  .endif
   
 LDADD+=         -lnetgraph -lutil  LDADD+=         -lnetgraph -lutil
Line 122  LDADD+=  -lexpat Line 122  LDADD+=  -lexpat
   
 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'`)"
   
COPTS+=             -DPATH_CONF_DIR='"${MPD_CONF_DIR}"'CFLAGS+=             -DPATH_CONF_DIR='"${MPD_CONF_DIR}"'
COPTS+=             -DMPD_VERSION='"${MPD_VERSION}"'CFLAGS+=             -DMPD_VERSION='"${MPD_VERSION}"'
COPTS+=             -gCFLAGS+=             -g
COPTS+=             -Wall \CFLAGS+=             -Wall \
                 -Wcast-align \                  -Wcast-align \
                 -Wchar-subscripts \                  -Wchar-subscripts \
                 -Wformat \                  -Wformat \
Line 139  COPTS+=  -Wall \ Line 139  COPTS+=  -Wall \
                 -I${PREFIX}/include                  -I${PREFIX}/include
   
 .if defined ( MPD_VENDOR )  .if defined ( MPD_VENDOR )
COPTS+=             -DMPD_VENDOR='"${MPD_VENDOR}"'CFLAGS+=             -DMPD_VENDOR='"${MPD_VENDOR}"'
 .endif  .endif
   
 .if defined ( SYSLOG_FACILITY )  .if defined ( SYSLOG_FACILITY )
COPTS+=             -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 155  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 )
COPTS+=             -DNOWEBCFLAGS+=             -DNOWEB
 .else  .else
 STDSRCS+=       web.c  STDSRCS+=       web.c
 LDADD+=         -lssl  LDADD+=         -lssl
 .endif  .endif
   
 .if defined ( NOLIBPDEL )  .if defined ( NOLIBPDEL )
COPTS+=             -DNOLIBPDEL -I./contrib/libpdelCFLAGS+=             -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 206  PDELSRCS+= http_connection.c \ Line 206  PDELSRCS+= http_connection.c \
   
 .if defined ( PHYSTYPE_MODEM )  .if defined ( PHYSTYPE_MODEM )
 SRCS+=          modem.c chat.c  SRCS+=          modem.c chat.c
COPTS+=             -DPHYSTYPE_MODEMCFLAGS+=             -DPHYSTYPE_MODEM
 .endif  .endif
 .if defined ( PHYSTYPE_UDP )  .if defined ( PHYSTYPE_UDP )
 SRCS+=          udp.c  SRCS+=          udp.c
COPTS+=             -DPHYSTYPE_UDPCFLAGS+=             -DPHYSTYPE_UDP
 .endif  .endif
 .if defined ( PHYSTYPE_TCP )  .if defined ( PHYSTYPE_TCP )
 SRCS+=          tcp.c  SRCS+=          tcp.c
COPTS+=             -DPHYSTYPE_TCPCFLAGS+=             -DPHYSTYPE_TCP
 .endif  .endif
 .if defined ( PHYSTYPE_NG_SOCKET )  .if defined ( PHYSTYPE_NG_SOCKET )
 SRCS+=          ng.c  SRCS+=          ng.c
COPTS+=             -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
COPTS+=             -DPHYSTYPE_PPTPCFLAGS+=             -DPHYSTYPE_PPTP
COPTS+=             -DRANDOMIZE_CIDCFLAGS+=             -DRANDOMIZE_CID
#COPTS+=             -DLOOK_LIKE_NT#CFLAGS+=             -DLOOK_LIKE_NT
 .endif  .endif
 .if defined ( PHYSTYPE_PPPOE )  .if defined ( PHYSTYPE_PPPOE )
 SRCS+=          pppoe.c  SRCS+=          pppoe.c
COPTS+=             -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
COPTS+=             -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
COPTS+=             -DCCP_DEFLATECFLAGS+=             -DCCP_DEFLATE
COPTS+=         -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
COPTS+=             -DCCP_MPPCCFLAGS+=             -DCCP_MPPC
COPTS+=         -DUSE_NG_MPPCCFLAGS+=         -DUSE_NG_MPPC
 .endif  .endif
   
 .if defined ( CCP_PRED1 )  .if defined ( CCP_PRED1 )
 SRCS+=          ccp_pred1.c  SRCS+=          ccp_pred1.c
COPTS+=             -DCCP_PRED1CFLAGS+=             -DCCP_PRED1
 .if defined ( USE_NG_PRED1 )  .if defined ( USE_NG_PRED1 )
COPTS+=         -DUSE_NG_PRED1CFLAGS+=         -DUSE_NG_PRED1
 .endif  .endif
 .endif  .endif
   
Line 262  COPTS+=         -DUSE_NG_PRED1 Line 262  COPTS+=         -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
COPTS+=             -DECP_DESCFLAGS+=             -DECP_DES
 NEED_DES=       yes  NEED_DES=       yes
 .endif  .endif
   
 # Features  # Features
   
 .if defined ( USE_NG_BPF )  .if defined ( USE_NG_BPF )
COPTS+=             -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 )
COPTS+=         -DUSE_NG_CARCFLAGS+=         -DUSE_NG_CAR
 .endif  .endif
 .if defined ( USE_NG_IPACCT )  .if defined ( USE_NG_IPACCT )
COPTS+=         -DUSE_NG_IPACCTCFLAGS+=         -DUSE_NG_IPACCT
 .endif  .endif
 .if defined ( USE_NG_NAT )  .if defined ( USE_NG_NAT )
 SRCS+=          nat.c  SRCS+=          nat.c
COPTS+=         -DUSE_NG_NATCFLAGS+=         -DUSE_NG_NAT
 .endif  .endif
 .if defined ( USE_NG_NETFLOW )  .if defined ( USE_NG_NETFLOW )
COPTS+=         -DUSE_NG_NETFLOWCFLAGS+=         -DUSE_NG_NETFLOW
 .endif  .endif
 .if defined ( USE_NG_TCPMSS )  .if defined ( USE_NG_TCPMSS )
COPTS+=         -DUSE_NG_TCPMSSCFLAGS+=         -DUSE_NG_TCPMSS
 .endif  .endif
 .if defined ( USE_NG_VJC )  .if defined ( USE_NG_VJC )
COPTS+=         -DUSE_NG_VJCCFLAGS+=         -DUSE_NG_VJC
 .endif  .endif
 .if defined ( USE_IPFW )  .if defined ( USE_IPFW )
COPTS+=         -DUSE_IPFWCFLAGS+=         -DUSE_IPFW
 .endif  .endif
 .if defined ( USE_FETCH )  .if defined ( USE_FETCH )
COPTS+=         -DUSE_FETCHCFLAGS+=         -DUSE_FETCH
 LDADD+=         -lfetch  LDADD+=         -lfetch
 DPADD+=         ${LIBFETCH}  DPADD+=         ${LIBFETCH}
 .endif  .endif
 .if defined ( SMALL_SYSTEM )  .if defined ( SMALL_SYSTEM )
COPTS+=         -DSMALL_SYSTEMCFLAGS+=         -DSMALL_SYSTEM
 .endif  .endif
   
 # Add in required support files and libraries  # Add in required support files and libraries
Line 310  DPADD+=  ${LIBCRYPTO} Line 310  DPADD+=  ${LIBCRYPTO}
   
 .if exists ( /usr/lib/libexecinfo.so )  .if exists ( /usr/lib/libexecinfo.so )
 LDADD+=         -lexecinfo  LDADD+=         -lexecinfo
COPTS+=         -DUSE_BACKTRACECFLAGS+=        -DUSE_BACKTRACE
 .endif  .endif
   
 # Now add standard sources  # Now add standard sources

Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4


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