Page MenuHomeFreeBSD
Files F164186363

D58286.id182474.diff
No OneTemporary
Actions

D58286.id182474.diff
View Options

diff --git a/krb5/include/Makefile b/krb5/include/Makefile
--- a/krb5/include/Makefile
+++ b/krb5/include/Makefile
@@ -19,12 +19,15 @@
.PATH: ${KRB5_DIR}/include
+SRCS= ${GEN}
+
INCS= gssapi.h \
kdb.h \
krad.h \
- krb5.h
+ krb5.h \
+ profile.h
-CLEANFILES= osconf.new
+CLEANFILES= osconf.new profile.h
# XXX The output of this needs to be verified against the osconf.h I created
# It is only used to verify osconf.h has not changed
@@ -34,8 +37,13 @@
rebuild-error-tables: ${K5_ET_HEADERS}
+.include "${KRB5_SRCTOP}/util/profile/Makefile.profile"
+
.PHONY: rebuild-error-tables osconf.h
-.PATH: ${KRB5_DIR}/include/krb5
+.SUFFIXES: .et
+
+.PATH: ${KRB5_DIR}/include/krb5 \
+ ${KRB5_DIR}/util/profile
.include <bsd.prog.mk>
diff --git a/krb5/util/profile/Makefile b/krb5/util/profile/Makefile
--- a/krb5/util/profile/Makefile
+++ b/krb5/util/profile/Makefile
@@ -36,32 +36,7 @@
-I${KRB5_DIR}/include \
-I${.OBJDIR}
-GEN= profile.h ${GEN_PROF_ERR_C} ${GEN_PROF_ERR_H}
-GEN_PROF_ERR= prof_err.et
-GEN_PROF_ERR_C= ${GEN_PROF_ERR:S/.et$/.c/}
-GEN_PROF_ERR_H= ${GEN_PROF_ERR:S/.et$/.h/}
-${GEN_PROF_ERR:[2..-1]}: .NOMETA
-CLEANFILES= et-h-prof_err.et et-h-prof_err.c et-h-prof_err.h \
- ${GEN}
-
-.include "${KRB5_SRCTOP}/Makefile.et"
-
-${GEN_PROF_ERR_H}: ${GEN_PROF_ERR}
- rm -f et-h-${.PREFIX}.et et-h-${.PREFIX}.c et-h-${.PREFIX}.h
- cp ${.ALLSRC} et-h-${.PREFIX}.et
- ${COMPILE_ET} et-h-${.PREFIX}.et
- mv et-h-${.PREFIX}.h ${.PREFIX}.h
- rm -f et-h-${.PREFIX}.et et-h-${.PREFIX}.h
-
-${GEN_PROF_ERR_C}: ${GEN_PROF_ERR}
- rm -f et-c-${.PREFIX}.et et-c-${.PREFIX}.c et-c-${.PREFIX}.h
- cp ${.ALLSRC} et-c-${.PREFIX}.et
- ${COMPILE_ET} et-c-${.PREFIX}.et
- mv et-c-${.PREFIX}.c ${.PREFIX}.c
- rm -f et-c-${.PREFIX}.et et-c-${.PREFIX}.c
-
-profile.h: profile.hin prof_err.h
- cat ${.ALLSRC} > ${.TARGET}
+.include "Makefile.profile"
prof_file.c: profile.h
diff --git a/krb5/util/profile/Makefile b/krb5/util/profile/Makefile.profile
copy from krb5/util/profile/Makefile
copy to krb5/util/profile/Makefile.profile
--- a/krb5/util/profile/Makefile
+++ b/krb5/util/profile/Makefile.profile
@@ -1,47 +1,9 @@
-#
-# SPDX-License-Identifier: BSD-2-Clause
-#
-# Copyright (c) 2025 FreeBSD Foundation
-#
-# This sofware was developed by Cy Schubert <cy@FreeBSD.org>
-# under sponsorship from the FreeBSD Foundation.
-#
-
-.include <src.opts.mk>
-
-.include "../Makefile.inc"
-
-LIB= krb5profile
-INTERNALLIB=
-
-SRCS= prof_file.c \
- prof_get.c \
- prof_init.c \
- prof_parse.c \
- prof_set.c \
- prof_tree.c \
- argv_parse.h \
- prof_int.h \
- ${GEN}
-
-INCS= profile.h
-
-DEFINES=-DHAS_STDARG -DLIBDIR=\"${KRB5_LIBDIR}\"
-
-CFLAGS+=${DEFINES} \
- -fPIC \
- -I${KRB5_DIR}/util/profile \
- -I${KRB5_DIR}/util/et \
- -I${KRB5_SRCTOP}/include \
- -I${KRB5_DIR}/include \
- -I${.OBJDIR}
-
GEN= profile.h ${GEN_PROF_ERR_C} ${GEN_PROF_ERR_H}
GEN_PROF_ERR= prof_err.et
GEN_PROF_ERR_C= ${GEN_PROF_ERR:S/.et$/.c/}
GEN_PROF_ERR_H= ${GEN_PROF_ERR:S/.et$/.h/}
${GEN_PROF_ERR:[2..-1]}: .NOMETA
-CLEANFILES= et-h-prof_err.et et-h-prof_err.c et-h-prof_err.h \
+CLEANFILES+= et-h-prof_err.et et-h-prof_err.c et-h-prof_err.h \
${GEN}
.include "${KRB5_SRCTOP}/Makefile.et"
@@ -62,11 +24,3 @@
profile.h: profile.hin prof_err.h
cat ${.ALLSRC} > ${.TARGET}
-
-prof_file.c: profile.h
-
-.include <bsd.lib.mk>
-
-.SUFFIXES: .et
-
-.PATH: ${KRB5_DIR}/util/profile

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 30, 10:54 AM (9 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35728643
Default Alt Text
D58286.id182474.diff (3 KB)

Event Timeline