summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Holmberg <mho@cvs.openbsd.org>2003-05-17 21:17:40 +0000
committerMagnus Holmberg <mho@cvs.openbsd.org>2003-05-17 21:17:40 +0000
commit36c052f4866dfe0e5d0fba8129233255d4107756 (patch)
tree66964c2118478d1e0b9647524c21a789415e5e4c
parentbaf1e6a1ce9a916b0f8d80a7a2a8a0d81e95997a (diff)
Use unique variable names in Makefile.*.inc.
-rw-r--r--lib/libkrb5/Makefile.asn1.inc10
-rw-r--r--lib/libkrb5/Makefile.hdb.inc8
-rw-r--r--lib/libkrb5/Makefile.krb5.inc6
3 files changed, 13 insertions, 11 deletions
diff --git a/lib/libkrb5/Makefile.asn1.inc b/lib/libkrb5/Makefile.asn1.inc
index c29be24daa7..6b13819d8a9 100644
--- a/lib/libkrb5/Makefile.asn1.inc
+++ b/lib/libkrb5/Makefile.asn1.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.asn1.inc,v 1.3 2003/05/17 20:07:23 mho Exp $
+# $OpenBSD: Makefile.asn1.inc,v 1.4 2003/05/17 21:17:39 mho Exp $
.PATH: ${KRB5SRC}/lib/asn1
@@ -8,7 +8,7 @@ HDR_GEN+= krb5_asn1.h asn1_err.h
.PATH: ${KRB5SRC}/lib/asn1
-gen_files= \
+gen_files_asn1= \
krb5_asn1.h \
asn1_APOptions.c \
asn1_AP_REP.c \
@@ -62,7 +62,8 @@ gen_files= \
asn1_TransitedEncoding.c \
asn1_UNSIGNED.c
-gen_files+=\
+
+gen_files_asn1+=\
asn1_err.h \
asn1_err.c
@@ -71,7 +72,8 @@ SRCS+= der_get.c \
der_free.c \
der_length.c \
der_copy.c \
- ${gen_files}
+ ${gen_files_asn1}
+
CFLAGS+= -I${KRB5SRC}/lib/asn1
diff --git a/lib/libkrb5/Makefile.hdb.inc b/lib/libkrb5/Makefile.hdb.inc
index 7e3642c71a4..e1c4f5193a2 100644
--- a/lib/libkrb5/Makefile.hdb.inc
+++ b/lib/libkrb5/Makefile.hdb.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.hdb.inc,v 1.3 2003/05/17 20:07:23 mho Exp $
+# $OpenBSD: Makefile.hdb.inc,v 1.4 2003/05/17 21:17:39 mho Exp $
DIR_HDB= ${KRB5SRC}/lib/hdb
HDR_HDB= hdb.h hdb-protos.h hdb-private.h
@@ -6,7 +6,7 @@ HDR_GEN+= hdb_err.h hdb_asn1.h
.PATH: ${KRB5SRC}/lib/hdb
-gen_files= \
+gen_files_hdb= \
hdb_asn1.h \
asn1_Key.c \
asn1_Event.c \
@@ -15,7 +15,7 @@ gen_files= \
asn1_Salt.c \
asn1_GENERATION.c
-gen_files+=\
+gen_files_hdb+=\
hdb_err.h \
hdb_err.c
@@ -26,7 +26,7 @@ SRCS+= keytab.c \
mkey.c \
ndbm.c \
print.c \
- ${gen_files}
+ ${gen_files_hdb}
CFLAGS+= -I${KRB5SRC}/lib/hdb -I${KRB5SRC}/lib/asn1
diff --git a/lib/libkrb5/Makefile.krb5.inc b/lib/libkrb5/Makefile.krb5.inc
index dad0a83a211..8eebc470ddb 100644
--- a/lib/libkrb5/Makefile.krb5.inc
+++ b/lib/libkrb5/Makefile.krb5.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.krb5.inc,v 1.4 2003/05/17 20:07:23 mho Exp $
+# $OpenBSD: Makefile.krb5.inc,v 1.5 2003/05/17 21:17:39 mho Exp $
DIR_KRB5INC= ${.CURDIR}/../../kerberosV/include
DIR_KRB5LIB= ${KRB5SRC}/lib/krb5
@@ -134,7 +134,7 @@ MLINKS+=krb5_verify_user.3 krb5_verify_user_lrealm.3
.PATH: ${KRB5SRC}/lib/krb5
-gen_files= \
+gen_files_krb5= \
heim_err.h \
k524_err.h \
krb5_err.h \
@@ -235,7 +235,7 @@ SRCS+= add_et_list.c \
krb5_err.c \
heim_err.c \
k524_err.c \
- ${gen_files}
+ ${gen_files_krb5}
CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/ \
-I${KRB5SRC}/lib/asn1 -I../asn1 -I. \