summaryrefslogtreecommitdiffstats
path: root/kerberos5/lib
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2002-05-12 16:01:00 +0000
committerru <ru@FreeBSD.org>2002-05-12 16:01:00 +0000
commit59049318b65ea166adda623a5ac132b7502ae843 (patch)
tree57ff969855b4ca919ff4d533236ef90e163b1e76 /kerberos5/lib
parentd47372f8ae9362037b3ca8651d6783b14df01e70 (diff)
downloadFreeBSD-src-59049318b65ea166adda623a5ac132b7502ae843.zip
FreeBSD-src-59049318b65ea166adda623a5ac132b7502ae843.tar.gz
Added new bsd.incs.mk which handles installing of header files
via INCS. Implemented INCSLINKS (equivalent to SYMLINKS) to handle symlinking include files. Allow for multiple groups of include files to be installed, with the powerful INCSGROUPS knob. Documentation to follow. Added standard `includes' and `incsinstall' targets, use them in Makefile.inc1. Headers from the following makefiles were not installed before (during `includes' in Makefile.inc1): kerberos5/lib/libtelnet/Makefile lib/libbz2/Makefile lib/libdevinfo/Makefile lib/libform/Makefile lib/libisc/Makefile lib/libmenu/Makefile lib/libmilter/Makefile lib/libpanel/Makefile Replaced all `beforeinstall' targets for installing includes with the INCS stuff. Renamed INCDIR to INCSDIR, for consistency with FILES and SCRIPTS, and for compatibility with NetBSD. Similarly for INCOWN, INCGRP, and INCMODE. Consistently use INCLUDEDIR instead of /usr/include. gnu/lib/libstdc++/Makefile and gnu/lib/libsupc++/Makefile changes were only lightly tested due to the missing contrib/libstdc++-v3. I fully tested the pre-WIP_GCC31 version of this patch with the contrib/libstdc++.295 stuff. These changes have been tested on i386 with the -DNO_WERROR "make world" and "make release".
Diffstat (limited to 'kerberos5/lib')
-rw-r--r--kerberos5/lib/libasn1/Makefile2
-rw-r--r--kerberos5/lib/libgssapi/Makefile4
-rw-r--r--kerberos5/lib/libkrb5/Makefile6
-rw-r--r--kerberos5/lib/libroken/Makefile2
-rw-r--r--kerberos5/lib/libtelnet/Makefile2
5 files changed, 6 insertions, 10 deletions
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index 7e0313d..c0b5156 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -63,7 +63,7 @@ GEN= \
asn1_TransitedEncoding.x \
asn1_UNSIGNED.x
-INCLUDES=krb5_asn1.h asn1_err.h
+INCS= krb5_asn1.h asn1_err.h
.include <bsd.lib.mk>
diff --git a/kerberos5/lib/libgssapi/Makefile b/kerberos5/lib/libgssapi/Makefile
index bf7902e..0492756 100644
--- a/kerberos5/lib/libgssapi/Makefile
+++ b/kerberos5/lib/libgssapi/Makefile
@@ -50,10 +50,8 @@ SRCS= \
wrap.c \
address_to_krb5addr.c
-INCLUDES=${KRB5DIR}/lib/gssapi/gssapi.h heim_err.h krb5_err.h k524_err.h
+INCS= gssapi.h heim_err.h krb5_err.h k524_err.h
.include <bsd.lib.mk>
.PATH: ${KRB5DIR}/lib/gssapi
-
-beforedepend all: heim_err.h krb5_err.h k524_err.h
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index fd58464..73f8dbc 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -111,8 +111,8 @@ SRCS= \
heim_err.c \
heim_err.h
-INCLUDES=${KRB5DIR}/lib/krb5/krb5.h ${.CURDIR}/../../include/krb5-types.h \
- ${KRB5DIR}/lib/krb5/krb5-protos.h heim_err.h krb5_err.h k524_err.h
+INCS= krb5.h ${.CURDIR}/../../include/krb5-types.h \
+ krb5-protos.h heim_err.h krb5_err.h k524_err.h
MAN3= \
krb5.3 \
@@ -152,5 +152,3 @@ MAN8= \
.PATH: ${KRB5DIR}/lib/krb5
.PATH: ${KRB5DIR}/lib/des
-
-beforedepend all: asn1_err.h krb5_err.h k524_err.h
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile
index 7311f97..5cdf110 100644
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@@ -58,7 +58,7 @@ SRCS= \
strupr.c \
roken.h
-INCLUDES= roken.h ${KRB5DIR}/lib/roken/roken-common.h
+INCS= roken.h ${KRB5DIR}/lib/roken/roken-common.h
.include <bsd.lib.mk>
diff --git a/kerberos5/lib/libtelnet/Makefile b/kerberos5/lib/libtelnet/Makefile
index d62356f..2286cf9 100644
--- a/kerberos5/lib/libtelnet/Makefile
+++ b/kerberos5/lib/libtelnet/Makefile
@@ -20,7 +20,7 @@ CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA -I${TELNETDIR}
CFLAGS+= -DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR}
INCS= ${TELNETDIR}/arpa/telnet.h
-INCDIR= /usr/include/arpa
+INCSDIR= ${INCLUDEDIR}/arpa
.include <bsd.lib.mk>
OpenPOWER on IntegriCloud