diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-06-17 00:23:43 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-06-17 16:06:31 +0200 |
| commit | 4813ad2d245cbf7fed2898d173eaa9e2a00e3e23 (patch) | |
| tree | ab307f188238fd350840078f232d9293b574c1b2 /Configurations/windows-makefile.tmpl | |
| parent | d3b64b89eda1dc040bf3c06764a6832acfd4f4d1 (diff) | |
Harmonise the different build files
- User targets are now the same and generally do the same things
- configdata.pm depends on exactly the same files on all platforms
- VMS production of shared libraries is simplified
- VMS automatic dependency files get the extension .D rather than .MMS
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configurations/windows-makefile.tmpl')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 0a06b115af..0d21c50f03 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -172,9 +172,12 @@ tests: build_generated \ @rem {- output_on() if !$disabled{tests}; "" -} list-tests: - @set TOP=$(SRCDIR) - @set PERL=$(PERL) + @rem {- output_off() if $disabled{tests}; "" -} + @set SRCTOP=$(SRCDIR) @"$(PERL)" "$(SRCDIR)\test\run_tests.pl" list + @rem {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} + @echo "Tests are not supported with your chosen Configure options" + @rem {- output_on() if !$disabled{tests}; "" -} install: install_sw install_ssldirs install_docs @@ -189,7 +192,7 @@ libclean: clean: libclean -del /Q /F $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS) - -del /Q /S /F $(GENERATED) + -del /Q /F $(GENERATED) -del /Q /S /F *.d -del /Q /S /F *.obj -del /Q /S /F *.pdb @@ -213,11 +216,9 @@ install_sw: all install_dev install_engines install_runtime uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev -install_docs: - "$(PERL)" "$(SRCDIR)\util\process_docs.pl" \ - "--destdir=$(DESTDIR)$(INSTALLTOP)\html" --type=html +install_docs: install_html_docs -uninstall_docs: +uninstall_docs: uninstall_html_docs install_ssldirs: @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(DESTDIR)$(OPENSSLDIR)\certs" @@ -274,9 +275,15 @@ install_runtime: uninstall_runtime: +install_html_docs: + "$(PERL)" "$(SRCDIR)\util\process_docs.pl" \ + "--destdir=$(DESTDIR)$(INSTALLTOP)\html" --type=html + +uninstall_html_docs: + # Building targets ################################################### -configdata.pm: "{- $config{build_file_template} -}" "$(SRCDIR)\Configure" +configdata.pm: "{- $config{build_file_template} -}" "$(SRCDIR)\Configurations\common.tmpl" "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{build_infos}}) -} @echo "Detected changed: $?" @echo "Reconfiguring..." "$(PERL)" "$(SRCDIR)\Configure" reconf |