projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
make update
[openssl.git] / Configurations / unix-Makefile.tmpl
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index eefb50a8ea0874fe27c1d987f866def9a1f083f6..132b83cd2c63a7839f5b60526712b5363ca2e394 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -38,20 +38,26 @@
      # 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.
@@ -84,7 +90,7 @@ SHLIB_MAJOR={- $config{shlib_major} -}
 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}}) -}
@@ -103,7 +109,7 @@ GENERATED={- join(" ",
                     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}}) -}
@@ -289,7 +295,8 @@ clean: libclean
        -$(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/*"`
        $(RM) $(TARFILE)
@@ -323,9 +330,6 @@ install_sw: all install_dev install_engines install_runtime
 
 uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
 
-doc-nits:
-       $(PERL) util/find-doc-nits.pl -n
-
 install_docs: install_man_docs install_html_docs
 
 uninstall_docs: uninstall_man_docs uninstall_html_docs
@@ -565,109 +569,29 @@ uninstall_runtime:
        @ : {- 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) #########
@@ -677,6 +601,10 @@ update: generate errors ordinals
 generate: generate_apps generate_crypto_bn generate_crypto_objects \
           generate_crypto_conf generate_crypto_asn1
 
+doc-nits:
+       (cd $(SRCDIR); $(PERL) util/find-doc-nits -n ) >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)
 #      ...
@@ -847,7 +775,7 @@ configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build
   # 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:
@@ -1061,7 +989,7 @@ EOF
   }
   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
Unnamed repository; edit this file 'description' to name the repository.