aboutsummaryrefslogtreecommitdiff
path: root/Configurations
diff options
context:
space:
mode:
authorViktor Dukhovni <openssl-users@dukhovni.org>2016-03-18 22:10:39 -0400
committerViktor Dukhovni <openssl-users@dukhovni.org>2016-03-19 13:29:35 -0400
commitffc8d605e81c12d4ce06bce758df84f7945c0f02 (patch)
tree1ccc4d96cfc4adb56fd6246a43bff0f2306650d4 /Configurations
parent1e7e1c8d5c06207c4f99eab1f3cff7a033358ae1 (diff)
downloadopenssl-ffc8d605e81c12d4ce06bce758df84f7945c0f02.zip
openssl-ffc8d605e81c12d4ce06bce758df84f7945c0f02.tar.gz
openssl-ffc8d605e81c12d4ce06bce758df84f7945c0f02.tar.bz2
Revert "Generate apps/progs.h on the fly"
This reverts commit 04e2a527379ad12ca512aef4e838f94af22d7f79. Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/unix-Makefile.tmpl13
1 files changed, 12 insertions, 1 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 1923acc..8bcb224 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -617,7 +617,7 @@ generate: generate_apps generate_crypto_bn generate_crypto_objects
lint:
lint -DLINT $(INCLUDES) $(SRCS)
-generate_apps: $(SRCDIR)/apps/openssl-vms.cnf
+generate_apps: $(SRCDIR)/apps/openssl-vms.cnf $(SRCDIR)/apps/progs.h
generate_crypto_bn: $(SRCDIR)/crypto/bn/bn_prime.h
@@ -695,6 +695,17 @@ $(SRCDIR)/apps/openssl-vms.cnf: $(SRCDIR)/apps/openssl.cnf
$(PERL) $(SRCDIR)/VMS/VMSify-conf.pl \
< $(SRCDIR)/apps/openssl.cnf > $(SRCDIR)/apps/openssl-vms.cnf
+{- # because the program apps/openssl has object files as sources, and
+ # they then have the corresponding C files as source, we need to chain
+ # the lookups in %unified_info
+ my $apps_openssl = catfile("apps","openssl");
+ our @openssl_source = map { @{$unified_info{sources}->{$_}} }
+ @{$unified_info{sources}->{$apps_openssl}};
+ ""; -}
+$(SRCDIR)/apps/progs.h:
+ $(RM) $@
+ $(PERL) $(SRCDIR)/apps/progs.pl {- join(" ", @openssl_source) -} > $@
+
$(SRCDIR)/crypto/bn/bn_prime.h: $(SRCDIR)/crypto/bn/bn_prime.pl
$(PERL) $(SRCDIR)/crypto/bn/bn_prime.pl > $(SRCDIR)/crypto/bn/bn_prime.h