From: Greg Hudson <ghudson@mit.edu>
Date: Tue, 12 Jul 2022 19:17:48 +0000 (-0400)
Subject: Reduce SUBDIROBJLISTS repetition in makefiles
X-Git-Tag: krb5-1.21-beta1~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f7298aa215bc0f902839f283bc991004a66e521;p=thirdparty%2Fkrb5.git

Reduce SUBDIROBJLISTS repetition in makefiles

Where applicable, define STOBJLISTS in terms of SUBDIROBJLISTS.
---

diff --git a/src/lib/crypto/builtin/Makefile.in b/src/lib/crypto/builtin/Makefile.in
index daf19da195..243bb17ba3 100644
--- a/src/lib/crypto/builtin/Makefile.in
+++ b/src/lib/crypto/builtin/Makefile.in
@@ -25,14 +25,6 @@ SRCS=\
 	$(srcdir)/kdf.c		\
 	$(srcdir)/pbkdf2.c	
 
-STOBJLISTS= des/OBJS.ST md4/OBJS.ST 	\
-	md5/OBJS.ST sha1/OBJS.ST sha2/OBJS.ST	\
-	enc_provider/OBJS.ST 		\
-	hash_provider/OBJS.ST 		\
-	aes/OBJS.ST 			\
-	camellia/OBJS.ST 		\
-	OBJS.ST
-
 SUBDIROBJLISTS= des/OBJS.ST md4/OBJS.ST 	\
 		md5/OBJS.ST sha1/OBJS.ST sha2/OBJS.ST 	\
 		enc_provider/OBJS.ST 		\
@@ -40,6 +32,8 @@ SUBDIROBJLISTS= des/OBJS.ST md4/OBJS.ST 	\
 		aes/OBJS.ST			\
 		camellia/OBJS.ST 
 
+STOBJLISTS= $(SUBDIROBJLISTS) OBJS.ST
+
 ##DOS##LIBOBJS = $(OBJS)
 
 all-unix: all-libobjs
diff --git a/src/lib/crypto/openssl/Makefile.in b/src/lib/crypto/openssl/Makefile.in
index 08de047d0a..cf11f6847b 100644
--- a/src/lib/crypto/openssl/Makefile.in
+++ b/src/lib/crypto/openssl/Makefile.in
@@ -24,19 +24,14 @@ SRCS=\
 	$(srcdir)/pbkdf2.c	\
 	$(srcdir)/sha256.c
 
-STOBJLISTS= des/OBJS.ST md4/OBJS.ST 	\
-	md5/OBJS.ST sha1/OBJS.ST sha2/OBJS.ST 	\
-	enc_provider/OBJS.ST 		\
-	hash_provider/OBJS.ST 		\
-	aes/OBJS.ST 			\
-	OBJS.ST
-
 SUBDIROBJLISTS= des/OBJS.ST md4/OBJS.ST 	\
 		md5/OBJS.ST sha1/OBJS.ST sha2/OBJS.ST 	\
 		enc_provider/OBJS.ST 		\
 		hash_provider/OBJS.ST 		\
 		aes/OBJS.ST 
 
+STOBJLISTS= $(SUBDIROBJLISTS) OBJS.ST
+
 all-unix: all-libobjs
 includes: depend
 
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index 64ed0a4d22..46a9a6bcc4 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -23,8 +23,8 @@ LIBMAJOR=2
 LIBMINOR=2
 #LIBINITFUNC=gssint_lib_init
 #LIBFINIFUNC=gssint_lib_fini
-STOBJLISTS=OBJS.ST generic/OBJS.ST mechglue/OBJS.ST krb5/OBJS.ST spnego/OBJS.ST
 SUBDIROBJLISTS=generic/OBJS.ST mechglue/OBJS.ST krb5/OBJS.ST spnego/OBJS.ST
+STOBJLISTS=OBJS.ST $(SUBDIROBJLISTS)
 SHLIB_EXPDEPS=\
 	$(KRB5_DEPLIB) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) $(COM_ERR_DEPLIB)
 SHLIB_EXPLIBS=-lkrb5 -lk5crypto $(COM_ERR_LIB) $(SUPPORT_LIB) $(DL_LIB) $(LIBS)
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index 4e9547c2fc..1ed0cf3461 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -23,18 +23,6 @@ LIBMINOR=3
 LIBINITFUNC=profile_library_initializer krb5int_lib_init
 LIBFINIFUNC=profile_library_finalizer krb5int_lib_fini
 
-STOBJLISTS= \
-	OBJS.ST \
-	error_tables/OBJS.ST \
-	asn.1/OBJS.ST \
-	ccache/OBJS.ST \
-	keytab/OBJS.ST \
-	krb/OBJS.ST \
-	rcache/OBJS.ST \
-	unicode/OBJS.ST \
-	os/OBJS.ST \
-	$(BUILDTOP)/util/profile/OBJS.ST
-
 SUBDIROBJLISTS= \
 	error_tables/OBJS.ST \
 	asn.1/OBJS.ST \
@@ -46,6 +34,8 @@ SUBDIROBJLISTS= \
 	os/OBJS.ST \
 	$(BUILDTOP)/util/profile/OBJS.ST
 
+STOBJLISTS= OBJS.ST $(SUBDIROBJLISTS)
+
 OBJS=\
 	$(OUTPRE)krb5_libinit.$(OBJEXT)