Allow space in PERL spec (unix only)

[openssl.git] / Configurations / unix-Makefile.tmpl

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 974a978fb3ebf8f8689cc92fa977ec66231dc6fa..e20b63210a95af59196859fad72790f35afdb316 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -84,7 +84,12 @@ DEPS={- join(" ", map { (my $x = $_) =~ s|\.o$|$depext|; $x; }
                   grep { $unified_info{sources}->{$_}->[0] =~ /\.c$/ }
                   keys %{$unified_info{sources}}); -}
 {- output_on() if $disabled{makedepend}; "" -}
-GENERATED={- join(" ", map { (my $x = $_) =~ s|\.S$|\.s|; $x } keys %{$unified_info{generate}}) -}
+GENERATED={- join(" ",
+                  ( map { (my $x = $_) =~ s|\.S$|\.s|; $x }
+                    grep { defined $unified_info{generate}->{$_} }
+                    map { @{$unified_info{sources}->{$_}} }
+                    grep { /\.o$/ } keys %{$unified_info{sources}} ),
+                  ( grep { /\.h$/ } keys %{$unified_info{generate}} )) -}
 
 {- output_off() if $disabled{apps}; "" -}
 BIN_SCRIPTS=$(BLDDIR)/tools/c_rehash
@@ -169,7 +174,6 @@ LIB_LDFLAGS={- $target{shared_ldflag}." ".$config{shared_ldflag}
                # $prefix is not /usr.
                . ($config{target} =~ m|^BSD-| && $prefix !~ m|^/usr/.*$|
                   ? " -Wl,-rpath,\$\$(LIBRPATH)" : "") -}
-RCFLAGS={- $target{shared_rcflag} -}
 DSO_CFLAGS={- $target{shared_cflag} || "" -}
 DSO_LDFLAGS=$(LIB_LDFLAGS)
 BIN_CFLAGS={- $target{bin_cflags} -}
@@ -180,6 +184,8 @@ ARFLAGS= {- $target{arflags} -}
 AR=$(CROSS_COMPILE){- $target{ar} || "ar" -} $(ARFLAGS) r
 RANLIB= {- $target{ranlib} -}
 NM= $(CROSS_COMPILE){- $target{nm} || "nm" -}
+RCFLAGS={- $target{shared_rcflag} -}
+RC= $(CROSS_COMPILE){- $target{rc} || "windres" -}
 RM= rm -f
 RMDIR= rmdir
 TAR= {- $target{tar} || "tar" -}
@@ -224,6 +230,7 @@ tests: build_tests_nodep build_apps_nodep build_engines_nodep \
        ( cd test; \
          SRCTOP=../$(SRCDIR) \
          BLDTOP=../$(BLDDIR) \
+         PERL="$(PERL)" \
          EXE_EXT={- $exeext -} \
          OPENSSL_ENGINES=../$(BLDDIR)/engines \
            $(PERL) ../$(SRCDIR)/test/run_tests.pl $(TESTS) )
@@ -232,7 +239,7 @@ tests: build_tests_nodep build_apps_nodep build_engines_nodep \
        @ : {- output_on() if !$disabled{tests}; "" -}
 
 list-tests:
-       @TOP=$(SRCDIR) PERL=$(PERL) $(PERL) $(SRCDIR)/test/run_tests.pl list
+       @TOP="$(SRCDIR)" PERL="$(PERL)" $(PERL) $(SRCDIR)/test/run_tests.pl list
 
 libclean:
        @set -e; for s in $(SHLIB_INFO); do \
@@ -259,7 +266,7 @@ clean: libclean
        rm -f core
        rm -f tags TAGS
        rm -f openssl.pc libcrypto.pc libssl.pc
-       -rm -f `find . -type l`
+       -rm -f `find . -type l -a \! -path "./.git/*"`
        rm -f $(TARFILE)
 
 # This exists solely for those who still type 'make depend'
@@ -527,6 +534,7 @@ PROCESS_PODS=\
                SEC=`sed -ne 's/^=for  *comment  *openssl_manual_section: *\([0-9]\) *$$/\1/p' $$p`; \
                [ -z "$$SEC" ] && SEC=$$defsec; \
                fn=`basename $$p .pod`; \
+               Name=$$fn; \
                NAME=`echo $$fn | tr [a-z] [A-Z]`; \
                suf=`eval "echo $$OUTSUFFIX"`; \
                top=`eval "echo $$OUTTOP"`; \
@@ -606,7 +614,7 @@ install_html_docs:
        OUTSUFFIX='.$(HTMLSUFFIX)'; \
        OUTTOP="$(DESTDIR)$(HTMLDIR)"; \
        GENERATE="pod2html --podroot=$(SRCDIR)/doc --htmldir=.. \
-                          --podpath=apps:crypto:ssl \
+                          --podpath=apps:crypto:ssl --title=\$$Name \
                  | sed -e 's|href=\"http://man.he.net/man|href=\"../man|g'"; \
        $(PROCESS_PODS)
 
@@ -846,7 +854,9 @@ EOF
 $target: $args{generator}->[0] $deps
        ( trap "rm -f \$@.*" INT 0; \\
          $generator \$@.S; \\
-         \$(CC) \$(CFLAGS) $incs -E -P \$@.S > \$@.i && mv -f \$@.i \$@ )
+         \$(CC) \$(CFLAGS) $incs -E \$@.S | \\
+         \$(PERL) -ne '/^#(line)?\\s*[0-9]+/ or print' > \$@.i && \\
+         mv -f \$@.i \$@ )
 EOF
               }
               # Otherwise....
@@ -857,7 +867,8 @@ EOF
           }
           return <<"EOF";
 $args{src}: $args{generator}->[0] $deps
-       \$(CC) \$(CFLAGS) $incs -E -P \$< > \$@
+       \$(CC) \$(CFLAGS) $incs -E \$< | \\
+       \$(PERL) -ne '/^#(line)?\\s*[0-9]+/ or print' > \$@
 EOF
       }
   }
@@ -950,15 +961,15 @@ EOF
 $target: $lib$libext $deps $ordinalsfile
        \$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\
                PLATFORM=\$(PLATFORM) \\
-               PERL=\$(PERL) SRCDIR='\$(SRCDIR)' DSTDIR="$libd" \\
+               PERL="\$(PERL)" SRCDIR='\$(SRCDIR)' DSTDIR="$libd" \\
                INSTALLTOP='\$(INSTALLTOP)' LIBDIR='\$(LIBDIR)' \\
                LIBDEPS='\$(PLIB_LDFLAGS) '"$linklibs"' \$(EX_LIBS)' \\
                LIBNAME=$libname LIBVERSION=\$(SHLIB_MAJOR).\$(SHLIB_MINOR) \\
                LIBCOMPATVERSIONS=';\$(SHLIB_VERSION_HISTORY)' \\
                CC='\$(CC)' CFLAGS='\$(CFLAGS) \$(LIB_CFLAGS)' \\
-               CROSS_COMPILE='\$(CROSS_COMPILE)' LDFLAGS='\$(LDFLAGS)' \\
+               LDFLAGS='\$(LDFLAGS)' \\
                SHARED_LDFLAGS='\$(LIB_LDFLAGS)' SHLIB_EXT=$shlibext \\
-               SHARED_RCFLAGS='\$(RCFLAGS)' \\
+               RC='\$(RC)' SHARED_RCFLAGS='\$(RCFLAGS)' \\
                link_shlib.$shlib_target
 EOF
          . (windowsdll() ? <<"EOF" : "");
@@ -986,7 +997,7 @@ EOF
 $target: $objs $deps
        \$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\
                PLATFORM=\$(PLATFORM) \\
-               PERL=\$(PERL) SRCDIR='\$(SRCDIR)' DSTDIR="$libd" \\
+               PERL="\$(PERL)" SRCDIR='\$(SRCDIR)' DSTDIR="$libd" \\
                LIBDEPS='\$(PLIB_LDFLAGS) '"$shlibdeps"' \$(EX_LIBS)' \\
                LIBNAME=$libname LDFLAGS='\$(LDFLAGS)' \\
                CC='\$(CC)' CFLAGS='\$(CFLAGS) \$(DSO_CFLAGS)' \\
@@ -1023,7 +1034,7 @@ EOF
 $bin$exeext: $objs $deps
        \$(RM) $bin$exeext
        \$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\
-               PERL=\$(PERL) SRCDIR=\$(SRCDIR) \\
+               PERL="\$(PERL)" SRCDIR=\$(SRCDIR) \\
                APPNAME=$bin$exeext OBJECTS="$objs" \\
                LIBDEPS='\$(PLIB_LDFLAGS) '"$linklibs"' \$(EX_LIBS)' \\
                CC='\$(CC)' CFLAGS='\$(CFLAGS) \$(BIN_CFLAGS)' \\