diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-06-14 21:39:13 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-06-14 22:11:38 +0200 |
| commit | 932eaf0085eca0e7e9135da80376fb73d9af2d18 (patch) | |
| tree | b4c5901c63384de1a7d6e852bab2b4e3ae15ecbd /Configurations | |
| parent | 7cae38642e116b0a769fb3c31448be29469dc1da (diff) | |
Add a developer target 'build_generated' to rebuild mandatory headers
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 14 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 14 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 14 |
3 files changed, 24 insertions, 18 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 66eaeadd6a..0c0534c8ef 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -223,20 +223,22 @@ NODEBUG=@ # The main targets ################################################### -all : $(GENERATED_MANDATORY), - +all : build_generated, - build_libs_nodep, build_engines_nodep, build_apps_nodep, - depend -build_libs : $(GENERATED_MANDATORY), build_libs_nodep, depend +build_libs : build_generated, build_libs_nodep, depend build_libs_nodep : $(LIBS) -build_engines : $(GENERATED_MANDATORY), build_engines_nodep, depend +build_engines : build_generated, build_engines_nodep, depend build_engines_nodep : $(ENGINES) -build_apps : $(GENERATED_MANDATORY), build_apps_nodep, depend +build_apps : build_generated, build_apps_nodep, depend build_apps_nodep : $(PROGRAMS), $(SCRIPTS) -build_tests : $(GENERATED_MANDATORY), build_tests_nodep, depend +build_tests : build_generated, build_tests_nodep, depend build_tests_nodep : $(TESTPROGS) -test tests : $(GENERATED_MANDATORY), - +build_generated : $(GENERATED_MANDATORY) + +test tests : build_generated, - build_apps_nodep, build_engines_nodep, build_tests_nodep, - depend @ ! {- output_off() if $disabled{tests}; "" -} diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 2e5dd68b48..04964dcf5d 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -210,21 +210,23 @@ PROCESSOR= {- $config{processor} -} # The main targets ################################################### -all: $(GENERATED_MANDATORY) \ +all: build_generated \ build_libs_nodep build_engines_nodep build_apps_nodep \ depend link-utils -build_libs: $(GENERATED_MANDATORY) build_libs_nodep depend +build_libs: build_generated build_libs_nodep depend build_libs_nodep: libcrypto.pc libssl.pc openssl.pc -build_engines: $(GENERATED_MANDATORY) build_engines_nodep depend +build_engines: build_generated build_engines_nodep depend build_engines_nodep: $(ENGINES) -build_apps: $(GENERATED_MANDATORY) build_apps_nodep depend +build_apps: build_generated build_apps_nodep depend build_apps_nodep: $(PROGRAMS) $(SCRIPTS) -build_tests: $(GENERATED_MANDATORY) build_tests_nodep depend +build_tests: build_generated build_tests_nodep depend build_tests_nodep: $(TESTPROGS) +build_generated: $(GENERATED_MANDATORY) + test: tests -tests: $(GENERATED_MANDATORY) \ +tests: build_generated \ build_tests_nodep build_apps_nodep build_engines_nodep \ depend link-utils @ : {- output_off() if $disabled{tests}; "" -} diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index b1c5554f6b..0a06b115af 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -145,20 +145,22 @@ PROCESSOR= {- $config{processor} -} # The main targets ################################################### -all: $(GENERATED_MANDATORY) \ +all: build_generated \ build_libs_nodep build_engines_nodep build_apps_nodep depend -build_libs: $(GENERATED_MANDATORY) build_libs_nodep depend +build_libs: build_generated build_libs_nodep depend build_libs_nodep: $(LIBS) -build_engines: $(GENERATED_MANDATORY) build_engines_nodep depend +build_engines: build_generated build_engines_nodep depend build_engines_nodep: $(ENGINES) -build_apps: $(GENERATED_MANDATORY) build_apps_nodep depend +build_apps: build_generated build_apps_nodep depend build_apps_nodep: $(PROGRAMS) $(SCRIPTS) -build_tests: $(GENERATED_MANDATORY) build_tests_nodep depend +build_tests: build_generated build_tests_nodep depend build_tests_nodep: $(TESTPROGS) +build_generated: $(GENERATED_MANDATORY) + test: tests -tests: $(GENERATED_MANDATORY) \ +tests: build_generated \ build_tests_nodep build_apps_nodep build_engines_nodep depend @rem {- output_off() if $disabled{tests}; "" -} set SRCTOP=$(SRCDIR) |