return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) _$target\n_$target";
}
+
+ our $COLUMNS = $ENV{COLUMNS};
+ if ($COLUMNS =~ /^\d+$/) {
+ $COLUMNS = int($COLUMNS) - 2; # 2 to leave space for ending ' \'
+ } else {
+ $COLUMNS = 76;
+ }
+
+ sub fill_lines {
+ my $item_sep = shift; # string
+ my $line_length = shift; # number of chars
+
+ my @result = ();
+ my $resultpos = 0;
+
+ foreach (@_) {
+ my $fill_line = $result[$resultpos] // '';
+ my $newline =
+ ($fill_line eq '' ? '' : $fill_line . $item_sep) . $_;
+
+ if (length($newline) > $line_length) {
+ # If this is a single item and the intended result line
+ # is empty, we put it there anyway
+ if ($fill_line eq '') {
+ $result[$resultpos++] = $newline;
+ } else {
+ $result[++$resultpos] = $_;
+ }
+ } else {
+ $result[$resultpos] = $newline;
+ }
+ }
+ return @result;
+ }
'';
-}
PLATFORM={- $config{target} -}
SHLIB_VERSION_NUMBER={- $config{shlib_version} -}
SHLIB_TARGET={- $target{shared_target} -}
-LIBS={- join(" ", map { platform->staticlib($_) // () } @{$unified_info{libraries}}) -}
-SHLIBS={- join(" ", map { platform->sharedlib($_) // () } @{$unified_info{libraries}}) -}
-SHLIB_INFO={- join(" ", map { my $x = platform->sharedlib($_);
- my $y = platform->sharedlib_simple($_);
- $x ? "\"$x;$y\"" : () }
- @{$unified_info{libraries}}) -}
-MODULES={- join(" ", map { platform->dso($_) } @{$unified_info{modules}}) -}
-PROGRAMS={- join(" ", map { platform->bin($_) } @{$unified_info{programs}}) -}
-SCRIPTS={- join(" ", @{$unified_info{scripts}}) -}
+LIBS={- join(" \\\n" . ' ' x 5,
+ fill_lines(" ", $COLUMNS - 5,
+ map { platform->staticlib($_) // () }
+ @{$unified_info{libraries}})) -}
+SHLIBS={- join(" \\\n" . ' ' x 7,
+ fill_lines(" ", $COLUMNS - 7,
+ map { platform->sharedlib($_) // () }
+ @{$unified_info{libraries}})) -}
+SHLIB_INFO={- join(" \\\n" . ' ' x 11,
+ fill_lines(" ", $COLUMNS - 11,
+ map { my $x = platform->sharedlib($_);
+ my $y = platform->sharedlib_simple($_);
+ $x ? "\"$x;$y\"" : () }
+ @{$unified_info{libraries}})) -}
+MODULES={- join(" \\\n" . ' ' x 8,
+ fill_lines(" ", $COLUMNS - 8,
+ map { platform->dso($_) }
+ @{$unified_info{modules}})) -}
+PROGRAMS={- join(" \\\n" . ' ' x 9,
+ fill_lines(" ", $COLUMNS - 9,
+ map { platform->bin($_) }
+ @{$unified_info{programs}})) -}
+SCRIPTS={- join(" \\\n" . ' ' x 8,
+ fill_lines(" ", $COLUMNS - 8, @{$unified_info{scripts}})) -}
{- output_off() if $disabled{makedepend}; "" -}
-DEPS={- join(" ", map { platform->isobj($_) ? platform->dep($_) : () }
- grep { $unified_info{sources}->{$_}->[0] =~ /\.c$/ }
- keys %{$unified_info{sources}}); -}
+DEPS={- join(" \\\n" . ' ' x 5,
+ fill_lines(" ", $COLUMNS - 5,
+ map { platform->isobj($_) ? platform->dep($_) : () }
+ grep { $unified_info{sources}->{$_}->[0] =~ /\.c$/ }
+ keys %{$unified_info{sources}})); -}
{- output_on() if $disabled{makedepend}; "" -}
-GENERATED_MANDATORY={- join(" ", @{$unified_info{depends}->{""}}) -}
+GENERATED_MANDATORY={- join(" \\\n" . ' ' x 20,
+ fill_lines(" ", $COLUMNS - 20,
+ @{$unified_info{depends}->{""}})) -}
GENERATED={- # common0.tmpl provides @generated
- join(" ", map { platform->convertext($_) } @generated ) -}
+ join(" \\\n" . ' ' x 5,
+ fill_lines(" ", $COLUMNS - 5,
+ map { platform->convertext($_) } @generated )) -}
INSTALL_LIBS={-
- join(" ", map { platform->staticlib($_) // () }
- grep { !$unified_info{attributes}->{$_}->{noinst} }
- @{$unified_info{libraries}})
+ join(" \\\n" . ' ' x 13,
+ fill_lines(" ", $COLUMNS - 13,
+ map { platform->staticlib($_) // () }
+ grep { !$unified_info{attributes}->{libraries}->{$_}->{noinst} }
+ @{$unified_info{libraries}}))
-}
INSTALL_SHLIBS={-
- join(" ", map { platform->sharedlib($_) // () }
- grep { !$unified_info{attributes}->{$_}->{noinst} }
- @{$unified_info{libraries}})
+ join(" \\\n" . ' ' x 15,
+ fill_lines(" ", $COLUMNS - 15,
+ map { platform->sharedlib($_) // () }
+ grep { !$unified_info{attributes}->{libraries}->{$_}->{noinst} }
+ @{$unified_info{libraries}}))
-}
INSTALL_SHLIB_INFO={-
- join(" ", map { my $x = platform->sharedlib($_);
- my $y = platform->sharedlib_simple($_);
- $x ? "\"$x;$y\"" : () }
- grep { !$unified_info{attributes}->{$_}->{noinst} }
- @{$unified_info{libraries}})
+ join(" \\\n" . ' ' x 19,
+ fill_lines(" ", $COLUMNS - 19,
+ map { my $x = platform->sharedlib($_);
+ my $y = platform->sharedlib_simple($_);
+ $x ? "\"$x;$y\"" : () }
+ grep { !$unified_info{attributes}->{libraries}->{$_}->{noinst} }
+ @{$unified_info{libraries}}))
-}
INSTALL_ENGINES={-
- join(" ", map { platform->dso($_) }
- grep { !$unified_info{attributes}->{$_}->{noinst}
- && $unified_info{attributes}->{$_}->{engine} }
- @{$unified_info{modules}})
+ join(" \\\n" . ' ' x 16,
+ fill_lines(" ", $COLUMNS - 16,
+ map { platform->dso($_) }
+ grep { !$unified_info{attributes}->{modules}->{$_}->{noinst}
+ && $unified_info{attributes}->{modules}->{$_}->{engine} }
+ @{$unified_info{modules}}))
+-}
+INSTALL_MODULES={-
+ join(" \\\n" . ' ' x 16,
+ fill_lines(" ", $COLUMNS - 16,
+ map { platform->dso($_) }
+ grep { !$unified_info{attributes}->{modules}->{$_}->{noinst}
+ && !$unified_info{attributes}->{modules}->{$_}->{engine} }
+ @{$unified_info{modules}}))
-}
INSTALL_PROGRAMS={-
- join(" ", map { platform->bin($_) }
- grep { !$unified_info{attributes}->{$_}->{noinst} }
- @{$unified_info{programs}})
+ join(" \\\n" . ' ' x 16,
+ fill_lines(" ", $COLUMNS - 16, map { platform->bin($_) }
+ grep { !$unified_info{attributes}->{programs}->{$_}->{noinst} }
+ @{$unified_info{programs}}))
-}
BIN_SCRIPTS={-
- join(" ", map { my $x = $unified_info{attributes}->{$_}->{linkname};
- $x ? "$_:$x" : $_ }
- grep { !$unified_info{attributes}->{$_}->{noinst}
- && !$unified_info{attributes}->{$_}->{misc} }
- @{$unified_info{scripts}})
+ join(" \\\n" . ' ' x 12,
+ fill_lines(" ", $COLUMNS - 12,
+ map { my $x = $unified_info{attributes}->{scripts}->{$_}->{linkname};
+ $x ? "$_:$x" : $_ }
+ grep { !$unified_info{attributes}->{scripts}->{$_}->{noinst}
+ && !$unified_info{attributes}->{scripts}->{$_}->{misc} }
+ @{$unified_info{scripts}}))
-}
MISC_SCRIPTS={-
- join(" ", map { my $x = $unified_info{attributes}->{$_}->{linkname};
- $x ? "$_:$x" : $_ }
- grep { !$unified_info{attributes}->{$_}->{noinst}
- && $unified_info{attributes}->{$_}->{misc} }
- @{$unified_info{scripts}})
+ join(" \\\n" . ' ' x 13,
+ fill_lines(" ", $COLUMNS - 13,
+ map { my $x = $unified_info{attributes}->{scripts}->{$_}->{linkname};
+ $x ? "$_:$x" : $_ }
+ grep { !$unified_info{attributes}->{scripts}->{$_}->{noinst}
+ && $unified_info{attributes}->{scripts}->{$_}->{misc} }
+ @{$unified_info{scripts}}))
-}
-
-APPS_OPENSSL={- use File::Spec::Functions;
- catfile("apps","openssl") -}
+HTMLDOCS1={-
+ join(" \\\n" . ' ' x 10,
+ fill_lines(" ", $COLUMNS - 10, map { platform->bin($_) }
+ @{$unified_info{htmldocs}->{man1}})) -}
+HTMLDOCS3={-
+ join(" \\\n" . ' ' x 10,
+ fill_lines(" ", $COLUMNS - 10, map { platform->bin($_) }
+ @{$unified_info{htmldocs}->{man3}})) -}
+HTMLDOCS5={-
+ join(" \\\n" . ' ' x 10,
+ fill_lines(" ", $COLUMNS - 10, map { platform->bin($_) }
+ @{$unified_info{htmldocs}->{man5}})) -}
+HTMLDOCS7={-
+ join(" \\\n" . ' ' x 10,
+ fill_lines(" ", $COLUMNS - 10, map { platform->bin($_) }
+ @{$unified_info{htmldocs}->{man7}})) -}
+MANDOCS1={-
+ join(" \\\n" . ' ' x 9,
+ fill_lines(" ", $COLUMNS - 9, map { platform->bin($_) }
+ @{$unified_info{mandocs}->{man1}})) -}
+MANDOCS3={-
+ join(" \\\n" . ' ' x 9,
+ fill_lines(" ", $COLUMNS - 9, map { platform->bin($_) }
+ @{$unified_info{mandocs}->{man3}})) -}
+MANDOCS5={-
+ join(" \\\n" . ' ' x 9,
+ fill_lines(" ", $COLUMNS - 9, map { platform->bin($_) }
+ @{$unified_info{mandocs}->{man5}})) -}
+MANDOCS7={-
+ join(" \\\n" . ' ' x 9,
+ fill_lines(" ", $COLUMNS - 9, map { platform->bin($_) }
+ @{$unified_info{mandocs}->{man7}})) -}
+
+APPS_OPENSSL="{- use File::Spec::Functions;
+ catfile("apps","openssl") -}"
# DESTDIR is for package builders so that they can configure for, say,
# /usr/ and yet have everything installed to /tmp/somedir/usr/.
join(' ', $target{lib_cppflags} || (),
$target{shared_cppflag} || (),
(map { '-D'.$_ }
+ @{$target{lib_defines} || ()},
+ @{$target{shared_defines} || ()},
@{$config{lib_defines} || ()},
@{$config{shared_defines} || ()}),
+ (map { '-I'.quotify1($_) }
+ @{$target{lib_includes}},
+ @{$target{shared_includes}},
+ @{$config{lib_includes}},
+ @{$config{shared_includes}}),
@{$config{lib_cppflags}},
@{$config{shared_cppflag}});
join(' ', $lib_cppflags,
DSO_CPPFLAGS={- join(' ', $target{dso_cppflags} || (),
$target{module_cppflags} || (),
(map { '-D'.$_ }
+ @{$target{dso_defines}},
+ @{$target{module_defines}},
@{$config{dso_defines} || ()},
@{$config{module_defines} || ()}),
+ (map { '-I'.quotify1($_) }
+ @{$target{dso_includes}},
+ @{$target{module_includes}},
+ @{$config{dso_includes}},
+ @{$config{module_includes}}),
@{$config{dso_cppflags}},
@{$config{module_cppflags}},
'$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -}
# The main targets ###################################################
-{- dependmagic('all'); -}: build_libs_nodep build_modules_nodep build_programs_nodep link-utils
+{- dependmagic('build_sw'); -}: build_libs_nodep build_modules_nodep build_programs_nodep link-utils
{- dependmagic('build_libs'); -}: build_libs_nodep
{- dependmagic('build_modules'); -}: build_modules_nodep
{- dependmagic('build_programs'); -}: build_programs_nodep
+build_docs: build_man_docs build_html_docs
+build_man_docs: $(MANDOCS1) $(MANDOCS3) $(MANDOCS5) $(MANDOCS7)
+build_html_docs: $(HTMLDOCS1) $(HTMLDOCS3) $(HTMLDOCS5) $(HTMLDOCS7)
+
build_generated: $(GENERATED_MANDATORY)
build_libs_nodep: libcrypto.pc libssl.pc openssl.pc
build_modules_nodep: $(MODULES)
# Convenience target to prebuild all generated files, not just the mandatory
# ones
-build_all_generated: $(GENERATED_MANDATORY) $(GENERATED)
+build_all_generated: $(GENERATED_MANDATORY) $(GENERATED) build_docs
@ : {- output_off() if $disabled{makedepend}; "" -}
@echo "Warning: consider configuring with no-makedepend, because if"
@echo " target system doesn't have $(PERL),"
@echo " then make will fail..."
@ : {- output_on() if $disabled{makedepend}; "" -}
+all: build_sw build_docs
+
test: tests
{- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep link-utils
@ : {- output_off() if $disabled{tests}; "" -}
- ( cd test; \
- mkdir -p test-runs; \
- SRCTOP=../$(SRCDIR) \
- BLDTOP=../$(BLDDIR) \
- RESULT_D=test-runs \
+ ( SRCTOP=$(SRCDIR) \
+ BLDTOP=$(BLDDIR) \
PERL="$(PERL)" \
EXE_EXT={- platform->binext() -} \
- OPENSSL_ENGINES=`cd ../$(BLDDIR)/engines 2>/dev/null && pwd` \
- OPENSSL_MODULES=`cd ../$(BLDDIR)/providers 2>/dev/null && pwd` \
- OPENSSL_DEBUG_MEMORY=on \
- $(PERL) ../$(SRCDIR)/test/run_tests.pl $(TESTS) )
+ $(PERL) $(SRCDIR)/test/run_tests.pl $(TESTS) )
@ : {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}
@echo "Tests are not supported with your chosen Configure options"
@ : {- output_on() if !$disabled{tests}; "" -}
$(RM) *{- platform->defext() -}
clean: libclean
+ $(RM) $(HTMLDOCS1) $(HTMLDOCS3) $(HTMLDOCS5) $(HTMLDOCS7)
+ $(RM) $(MANDOCS1) $(MANDOCS3) $(MANDOCS5) $(MANDOCS7)
$(RM) $(PROGRAMS) $(TESTPROGS) $(MODULES) $(SCRIPTS)
$(RM) $(GENERATED_MANDATORY) $(GENERATED)
- -$(RM) `find . -name '*{- platform->depext() -}' \! -name '.*' -print`
- -$(RM) `find . -name '*{- platform->objext() -}' \! -name '.*' -print`
+ -$(RM) `find . -name '*{- platform->depext() -}' \! -name '.*' \! -type d -print`
+ -$(RM) `find . -name '*{- platform->objext() -}' \! -name '.*' \! -type d -print`
$(RM) core
- $(RM) tags TAGS doc-nits
+ $(RM) tags TAGS doc-nits cmd-nits
$(RM) -r test/test-runs
$(RM) openssl.pc libcrypto.pc libssl.pc
-$(RM) `find . -type l \! -name '.*' -print`
# Install helper targets #############################################
-install_sw: install_dev install_engines install_runtime
+install_sw: install_dev install_engines install_modules install_runtime
-uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
+uninstall_sw: uninstall_runtime uninstall_modules uninstall_engines uninstall_dev
install_docs: install_man_docs install_html_docs
-$(RMDIR) $(DESTDIR)$(libdir)/pkgconfig
-$(RMDIR) $(DESTDIR)$(libdir)
-install_engines: install_runtime_libs build_modules
+_install_modules_deps: install_runtime_libs build_modules
+
+install_engines: _install_modules_deps
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(ENGINESDIR)/
- @$(ECHO) "*** Installing ENGINE modules"
+ @$(ECHO) "*** Installing engines"
@set -e; for e in dummy $(INSTALL_ENGINES); do \
if [ "$$e" = "dummy" ]; then continue; fi; \
fn=`basename $$e`; \
done
uninstall_engines:
- @$(ECHO) "*** Uninstalling ENGINE modules"
+ @$(ECHO) "*** Uninstalling engines"
@set -e; for e in dummy $(INSTALL_ENGINES); do \
if [ "$$e" = "dummy" ]; then continue; fi; \
fn=`basename $$e`; \
done
-$(RMDIR) $(DESTDIR)$(ENGINESDIR)
+install_modules: _install_modules_deps
+ @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
+ @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MODULESDIR)/
+ @$(ECHO) "*** Installing modules"
+ @set -e; for e in dummy $(INSTALL_MODULES); do \
+ if [ "$$e" = "dummy" ]; then continue; fi; \
+ fn=`basename $$e`; \
+ $(ECHO) "install $$e -> $(DESTDIR)$(MODULESDIR)/$$fn"; \
+ cp $$e $(DESTDIR)$(MODULESDIR)/$$fn.new; \
+ chmod 755 $(DESTDIR)$(MODULESDIR)/$$fn.new; \
+ mv -f $(DESTDIR)$(MODULESDIR)/$$fn.new \
+ $(DESTDIR)$(MODULESDIR)/$$fn; \
+ done
+
+uninstall_modules:
+ @$(ECHO) "*** Uninstalling modules"
+ @set -e; for e in dummy $(INSTALL_MODULES); do \
+ if [ "$$e" = "dummy" ]; then continue; fi; \
+ fn=`basename $$e`; \
+ if [ "$$fn" = '{- platform->dso("ossltest") -}' ]; then \
+ continue; \
+ fi; \
+ $(ECHO) "$(RM) $(DESTDIR)$(MODULESDIR)/$$fn"; \
+ $(RM) $(DESTDIR)$(MODULESDIR)/$$fn; \
+ done
+ -$(RMDIR) $(DESTDIR)$(MODULESDIR)
+
install_runtime: install_programs
install_runtime_libs: build_libs
@ : {- output_on() unless windowsdll(); "" -}
-install_man_docs:
+install_man_docs: build_man_docs
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
+ @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MANDIR)/man1
+ @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MANDIR)/man3
+ @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MANDIR)/man5
+ @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MANDIR)/man7
@$(ECHO) "*** Installing manpages"
- $(PERL) $(SRCDIR)/util/process_docs.pl \
- --destdir=$(DESTDIR)$(MANDIR) --type=man --suffix=$(MANSUFFIX)
+ @set -e; for x in dummy $(MANDOCS1); do \
+ if [ "$$x" = "dummy" ]; then continue; fi; \
+ fn=`basename $$x`; \
+ $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man1/$$fn"; \
+ cp $$x $(DESTDIR)$(MANDIR)/man1/$$fn$(MANSUFFIX); \
+ chmod 755 $(DESTDIR)$(MANDIR)/man1/$$fn$(MANSUFFIX); \
+ done
+ @set -e; for x in dummy $(MANDOCS3); do \
+ if [ "$$x" = "dummy" ]; then continue; fi; \
+ fn=`basename $$x`; \
+ $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man3/$$fn"; \
+ cp $$x $(DESTDIR)$(MANDIR)/man3/$$fn$(MANSUFFIX); \
+ chmod 755 $(DESTDIR)$(MANDIR)/man3/$$fn$(MANSUFFIX); \
+ done
+ @set -e; for x in dummy $(MANDOCS5); do \
+ if [ "$$x" = "dummy" ]; then continue; fi; \
+ fn=`basename $$x`; \
+ $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man5/$$fn"; \
+ cp $$x $(DESTDIR)$(MANDIR)/man5/$$fn$(MANSUFFIX); \
+ chmod 755 $(DESTDIR)$(MANDIR)/man5/$$fn$(MANSUFFIX); \
+ done
+ @set -e; for x in dummy $(MANDOCS7); do \
+ if [ "$$x" = "dummy" ]; then continue; fi; \
+ fn=`basename $$x`; \
+ $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man7/$$fn"; \
+ cp $$x $(DESTDIR)$(MANDIR)/man7/$$fn$(MANSUFFIX); \
+ chmod 755 $(DESTDIR)$(MANDIR)/man7/$$fn$(MANSUFFIX); \
+ done
uninstall_man_docs:
@$(ECHO) "*** Uninstalling manpages"
- $(PERL) $(SRCDIR)/util/process_docs.pl \
- --destdir=$(DESTDIR)$(MANDIR) --type=man --suffix=$(MANSUFFIX) \
- --remove
+ @set -e; for x in dummy $(MANDOCS1); do \
+ if [ "$$x" = "dummy" ]; then continue; fi; \
+ fn=`basename $$x`; \
+ $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man1/$$fn"; \
+ $(RM) $(DESTDIR)$(MANDIR)/man1/$$fn$(MANSUFFIX); \
+ done
+ @set -e; for x in dummy $(MANDOCS3); do \
+ if [ "$$x" = "dummy" ]; then continue; fi; \
+ fn=`basename $$x`; \
+ $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man3/$$fn"; \
+ $(RM) $(DESTDIR)$(MANDIR)/man3/$$fn$(MANSUFFIX); \
+ done
+ @set -e; for x in dummy $(MANDOCS5); do \
+ if [ "$$x" = "dummy" ]; then continue; fi; \
+ fn=`basename $$x`; \
+ $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man5/$$fn"; \
+ $(RM) $(DESTDIR)$(MANDIR)/man5/$$fn$(MANSUFFIX); \
+ done
+ @set -e; for x in dummy $(MANDOCS7); do \
+ if [ "$$x" = "dummy" ]; then continue; fi; \
+ fn=`basename $$x`; \
+ $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man7/$$fn"; \
+ $(RM) $(DESTDIR)$(MANDIR)/man7/$$fn$(MANSUFFIX); \
+ done
-install_html_docs:
+install_html_docs: build_html_docs
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
+ @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man1
+ @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man3
+ @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man5
+ @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man7
@$(ECHO) "*** Installing HTML manpages"
- $(PERL) $(SRCDIR)/util/process_docs.pl \
- --destdir=$(DESTDIR)$(HTMLDIR) --type=html
+ @set -e; for x in dummy $(HTMLDOCS1); do \
+ if [ "$$x" = "dummy" ]; then continue; fi; \
+ fn=`basename $$x`; \
+ $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man1/$$fn"; \
+ cp $$x $(DESTDIR)$(HTMLDIR)/man1/$$fn; \
+ chmod 755 $(DESTDIR)$(HTMLDIR)/man1/$$fn; \
+ done
+ @set -e; for x in dummy $(HTMLDOCS3); do \
+ if [ "$$x" = "dummy" ]; then continue; fi; \
+ fn=`basename $$x`; \
+ $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man3/$$fn"; \
+ cp $$x $(DESTDIR)$(HTMLDIR)/man3/$$fn; \
+ chmod 755 $(DESTDIR)$(HTMLDIR)/man3/$$fn; \
+ done
+ @set -e; for x in dummy $(HTMLDOCS5); do \
+ if [ "$$x" = "dummy" ]; then continue; fi; \
+ fn=`basename $$x`; \
+ $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man5/$$fn"; \
+ cp $$x $(DESTDIR)$(HTMLDIR)/man5/$$fn; \
+ chmod 755 $(DESTDIR)$(HTMLDIR)/man5/$$fn; \
+ done
+ @set -e; for x in dummy $(HTMLDOCS7); do \
+ if [ "$$x" = "dummy" ]; then continue; fi; \
+ fn=`basename $$x`; \
+ $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man7/$$fn"; \
+ cp $$x $(DESTDIR)$(HTMLDIR)/man7/$$fn; \
+ chmod 755 $(DESTDIR)$(HTMLDIR)/man7/$$fn; \
+ done
uninstall_html_docs:
- @$(ECHO) "*** Uninstalling manpages"
- $(PERL) $(SRCDIR)/util/process_docs.pl \
- --destdir=$(DESTDIR)$(HTMLDIR) --type=html --remove
-
+ @$(ECHO) "*** Uninstalling HTML manpages"
+ @set -e; for x in dummy $(HTMLDOCS1); do \
+ if [ "$$x" = "dummy" ]; then continue; fi; \
+ fn=`basename $$x`; \
+ $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man1/$$fn"; \
+ $(RM) $(DESTDIR)$(HTMLDIR)/man1/$$fn; \
+ done
+ @set -e; for x in dummy $(HTMLDOCS3); do \
+ if [ "$$x" = "dummy" ]; then continue; fi; \
+ fn=`basename $$x`; \
+ $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man3/$$fn"; \
+ $(RM) $(DESTDIR)$(HTMLDIR)/man3/$$fn; \
+ done
+ @set -e; for x in dummy $(HTMLDOCS5); do \
+ if [ "$$x" = "dummy" ]; then continue; fi; \
+ fn=`basename $$x`; \
+ $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man5/$$fn"; \
+ $(RM) $(DESTDIR)$(HTMLDIR)/man5/$$fn; \
+ done
+ @set -e; for x in dummy $(HTMLDOCS7); do \
+ if [ "$$x" = "dummy" ]; then continue; fi; \
+ fn=`basename $$x`; \
+ $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man7/$$fn"; \
+ $(RM) $(DESTDIR)$(HTMLDIR)/man7/$$fn; \
+ done
# Developer targets (note: these are only available on Unix) #########
generate: generate_apps generate_crypto_bn generate_crypto_objects \
generate_crypto_conf generate_crypto_asn1 generate_fuzz_oids
-.PHONY: doc-nits
+.PHONY: doc-nits cmd-nits
doc-nits: build_generated
- (cd $(SRCDIR); $(PERL) util/find-doc-nits -n -p -s )
+ $(PERL) $(SRCDIR)/util/find-doc-nits -n -l -e
+
+cmd-nits: build_generated apps/openssl
+ $(PERL) $(SRCDIR)/util/find-doc-nits -c
# Test coverage is a good idea for the future
#coverage: $(PROGRAMS) $(TESTPROGRAMS)
generate_apps:
( cd $(SRCDIR); $(PERL) VMS/VMSify-conf.pl \
< apps/openssl.cnf > apps/openssl-vms.cnf )
- @ : {- output_off() if $disabled{apps}; "" -}
- ( b=`pwd`; cd $(SRCDIR); \
- $(PERL) -I$$b apps/progs.pl -H $(APPS_OPENSSL) > apps/progs.h )
- ( b=`pwd`; cd $(SRCDIR); \
- $(PERL) -I$$b apps/progs.pl -C $(APPS_OPENSSL) > apps/progs.c )
- @ : {- output_on() if $disabled{apps}; "" -}
generate_crypto_bn:
( cd $(SRCDIR); $(PERL) crypto/bn/bn_prime.pl > crypto/bn/bn_prime.h )
crypto/objects/obj_mac.num \
crypto/objects/obj_xref.txt \
> crypto/objects/obj_xref.h )
+ ( cd $(SRCDIR); cat crypto/objects/obj_compat.h >> include/openssl/obj_mac.h )
generate_crypto_conf:
( cd $(SRCDIR); $(PERL) crypto/conf/keysets.pl \
qw( include/internal/dso.h
include/internal/o_dir.h
include/internal/err.h
+ include/internal/evp.h
include/internal/sslconf.h );
our @cryptoskipheaders = ( @sslheaders,
qw( include/openssl/conf_api.h
}
"";
-}
-CRYPTOHEADERS={- join(" \\\n\t", sort @cryptoheaders) -}
-SSLHEADERS={- join(" \\\n\t", sort @sslheaders) -}
+CRYPTOHEADERS={- join(" \\\n" . ' ' x 14,
+ fill_lines(" ", $COLUMNS - 14, sort @cryptoheaders)) -}
+SSLHEADERS={- join(" \\\n" . ' ' x 11,
+ fill_lines(" ", $COLUMNS - 11, sort @sslheaders)) -}
ordinals:
( cd $(SRCDIR); \
$(PERL) util/mknum.pl --version $(VERSION) --no-warnings \
# Helper targets #####################################################
-link-utils: $(BLDDIR)/util/opensslwrap.sh
+link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/wrap.pl
-$(BLDDIR)/util/opensslwrap.sh: configdata.pm
+$(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/wrap.pl: configdata.pm
@if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \
mkdir -p "$(BLDDIR)/util"; \
- ln -sf "../$(SRCDIR)/util/opensslwrap.sh" "$(BLDDIR)/util"; \
+ ln -sf "../$(SRCDIR)/util/`basename "$@"`" "$(BLDDIR)/util"; \
fi
FORCE:
echo 'Version: '$(VERSION); \
echo 'Requires: libssl libcrypto' ) > openssl.pc
-configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -}
+configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config \
+ {- join(" \\\n" . ' ' x 15,
+ fill_lines(" ", $COLUMNS - 15,
+ @{$config{build_file_templates}},
+ @{$config{build_infos}},
+ @{$config{conf_files}})) -}
@echo "Detected changed: $?"
$(PERL) configdata.pm -r
@echo "**************************************************"
my $defs = join("", map { " -D".$_ } @{$args{defs}});
my $deps = join(" ", @{$args{generator_deps}}, @{$args{deps}});
- if (platform->isdef($args{src})) {
+ if ($args{src} =~ /\.html$/) {
+ my $title = basename($args{src}, ".html");
+ my $pod = $args{generator}->[0];
+ return <<"EOF";
+$args{src}: $pod
+ \$(PERL) \$(SRCDIR)/util/mkpod2html.pl -i "$pod" -o \$\@ -t "$title" -r "\$(SRCDIR)/doc"
+EOF
+ } elsif ($args{src} =~ /\.(\d)$/) {
+ my $section = $1;
+ my $name = uc basename($args{src}, ".$section");
+ my $pod = $args{generator}->[0];
+ return <<"EOF";
+$args{src}: $pod
+ pod2man --name=$name --section=$section --center=OpenSSL \\
+ --release=\$(VERSION) $pod >\$\@
+EOF
+ } elsif (platform->isdef($args{src})) {
my $target = platform->def($args{src});
(my $mkdef_os = $target{shared_target}) =~ s|-shared$||;
my $ord_ver = $args{intent} eq 'lib' ? ' --version $(VERSION)' : '';
my $dofile = abs2rel(rel2abs(catfile($config{sourcedir},
"util", "dofile.pl")),
rel2abs($config{builddir}));
+ my @modules = ( 'configdata.pm',
+ grep { $_ =~ m|\.pm$| } @{$args{deps}} );
+ my %moduleincs = map { '"-I'.dirname($_).'"' => 1 } @modules;
+ @modules = map { "-M".basename($_, '.pm') } @modules;
+ my $modules = join(' ', '', sort keys %moduleincs, @modules);
return <<"EOF";
-$args{src}: $args{generator}->[0] $deps
- \$(PERL) "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\
- "-o$target{build_file}" $generator > \$@
+$args{src}: $args{generator}->[0] $deps \$(BLDDIR)/configdata.pm
+ \$(PERL)$modules "$dofile" "-o$target{build_file}" $generator > \$@
EOF
} else {
return <<"EOF";
# last in the line. We may therefore need to put back a line ending.
sub src2obj {
my %args = @_;
- my $obj = platform->obj($args{obj});
+ my $obj = platform->convertext($args{obj});
my $dep = platform->dep($args{obj});
my @srcs = @{$args{srcs}};
my $srcs = join(" ", @srcs);
sub obj2shlib {
my %args = @_;
my @linkdirs = ();
- foreach (@{args{deps}}) {
- my $d = dirname($_);
- push @linkdirs, $d unless grep { $d eq $_ } @linkdirs;
+ my @linklibs = ();
+ foreach (@{$args{deps}}) {
+ if (platform->isstaticlib($_)) {
+ push @linklibs, platform->convertext($_);
+ } else {
+ my $d = "-L" . dirname($_);
+ my $l = basename($_);
+ $l =~ s/^lib//;
+ $l = "-l" . $l;
+ push @linklibs, $l;
+ push @linkdirs, $d unless grep { $d eq $_ } @linkdirs;
+ }
}
- my $linkflags = join("", map { "-L$_ " } @linkdirs);
- my $linklibs = join("", map { my $f = basename($_);
- (my $l = $f) =~ s/^lib//;
- " -l$l" } @{$args{deps}});
- my @objs = map { platform->obj($_) }
+ my $linkflags = join("", map { $_." " } @linkdirs);
+ my $linklibs = join("", map { $_." " } @linklibs);
+ my @objs = map { platform->convertext($_) }
grep { !platform->isdef($_) }
@{$args{objs}};
my @defs = map { platform->def($_) }
@{$args{objs}};
my @deps = compute_lib_depends(@{$args{deps}});
die "More than one exported symbol map" if scalar @defs > 1;
- my $objs = join(" ", @objs);
- my $deps = join(" ", @objs, @defs, @deps);
+
my $simple = platform->sharedlib_simple($args{lib});
my $full = platform->sharedlib($args{lib});
my $shared_soname = "";
$shared_imp .= ' '.$target{shared_impflag}.basename($simple)
if defined $target{shared_impflag};
my $shared_def = join("", map { ' '.$target{shared_defflag}.$_ } @defs);
+
+ my $objs = join(" \\\n\t\t", fill_lines(' ', $COLUMNS - 16, @objs));
+ my $deps = join(" \\\n" . ' ' x (length($full) + 2),
+ fill_lines(' ', $COLUMNS - length($full) - 2,
+ @objs, @defs, @deps));
+
my $recipe = <<"EOF";
$simple: $full
EOF
$recipe .= <<"EOF";
$full: $deps
\$(CC) \$(LIB_CFLAGS) $linkflags\$(LIB_LDFLAGS)$shared_soname$shared_imp \\
- -o $full$shared_def $objs \\
- $linklibs \$(LIB_EX_LIBS)
+ -o $full$shared_def \\
+ $objs \\
+ $linklibs \$(LIB_EX_LIBS)
EOF
if (windowsdll()) {
$recipe .= <<"EOF";
}
sub obj2dso {
my %args = @_;
- my $dso = platform->dso($args{lib});
+ my $dso = platform->dso($args{module});
my @linkdirs = ();
- foreach (@{args{deps}}) {
- my $d = dirname($_);
- push @linkdirs, $d unless grep { $d eq $_ } @linkdirs;
+ my @linklibs = ();
+ foreach (@{$args{deps}}) {
+ next unless defined $_;
+ if (platform->isstaticlib($_)) {
+ push @linklibs, platform->convertext($_);
+ } else {
+ my $d = "-L" . dirname($_);
+ my $l = basename($_);
+ $l =~ s/^lib//;
+ $l = "-l" . $l;
+ push @linklibs, $l;
+ push @linkdirs, $d unless grep { $d eq $_ } @linkdirs;
+ }
}
- my $linkflags = join("", map { "-L$_ " } @linkdirs);
- my $linklibs = join("", map { my $f = basename($_);
- (my $l = $f) =~ s/^lib//;
- " -l$l" } @{$args{deps}});
- my @objs = map { platform->obj($_) }
+ my $linkflags = join("", map { $_." " } @linkdirs);
+ my $linklibs = join("", map { $_." " } @linklibs);
+ my @objs = map { platform->convertext($_) }
grep { !platform->isdef($_) }
@{$args{objs}};
my @defs = map { platform->def($_) }
grep { platform->isdef($_) }
@{$args{objs}};
my @deps = compute_lib_depends(@{$args{deps}});
- my $objs = join(" ", @objs);
- my $deps = join(" ", @objs, @defs, @deps);
my $shared_def = join("", map { ' '.$target{shared_defflag}.$_ } @defs);
+
+ my $objs = join(" \\\n\t\t", fill_lines(' ', $COLUMNS - 16, @objs));
+ my $deps = join(" \\\n" . ' ' x (length($dso) + 2),
+ fill_lines(' ', $COLUMNS - length($dso) - 2,
+ @objs, @defs, @deps));
+
return <<"EOF";
$dso: $deps
\$(CC) \$(DSO_CFLAGS) $linkflags\$(DSO_LDFLAGS) \\
- -o $dso$shared_def $objs \\
- $linklibs \$(DSO_EX_LIBS)
+ -o $dso$shared_def \\
+ $objs \\
+ $linklibs\$(DSO_EX_LIBS)
EOF
}
sub obj2lib {
my %args = @_;
my $lib = platform->staticlib($args{lib});
my @objs = map { platform->obj($_) } @{$args{objs}};
- my $objs = join(" ", @objs);
+ my $objs = join(" \\\n" . ' ' x (length($lib) + 2),
+ fill_lines(' ', $COLUMNS - length($lib) - 2, @objs));
return <<"EOF";
$lib: $objs
\$(AR) \$(ARFLAGS) \$\@ \$\?
sub obj2bin {
my %args = @_;
my $bin = platform->bin($args{bin});
- my $objs = join(" ", map { platform->obj($_) } @{$args{objs}});
- my $deps = join(" ", compute_lib_depends(@{$args{deps}}));
+ my @objs = map { platform->obj($_) } @{$args{objs}};
+ my @deps = compute_lib_depends(@{$args{deps}});
+ my $objs = join(" \\\n" . ' ' x (length($bin) + 2),
+ fill_lines(' ', $COLUMNS - length($bin) - 2, @objs));
my @linkdirs = ();
- foreach (@{args{deps}}) {
- next if $_ =~ /\.a$/;
- my $d = dirname($_);
- push @linkdirs, $d unless grep { $d eq $_ } @linkdirs;
+ my @linklibs = ();
+ foreach (@{$args{deps}}) {
+ next unless defined $_;
+ if (platform->isstaticlib($_)) {
+ push @linklibs, platform->convertext($_);
+ } else {
+ my $d = "-L" . dirname($_);
+ my $l = basename($_);
+ $l =~ s/^lib//;
+ $l = "-l" . $l;
+ push @linklibs, $l;
+ push @linkdirs, $d unless grep { $d eq $_ } @linkdirs;
+ }
}
- my $linkflags = join("", map { "-L$_ " } @linkdirs);
- my $linklibs = join("", map { if ($_ =~ m/\.a$/) {
- " ".platform->staticlib($_);
- } else {
- my $f = basename($_);
- (my $l = $f) =~ s/^lib//;
- " -l$l"
- }
- } @{$args{deps}});
+ my $linkflags = join("", map { $_." " } @linkdirs);
+ my $linklibs = join("", map { $_." " } @linklibs);
my $cmd = '$(CC)';
my $cmdflags = '$(BIN_CFLAGS)';
if (grep /_cc\.o$/, @{$args{objs}}) {
$cmd = '$(CXX)';
$cmdflags = '$(BIN_CXXFLAGS)';
}
+
+ my $objs = join(" \\\n\t\t", fill_lines(' ', $COLUMNS - 16, @objs));
+ my $deps = join(" \\\n" . ' ' x (length($bin) + 2),
+ fill_lines(' ', $COLUMNS - length($bin) - 2,
+ @objs, @deps));
+
return <<"EOF";
-$bin: $objs $deps
+$bin: $deps
rm -f $bin
\$\${LDCMD:-$cmd} $cmdflags $linkflags\$(BIN_LDFLAGS) \\
- -o $bin $objs \\
- $linklibs \$(BIN_EX_LIBS)
+ -o $bin \\
+ $objs \\
+ $linklibs\$(BIN_EX_LIBS)
EOF
}
sub in2script {
my %args = @_;
my $dir = $args{dir};
my @deps = map { platform->convertext($_) } @{$args{deps}};
- my @actions = ();
+ my @comments = ();
my %extinfo = ( dso => platform->dsoext(),
lib => platform->libext(),
bin => platform->binext() );
if (dirname($prod) eq $dir) {
push @deps, $prod.$extinfo{$type};
} else {
- push @actions, "\t@ : No support to produce $type ".join(", ", @{$unified_info{dirinfo}->{$dir}->{products}->{$type}});
+ push @comments, "# No support to produce $type ".join(", ", @{$unified_info{dirinfo}->{$dir}->{products}->{$type}});
}
}
}
}
- my $deps = join(" ", @deps);
- my $actions = join("\n", "", @actions);
+ my $target = "$dir $dir/";
+ my $deps = join(" \\\n\t",
+ fill_lines(' ', $COLUMNS - 8, @deps));
+ my $comments = join("\n", "", @comments);
return <<"EOF";
-$dir $dir/: $deps$actions
+$target: \\
+ $deps$comments
EOF
}
"" # Important! This becomes part of the template result.
projects / openssl.git / blobdiff