aboutsummaryrefslogtreecommitdiff
path: root/Configurations
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2016-02-27 12:32:42 -0500
committerRich Salz <rsalz@openssl.org>2016-02-27 13:39:46 -0500
commit6ab364149d8b76b5d2341a2e708e727cad060416 (patch)
tree5d9a6cc432c6eb0fcf900ddef6e1864c1f12ecdc /Configurations
parentb23238f9aa95bcc31a369d3b24616f4f99691052 (diff)
downloadopenssl-6ab364149d8b76b5d2341a2e708e727cad060416.zip
openssl-6ab364149d8b76b5d2341a2e708e727cad060416.tar.gz
openssl-6ab364149d8b76b5d2341a2e708e727cad060416.tar.bz2
Remove some old files.
I read the PROBLEMS, and they're outdated; nothing I'd put in the online FAQ, for example. Test-builds work without using these files. Had to remove the rehash.time stuff from Makefile.in Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/descrip.mms.tmpl12
-rw-r--r--Configurations/unix-Makefile.tmpl20
2 files changed, 3 insertions, 29 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 5b52a09..eb60b4a 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -217,7 +217,7 @@ build_tests_nodep : $(TESTPROGS)
test tests : configdata.pm, -
build_apps_nodep, build_engines_nodep, build_tests_nodep, -
- depend, rehash
+ depend
SET DEFAULT [.test]{- move("test") -}
DEFINE SRCTOP {- sourcedir() -}
DEFINE BLDTOP {- builddir() -}
@@ -384,16 +384,6 @@ check_INSTALLTOP :
# Helper targets #####################################################
-rehash : copy-certs, build_apps_nodep
- !MCR [.apps]openssl.exe rehash {- builddir("certs", "demo") -}
- $(PERL) [.tools]c_rehash. [.certs.demo]
-
-copy-certs :
- @ IF F$SEARCH("{- buildfile("certs.dir") -}") .EQS. "" THEN -
- CREATE/DIR {- builddir("certs") -}
- -@ IF "{- sourcedir("certs") -}" .NES. "{- builddir("certs") -}" THEN -
- COPY {- tree(sourcedir("certs")) -}*.* {- tree(builddir("certs")) -}
-
# Developer targets ##################################################
debug_logicals :
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 0e91fb0..b9fc5f8 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -211,7 +211,7 @@ build_apps_nodep: $(PROGRAMS) $(SCRIPTS)
build_tests: configdata.pm build_tests_nodep depend
build_tests_nodep: $(TESTPROGS)
-test tests: build_tests_nodep build_apps_nodep build_engines_nodep depend rehash
+test tests: build_tests_nodep build_apps_nodep build_engines_nodep depend
( cd test; \
SRCTOP=../$(SRCDIR) \
BLDTOP=../$(BLDDIR) \
@@ -242,7 +242,7 @@ clean: libclean
rm -f $(PROGRAMS) $(TESTPROGS)
rm -f `find $(BLDDIR) -name '*{- $depext -}'`
rm -f `find $(BLDDIR) -name '*{- $objext -}'`
- rm -f $(BLDDIR)/core $(BLDDIR)/rehash.time
+ rm -f $(BLDDIR)/core
rm -f $(BLDDIR)/tags $(BLDDIR)/TAGS
rm -f $(BLDDIR)/openssl.pc $(BLDDIR)/libcrypto.pc $(BLDDIR)/libssl.pc
-rm -f `find $(BLDDIR) -type l`
@@ -693,17 +693,6 @@ dist:
# Helper targets #####################################################
-rehash: link-utils copy-certs build_apps_nodep
- @if [ -z "$(CROSS_COMPILE)" ]; then \
- (OPENSSL="$(BLDDIR)/util/shlib_wrap.sh apps/openssl"; \
- [ -x "$(BLDDIR)/openssl.exe" ] && OPENSSL="$(BLDDIR)/openssl.exe" || :; \
- OPENSSL_DEBUG_MEMORY=on; OPENSSL_CONF=/dev/null ; \
- export OPENSSL OPENSSL_DEBUG_MEMORY OPENSSL_CONF; \
- $$OPENSSL rehash certs/demo \
- || $(PERL) tools/c_rehash certs/demo) && \
- touch rehash.time; \
- else :; fi
-
link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/shlib_wrap.sh
$(BLDDIR)/util/opensslwrap.sh: configdata.pm
@@ -717,11 +706,6 @@ $(BLDDIR)/util/shlib_wrap.sh: configdata.pm
ln -sf "../$(SRCDIR)/util/shlib_wrap.sh" "$(BLDDIR)/util"; \
fi
-copy-certs: FORCE
- @if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \
- cp -R "$(SRCDIR)/certs" "$(BLDDIR)/"; \
- fi
-
$(SRCDIR)/apps/openssl-vms.cnf: $(SRCDIR)/apps/openssl.cnf
$(PERL) $(SRCDIR)/VMS/VMSify-conf.pl \
< $(SRCDIR)/apps/openssl.cnf > $(SRCDIR)/apps/openssl-vms.cnf