Makefile: Updates to make 'make distcheck' work

Signed-off-by: Ingo Franzki <[email protected]>
opencryptoki · Sep 13, 2023 · 2262b3d · 2262b3d
1 parent 2298d39
commit 2262b3d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
@@ -16,8 +16,8 @@ ibmca_la_LIBADD=-ldl
 ibmca_la_LDFLAGS=-module -version-number ${VERSION} -shared -no-undefined \
 		  -avoid-version -Wl,--version-script=${srcdir}/ibmca.map
 
-dist_ibmca_la_SOURCES=ibmca.h e_ibmca_err.h
-EXTRA_DIST = openssl.cnf.sample
+dist_ibmca_la_SOURCES=ibmca.h e_ibmca_err.h openssl-compat.h
+EXTRA_DIST = openssl.cnf.sample ibmca.map test/ibmca_mechaList_test.c
 
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = doc
@@ -29,3 +29,5 @@ ibmca-engine-opensslconfig: ibmca-engine-opensslconfig.in
 
 noinst_SCRIPTS = ibmca-engine-opensslconfig
 EXTRA_DIST += ibmca-engine-opensslconfig.in
+
+CLEANFILES = ibmca-engine-opensslconfig
diff --git a/src/provider/Makefile.am b/src/provider/Makefile.am
@@ -8,6 +8,8 @@ ibmca_provider_la_SOURCES=p_ibmca.c p_key.c p_context.c \
 			rsa_signature.c ec_keymgmt.c ec_signature.c ec_keyexch.c \
 			dh_keymgmt.c dh_keyexch.c rsa_blinding.c rsa_sup_mul.c
 
+dist_ibmca_provider_la_SOURCES=p_ibmca.h constant_time.h
+
 ibmca_provider_la_CFLAGS=-DIBMCA_VERSION=\"${VERSION_STR}\" -DIBMCA_LOGDIR=\"$(logdir)\"
 
 if PROVIDER_FULL_LIBICA
@@ -18,7 +20,8 @@ endif
 ibmca_provider_la_LDFLAGS=-module -version-number ${VERSION} -shared -no-undefined \
 		  -avoid-version -Wl,--version-script=${srcdir}/ibmca-provider.map
 
-EXTRA_DIST = openssl.cnf.provider.sample ibmca-provider-opensslconfig
+EXTRA_DIST = openssl.cnf.provider.sample ibmca-provider-opensslconfig \
+	ibmca-provider.map
 
 ACLOCAL_AMFLAGS = -I m4
 

diff --git a/test/engine/Makefile.am b/test/engine/Makefile.am
@@ -62,9 +62,11 @@ enginectrl_SOURCES = enginectrl.c
 enginectrl_LDADD = -lcrypto -ldl
 
 AM_TESTS_ENVIRONMENT = export IBMCA_TEST_PATH=${top_builddir}/src/engine/.libs/ibmca.so IBMCA_OPENSSL_TEST_CONF=${srcdir}/openssl-test.cnf IBMCA_OPENSSL_TEST_NOINIT_CONF=${srcdir}/openssl-test-noinit.cnf PERL5LIB=${srcdir};
-EXTRA_DIST = ${TESTS_PERL} ${TESTS_CIPHERS} test.pm openssl-test.cnf	\
-dsa2k.key dsa2k_pub.key dsa4k.key dsa4k_pub.key dsa8k.key		\
-dsa8k_pub.key dsamax.key dsamax_pub.key rsa2k.key rsa4k.key rsa8k.key
+EXTRA_DIST = ${TESTS_PERL} ${TESTS_CIPHERS} test.pm openssl-test.cnf 	\
+	openssl-test-noinit.cnf dsa2k.key dsa2k_pub.key dsa4k.key	\
+	dsa4k_pub.key dsa8k.key dsa8k_pub.key dsamax.key dsamax_pub.key	\
+	rsa2k.key rsa4k.key rsa8k.key rsa16k.key dsaparam2k.key		\
+	dsaparam4k.key dsaparam8k.key dsaparammax.key
 
 libica-link.sh:
 	@echo '#!/bin/bash' > libica-link.sh
@@ -77,3 +79,5 @@ libica-link.sh:
 	@echo "fi" >> libica-link.sh
 	@echo "exit 0" >> libica-link.sh
 	@chmod u+x libica-link.sh
+
+CLEANFILES = *.out *.dec libica-link.sh
diff --git a/test/provider/Makefile.am b/test/provider/Makefile.am
@@ -48,4 +48,12 @@ threadtest_SOURCES = threadtest.c
 threadtest_LDADD = -lcrypto -lpthread
 
 AM_TESTS_ENVIRONMENT = export IBMCA_TEST_PATH=${top_builddir}/src/provider/.libs/ IBMCA_OPENSSL_TEST_CONF=${srcdir}/openssl-test.cnf PERL5LIB=${srcdir};
-EXTRA_DIST = ${TESTS_PERL} test.pm openssl-test.cnf server-cert-rsa.pem server-key-rsa.pem server-cert-ec.pem server-key-ec.pem
+EXTRA_DIST = ${TESTS_PERL} test.pm openssl-test.cnf server-cert-rsa.pem	\
+	server-key-rsa.pem server-cert-ec.pem server-key-ec.pem		\
+	rsa-implrej-bad-empty-in.bin rsa-implrej-bad-empty-out.bin	\
+	rsa-implrej-bad-max-in.bin rsa-implrej-bad-max-out.bin		\
+	rsa-implrej-bad-prf-in.bin rsa-implrej-bad-prf-out.bin		\
+	rsa-implrej-good-in.bin rsa-implrej-good-out.bin		\
+	rsa-implrej-key.pem rsa16k.pl
+
+CLEANFILES = *.out *.dec *.pub *.key