提交 27f42b46 编写于 作者: R Richard Levitte

Don't use config.timestamp, we already have configdata.pm

The benefit with using configdata.pm is that Configure writes it for
us.
Reviewed-by: NViktor Dukhovni <viktor@openssl.org>
上级 c058fcd7
...@@ -204,20 +204,20 @@ NODEBUG=@ ...@@ -204,20 +204,20 @@ NODEBUG=@
# The main targets ################################################### # The main targets ###################################################
all : config.timestamp, - all : configdata.pm, -
build_libs_nodep, build_engines_nodep, build_apps_nodep, - build_libs_nodep, build_engines_nodep, build_apps_nodep, -
depend depend
build_libs : config.timestamp, build_libs_nodep, depend build_libs : configdata.pm, build_libs_nodep, depend
build_libs_nodep : $(LIBS) build_libs_nodep : $(LIBS)
build_engines : config.timestamp, build_engines_nodep, depend build_engines : configdata.pm, build_engines_nodep, depend
build_engines_nodep : $(ENGINES) build_engines_nodep : $(ENGINES)
build_apps : config.timestamp, build_apps_nodep, depend build_apps : configdata.pm, build_apps_nodep, depend
build_apps_nodep : $(PROGRAMS), $(SCRIPTS) build_apps_nodep : $(PROGRAMS), $(SCRIPTS)
build_tests : config.timestamp, build_tests_nodep, depend build_tests : configdata.pm, build_tests_nodep, depend
build_tests_nodep : $(TESTPROGS) build_tests_nodep : $(TESTPROGS)
test tests : config.timestamp, - test tests : configdata.pm, -
build_apps_nodep, build_engines_nodep, build_tests_nodep, - build_apps_nodep, build_engines_nodep, build_tests_nodep, -
depend, rehash depend, rehash
SET DEFAULT [.test]{- move("test") -} SET DEFAULT [.test]{- move("test") -}
...@@ -351,7 +351,7 @@ install_config : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com - ...@@ -351,7 +351,7 @@ install_config : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com -
{- sourcefile("VMS", "openssl_shutdown.com.in") -} - {- sourcefile("VMS", "openssl_shutdown.com.in") -} -
> [.VMS]openssl_shutdown.com > [.VMS]openssl_shutdown.com
vmsconfig.pm : config.timestamp vmsconfig.pm : configdata.pm
OPEN/WRITE/SHARE=READ CONFIG []vmsconfig.pm OPEN/WRITE/SHARE=READ CONFIG []vmsconfig.pm
WRITE CONFIG "package vmsconfig;" WRITE CONFIG "package vmsconfig;"
WRITE CONFIG "use strict; use warnings;" WRITE CONFIG "use strict; use warnings;"
...@@ -402,7 +402,7 @@ debug_logicals : ...@@ -402,7 +402,7 @@ debug_logicals :
# Building targets ################################################### # Building targets ###################################################
config.timestamp : {- sourcefile("Configurations", "descrip.mms.tmpl") -} $(SRCDIR)Configure ! $(SRCDIR)config.com configdata.pm : {- sourcefile("Configurations", "descrip.mms.tmpl") -} $(SRCDIR)Configure ! $(SRCDIR)config.com
@ WRITE SYS$OUTPUT "Detected changed: $?" @ WRITE SYS$OUTPUT "Detected changed: $?"
@ WRITE SYS$OUTPUT "Reconfiguring..." @ WRITE SYS$OUTPUT "Reconfiguring..."
perl $(SRCDIR)Configure reconf perl $(SRCDIR)Configure reconf
...@@ -411,12 +411,7 @@ config.timestamp : {- sourcefile("Configurations", "descrip.mms.tmpl") -} $(SRCD ...@@ -411,12 +411,7 @@ config.timestamp : {- sourcefile("Configurations", "descrip.mms.tmpl") -} $(SRCD
@ WRITE SYS$OUTPUT "*** Please run the same mms command again ***" @ WRITE SYS$OUTPUT "*** Please run the same mms command again ***"
@ WRITE SYS$OUTPUT "*** ***" @ WRITE SYS$OUTPUT "*** ***"
@ WRITE SYS$OUTPUT "*************************************************" @ WRITE SYS$OUTPUT "*************************************************"
@ IF F$SEARCH("config.timestamp",1) .NES. "" THEN - @ PIPE ( EXIT %X10000000 )
OPEN/APPEND TIMESTAMP "config.timestamp"
@ IF F$SEARCH("config.timestamp",2) .EQS. "" THEN -
OPEN/WRITE TIMESTAMP "config.timestamp"
@ close TIMESTAMP
@ exit %10000000
{- {-
use File::Basename; use File::Basename;
......
...@@ -150,16 +150,16 @@ PROCESSOR= {- $config{processor} -} ...@@ -150,16 +150,16 @@ PROCESSOR= {- $config{processor} -}
# The main targets ################################################### # The main targets ###################################################
all: config.timestamp build_libs_nodep build_engines_nodep build_apps_nodep \ all: configdata.pm build_libs_nodep build_engines_nodep build_apps_nodep \
depend link-utils depend link-utils
build_libs: config.timestamp build_libs_nodep depend build_libs: configdata.pm build_libs_nodep depend
build_libs_nodep: libcrypto.pc libssl.pc openssl.pc build_libs_nodep: libcrypto.pc libssl.pc openssl.pc
build_engines: config.timestamp build_engines_nodep depend build_engines: configdata.pm build_engines_nodep depend
build_engines_nodep: $(ENGINES) build_engines_nodep: $(ENGINES)
build_apps: config.timestamp build_apps_nodep depend build_apps: configdata.pm build_apps_nodep depend
build_apps_nodep: $(PROGRAMS) $(SCRIPTS) build_apps_nodep: $(PROGRAMS) $(SCRIPTS)
build_tests: config.timestamp build_tests_nodep depend build_tests: configdata.pm build_tests_nodep depend
build_tests_nodep: $(TESTPROGS) 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 rehash
...@@ -598,12 +598,12 @@ rehash: link-utils copy-certs build_apps_nodep ...@@ -598,12 +598,12 @@ rehash: link-utils copy-certs build_apps_nodep
link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/shlib_wrap.sh link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/shlib_wrap.sh
$(BLDDIR)/util/opensslwrap.sh: config.timestamp $(BLDDIR)/util/opensslwrap.sh: configdata.pm
@if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \ @if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \
mkdir -p "$(BLDDIR)/util"; \ mkdir -p "$(BLDDIR)/util"; \
ln -sf "../$(SRCDIR)/util/opensslwrap.sh" "$(BLDDIR)/util"; \ ln -sf "../$(SRCDIR)/util/opensslwrap.sh" "$(BLDDIR)/util"; \
fi fi
$(BLDDIR)/util/shlib_wrap.sh: config.timestamp $(BLDDIR)/util/shlib_wrap.sh: configdata.pm
@if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \ @if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \
mkdir -p "$(BLDDIR)/util"; \ mkdir -p "$(BLDDIR)/util"; \
ln -sf "../$(SRCDIR)/util/shlib_wrap.sh" "$(BLDDIR)/util"; \ ln -sf "../$(SRCDIR)/util/shlib_wrap.sh" "$(BLDDIR)/util"; \
...@@ -661,7 +661,7 @@ FORCE: ...@@ -661,7 +661,7 @@ FORCE:
# Building targets ################################################### # Building targets ###################################################
libcrypto.pc libssl.pc openssl.pc: config.timestamp $(LIBS) libcrypto.pc libssl.pc openssl.pc: configdata.pm $(LIBS)
libcrypto.pc: libcrypto.pc:
@ ( echo 'prefix=$(INSTALLTOP)'; \ @ ( echo 'prefix=$(INSTALLTOP)'; \
echo 'exec_prefix=$${prefix}'; \ echo 'exec_prefix=$${prefix}'; \
...@@ -704,8 +704,8 @@ openssl.pc: ...@@ -704,8 +704,8 @@ openssl.pc:
# wasn't passed down automatically. It's quite safe to use it like we do # wasn't passed down automatically. It's quite safe to use it like we do
# below; if it doesn't exist, the result will be empty and 'make' will pick # below; if it doesn't exist, the result will be empty and 'make' will pick
# up $(MAKEFLAGS) which is passed down as an environment variable. # up $(MAKEFLAGS) which is passed down as an environment variable.
config.timestamp: {- $config{build_file_template} -} $(SRCDIR)/Configure $(SRCDIR)/config configdata.pm: {- $config{build_file_template} -} $(SRCDIR)/Configure $(SRCDIR)/config
@echo "Detected that {- $config{build_file_template} -}, $(SRCDIR)/Configure or $(SRCDIR)/config may have changed." @echo "Detected changed: $?"
@echo "Reconfiguring..." @echo "Reconfiguring..."
$(SRCDIR)/Configure reconf $(SRCDIR)/Configure reconf
@echo "**************************************************" @echo "**************************************************"
...@@ -713,7 +713,6 @@ config.timestamp: {- $config{build_file_template} -} $(SRCDIR)/Configure $(SRCDI ...@@ -713,7 +713,6 @@ config.timestamp: {- $config{build_file_template} -} $(SRCDIR)/Configure $(SRCDI
@echo "*** Please run the same make command again ***" @echo "*** Please run the same make command again ***"
@echo "*** ***" @echo "*** ***"
@echo "**************************************************" @echo "**************************************************"
@touch config.timestamp
@false @false
{- {-
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册