# removed. On some systems, they may therefore return the exact same
# string.
sub shlib {
- return () if $disabled{shared};
my $lib = shift;
+ return () if $disabled{shared} || $lib =~ /\.a$/;
return $unified_info{sharednames}->{$lib} . $shlibext;
}
sub shlib_simple {
- return () if $disabled{shared};
-
my $lib = shift;
+ return () if $disabled{shared} || $lib =~ /\.a$/;
+
if (windowsdll()) {
return $lib . $shlibextimport;
}
return $lib . $shlibextsimple;
}
+ # Easy fixing of static library names
+ sub lib {
+ (my $lib = shift) =~ s/\.a$//;
+ return $lib . $libext;
+ }
+
# dso is a complement to shlib / shlib_simple that returns the
# given libname with the simple shared extension (possible SO version
# removed). This differs from shlib_simple() by being unconditional.
SHLIB_MINOR={- $config{shlib_minor} -}
SHLIB_TARGET={- $target{shared_target} -}
-LIBS={- join(" ", map { $_.$libext } @{$unified_info{libraries}}) -}
+LIBS={- join(" ", map { lib($_) } @{$unified_info{libraries}}) -}
SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{libraries}}) -}
SHLIB_INFO={- join(" ", map { "\"".shlib($_).";".shlib_simple($_)."\"" } @{$unified_info{libraries}}) -}
ENGINES={- join(" ", map { dso($_) } @{$unified_info{engines}}) -}
grep { /\.o$/ } keys %{$unified_info{sources}} ),
( grep { /\.h$/ } keys %{$unified_info{generate}} )) -}
-INSTALL_LIBS={- join(" ", map { $_.$libext } @{$unified_info{install}->{libraries}}) -}
+INSTALL_LIBS={- join(" ", map { lib($_) } @{$unified_info{install}->{libraries}}) -}
INSTALL_SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{install}->{libraries}}) -}
INSTALL_SHLIB_INFO={- join(" ", map { "\"".shlib($_).";".shlib_simple($_)."\"" } @{$unified_info{install}->{libraries}}) -}
INSTALL_ENGINES={- join(" ", map { dso($_) } @{$unified_info{install}->{engines}}) -}
MISC_SCRIPTS=$(BLDDIR)/apps/CA.pl $(BLDDIR)/apps/tsget
{- output_on() if $disabled{apps}; "" -}
+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/.
# Normally it is left empty.
# Kept around for backward compatibility
build_apps build_tests: build_programs
+# Convenience target to prebuild all generated files, not just the mandatory
+# ones
+build_all_generated: $(GENERATED_MANDATORY) $(GENERATED)
+
test: tests
{- dependmagic('tests'); -}: build_programs_nodep build_engines_nodep link-utils
@ : {- output_off() if $disabled{tests}; "" -}
-$(RM) `find . -name '*{- $depext -}' -a \! -path "./.git/*"`
-$(RM) `find . -name '*{- $objext -}' -a \! -path "./.git/*"`
$(RM) core
- $(RM) tags TAGS
+ $(RM) tags TAGS doc-nits
$(RM) test/.rnd
$(RM) openssl.pc libcrypto.pc libssl.pc
-$(RM) `find . -type l -a \! -path "./.git/*"`
@ : {- output_on() unless windowsdll(); "" -}
-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin
-# A method to extract all names from a .pod file
-# The first sed extracts everything between "=head1 NAME" and the next =head1
-# The perl command joins all the lines into one
-# The second sed removes the description and turns all commas into spaces
-# Voilà, you have a space separated list of names!
-EXTRACT_NAMES=sed -e '1,/^=head1 *NAME *$$/d;/^=head1/,$$d' | \
- $(PERL) -p -0 -e 's/\n/ /g; END {print "\n"}' | \
- sed -e 's/ - .*$$//;s/,/ /g'
-PROCESS_PODS=\
- set -e; \
- here=`cd $(SRCDIR); pwd`; \
- point=$$here/util/point.sh; \
- for ds in man1 man3 man5 man7 ; do \
- SEC=`echo $$ds | sed -e s/man//`; \
- for p in $(SRCDIR)/doc/$$ds/*.pod; do \
- fn=`basename $$p .pod`; \
- Name=$$fn; \
- NAME=`echo $$fn | tr '[a-z]' '[A-Z]'`; \
- suf=`eval "echo $$OUTSUFFIX"`; \
- top=`eval "echo $$OUTTOP"`; \
- $(PERL) $(SRCDIR)/util/mkdir-p.pl $$top/man$$SEC; \
- echo "install $$p -> $$top/man$$SEC/$$fn$$suf"; \
- cat $$p | eval "$$GENERATE" \
- > $$top/man$$SEC/$$fn$$suf; \
- names=`cat $$p | $(EXTRACT_NAMES)`; \
- ( cd $$top/man$$SEC; \
- for n in $$names; do \
- comp_n="$$n"; \
- comp_fn="$$fn"; \
- case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \
- comp_n=`echo "$$n" | tr '[A-Z]' '[a-z]'`; \
- comp_fn=`echo "$$fn" | tr '[A-Z]' '[a-z]'`; \
- ;; \
- esac; \
- if [ "$$comp_n" != "$$comp_fn" ]; then \
- echo "link $$top/man$$SEC/$$n$$suf -> $$top/man$$SEC/$$fn$$suf"; \
- PLATFORM=$(PLATFORM) $$point $$fn$$suf $$n$$suf; \
- fi; \
- done ); \
- done; \
- done
-UNINSTALL_DOCS=\
- set -e; \
- here=`cd $(SRCDIR); pwd`; \
- for ds in man1 man3 man5 man7 ; do \
- SEC=`echo $$ds | sed -e s/man//`; \
- for p in $(SRCDIR)/doc/$$ds/*.pod; do \
- fn=`basename $$p .pod`; \
- suf=`eval "echo $$OUTSUFFIX"`; \
- top=`eval "echo $$OUTTOP"`; \
- echo "$(RM) $$top/man$$SEC/$$fn$$suf"; \
- $(RM) $$top/man$$SEC/$$fn$$suf; \
- names=`cat $$p | $(EXTRACT_NAMES)`; \
- for n in $$names; do \
- comp_n="$$n"; \
- comp_fn="$$fn"; \
- case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \
- comp_n=`echo "$$n" | tr '[A-Z]' '[a-z]'`; \
- comp_fn=`echo "$$fn" | tr '[A-Z]' '[a-z]'`; \
- ;; \
- esac; \
- if [ "$$comp_n" != "$$comp_fn" ]; then \
- echo "$(RM) $$top/man$$SEC/$$n$$suf"; \
- $(RM) $$top/man$$SEC/$$n$$suf; \
- fi; \
- done; \
- ( $(RMDIR) $$top/man$$SEC 2>/dev/null || exit 0 ); \
- done; \
- done
install_man_docs:
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
@echo "*** Installing manpages"
- @\
- OUTSUFFIX='.$${SEC}$(MANSUFFIX)'; \
- OUTTOP="$(DESTDIR)$(MANDIR)"; \
- GENERATE='pod2man --name=$$NAME --section=$$SEC --center=OpenSSL --release=$(VERSION)'; \
- $(PROCESS_PODS)
+ $(PERL) $(SRCDIR)/util/process_docs.pl \
+ --destdir=$(DESTDIR)$(MANDIR) --type=man --suffix=$(MANSUFFIX)
uninstall_man_docs:
@echo "*** Uninstalling manpages"
- @\
- OUTSUFFIX='.$${SEC}$(MANSUFFIX)'; \
- OUTTOP="$(DESTDIR)$(MANDIR)"; \
- $(UNINSTALL_DOCS)
+ $(PERL) $(SRCDIR)/util/process_docs.pl \
+ --destdir=$(DESTDIR)$(MANDIR) --type=man --suffix=$(MANSUFFIX) \
+ --remove
install_html_docs:
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
@echo "*** Installing HTML manpages"
- @\
- OUTSUFFIX='.$(HTMLSUFFIX)'; \
- OUTTOP="$(DESTDIR)$(HTMLDIR)"; \
- GENERATE="pod2html --podroot=$(SRCDIR)/doc --htmldir=.. \
- --podpath=apps:crypto:ssl --title=\$$Name \
- | perl -pe 's|href=\"http://man.he.net/man|href=\"../man|g; s|href=\"(.*/man.*)(?<!\.html)\">|href=\"\$$1.html\">|g;'"; \
- $(PROCESS_PODS)
+ $(PERL) $(SRCDIR)/util/process_docs.pl \
+ --destdir=$(DESTDIR)$(HTMLDIR) --type=html
uninstall_html_docs:
@echo "*** Uninstalling manpages"
- @\
- OUTSUFFIX='.$(HTMLSUFFIX)'; \
- OUTTOP="$(DESTDIR)$(HTMLDIR)"; \
- $(UNINSTALL_DOCS)
+ $(PERL) $(SRCDIR)/util/process_docs.pl \
+ --destdir=$(DESTDIR)$(HTMLDIR) --type=html --remove
# Developer targets (note: these are only available on Unix) #########
generate_crypto_conf generate_crypto_asn1
doc-nits:
- (cd $(SRCDIR); $(PERL) util/find-doc-nits.pl -n ) >doc-nits
- if [ -s doc-nits ] ; then cat doc-nits; exit 1; fi
+ (cd $(SRCDIR); $(PERL) util/find-doc-nits -n -p ) >doc-nits
+ if [ -s doc-nits ] ; then cat doc-nits; rm doc-nits ; exit 1; fi
# Test coverage is a good idea for the future
#coverage: $(PROGRAMS) $(TESTPROGRAMS)
lint:
lint -DLINT $(INCLUDES) $(SRCS)
-{- # because the program apps/openssl has object files as sources, and
- # they then have the corresponding C files as source, we need to chain
- # the lookups in %unified_info
- my $apps_openssl = catfile("apps","openssl");
- our @openssl_source = map { @{$unified_info{sources}->{$_}} }
- @{$unified_info{sources}->{$apps_openssl}};
- ""; -}
generate_apps:
( cd $(SRCDIR); $(PERL) VMS/VMSify-conf.pl \
< apps/openssl.cnf > apps/openssl-vms.cnf )
- ( b=`pwd`; cd $(SRCDIR); $(PERL) -I$$b apps/progs.pl \
- {- join(" ", @openssl_source) -} \
- > apps/progs.h )
generate_crypto_bn:
( cd $(SRCDIR); $(PERL) crypto/bn/bn_prime.pl > crypto/bn/bn_prime.h )
( cd $(SRCDIR); $(PERL) crypto/asn1/charmap.pl \
> crypto/asn1/charmap.h )
+# Set to -force to force a rebuild
+ERROR_REBUILD=
errors:
( cd $(SRCDIR); $(PERL) util/ck_errf.pl -strict */*.c */*/*.c )
- ( cd $(SRCDIR); $(PERL) util/mkerr.pl -recurse -write )
+ ( cd $(SRCDIR); $(PERL) util/mkerr.pl $(ERROR_REBUILD) -internal )
( cd $(SRCDIR)/engines; \
- for e in *.ec; do \
- $(PERL) ../util/mkerr.pl -conf $$e \
- -nostatic -staticloader -write *.c; \
- done )
+ for E in *.ec ; do \
+ $(PERL) ../util/mkerr.pl $(ERROR_REBUILD) -static \
+ -conf $$E `basename $$E .ec`.c ; \
+ done )
ordinals:
( b=`pwd`; cd $(SRCDIR); $(PERL) -I$$b util/mkdef.pl crypto update )
# It takes a list of library names and outputs a list of dependencies
sub compute_lib_depends {
if ($disabled{shared}) {
- return map { $_ =~ /\.a$/ ? $`.$libext : $_.$libext } @_;
+ return map { lib($_) } @_;
}
# Depending on shared libraries:
}
sub obj2lib {
my %args = @_;
- my $lib = $args{lib};
+ (my $lib = $args{lib}) =~ s/\.a$//;
my $objs = join(" ", map { $_.$objext } @{$args{objs}});
return <<"EOF";
$lib$libext: $objs
projects / openssl.git / blobdiff