Fix conflicts (this one is easy: there's just the Makefile).
This commit is contained in:
parent
e8af8f3179
commit
aba0f05d54
@ -1,21 +1,27 @@
|
||||
# from: @(#)Makefile 5.10 (Berkeley) 6/24/90
|
||||
# $Id: Makefile,v 1.8 1997/02/22 15:07:51 peter Exp $
|
||||
# $Id: Makefile,v 1.6 1996/08/30 02:02:09 peter Exp $
|
||||
|
||||
.PATH: ${DESTDIR}/usr/include/rpcsvc
|
||||
|
||||
LIB= rpcsvc
|
||||
|
||||
RPCSRCS= klm_prot.x mount.x nfs_prot.x nlm_prot.x rex.x rnusers.x \
|
||||
rquota.x rstat.x rwall.x sm_inter.x spray.x yppasswd.x ypxfrd.x
|
||||
rquota.x rstat.x rwall.x sm_inter.x spray.x yppasswd.x ypxfrd.x \
|
||||
ypupdate_prot.x
|
||||
|
||||
RPCCOM = rpcgen
|
||||
OTHERSRCS= rnusers.c rstat.c rwall.c yp_passwd.c yp_update.c
|
||||
SECRPCSRCS= publickey.c secretkey.c xcrypt.c
|
||||
|
||||
INCDIRS= -I${DESTDIR}/usr/include/rpcsvc
|
||||
CFLAGS+= ${INCDIRS}
|
||||
RPCCOM = rpcgen -C
|
||||
|
||||
SRCS= ${RPCSRCS:R:S/$/_xdr.c/g}
|
||||
INCDIRS= -I${DESTDIR}/usr/include/rpcsvc -I${DESTDIR}/usr/include
|
||||
|
||||
CLEANFILES+= ${SRCS} ${RPCSRCS}
|
||||
CFLAGS+= -DYP ${INCDIRS}
|
||||
|
||||
GENSRCS= ${RPCSRCS:R:S/$/_xdr.c/g}
|
||||
SRCS+= ${GENSRCS} ${OTHERSRCS} ${SECRPCSRCS}
|
||||
|
||||
CLEANFILES+= ${GENSRCS} ${RPCSRCS}
|
||||
|
||||
NOMAN= noman
|
||||
|
||||
@ -26,4 +32,5 @@ NOMAN= noman
|
||||
.x_xdr.c:
|
||||
${RPCCOM} -c ${.IMPSRC} -o ${.TARGET}
|
||||
|
||||
OBJS= ${RPCSRCS:R:S/$/_xdr.o/g}
|
||||
OBJS= ${RPCSRCS:R:S/$/_xdr.o/g} ${SECRPCSRCS:R:S/$/.o/g} \
|
||||
${OTHERSRCS:R:S/$/.o/g}
|
||||
|
Loading…
Reference in New Issue
Block a user