d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move setting of LDFLAGS to the modules which require it actually, as

Browse Source 
other kerberos5 modules do so.
This commit is contained in:
Hajimu UMEMOTO 2015-08-27 17:16:18 +00:00
parent 2640322a2e
commit 7525abf811
5 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kerberos5/Makefile.inc
View File

@ -14,7 +14,6 @@ LDAPLDADD= -lldap -llber
LDAPDPADD= ${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;} LDAPDPADD= ${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;}
LDAPCFLAGS= -I${OPENLDAPBASE}/include -DOPENLDAP=1 -DLDAP_DEPRECATED=1 LDAPCFLAGS= -I${OPENLDAPBASE}/include -DOPENLDAP=1 -DLDAP_DEPRECATED=1
LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -rpath ${OPENLDAPBASE}/lib LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -rpath ${OPENLDAPBASE}/lib
LDFLAGS+= ${LDAPLDFLAGS}
.endif .endif
.if defined(SRCS) .if defined(SRCS)

1
kerberos5/libexec/digest-service/Makefile
View File

@ -9,6 +9,7 @@ CFLAGS+= -I${KRB5DIR}/kdc \
-I${KRB5DIR}/lib/wind \ -I${KRB5DIR}/lib/wind \
-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/roken
LIBADD= hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm LIBADD= hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm
LDFLAGS=${LDAPLDFLAGS}
.include <bsd.prog.mk> .include <bsd.prog.mk>

1
kerberos5/libexec/kdc/Makefile
View File

@ -11,6 +11,7 @@ SRCS= config.c \
CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/kdc ${LDAPCFLAGS} -I${KRB5DIR}/kdc ${LDAPCFLAGS}
LIBADD= kdc hdb krb5 roken crypt vers LIBADD= kdc hdb krb5 roken crypt vers
LDFLAGS=${LDAPLDFLAGS}
.include <bsd.prog.mk> .include <bsd.prog.mk>

1
kerberos5/usr.bin/kpasswd/Makefile
View File

@ -3,6 +3,7 @@
PROG= kpasswd PROG= kpasswd
CFLAGS+=-I${KRB5DIR}/lib/roken CFLAGS+=-I${KRB5DIR}/lib/roken
LIBADD= hdb krb5 roken vers crypto LIBADD= hdb krb5 roken vers crypto
LDFLAGS=${LDAPLDFLAGS}
.include <bsd.prog.mk> .include <bsd.prog.mk>

1
kerberos5/usr.sbin/iprop-log/Makefile
View File

@ -9,6 +9,7 @@ CFLAGS+= -I${KRB5DIR}/lib/kadm5 \
-I${KRB5DIR}/lib/sl \ -I${KRB5DIR}/lib/sl \
-I. -I.
LIBADD= kadm5srv hdb krb5 roken edit sl vers LIBADD= kadm5srv hdb krb5 roken edit sl vers
LDFLAGS=${LDAPLDFLAGS}
iprop-commands.h: iprop-commands.in iprop-commands.h: iprop-commands.in
${SLC} ${.ALLSRC:M*.in} ${SLC} ${.ALLSRC:M*.in}