Build files: parametrize cpp

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

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 1eb5818ddc73134a833814e0f61bae5d47e52b14..dad868b1df9e5b5f570c7d14328d17a2879cc133 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -192,7 +192,7 @@ CPPFLAGS_Q={- $cppflags =~ s|([\\"])|\\$1|g; $cppflags -}
 CC= $(CROSS_COMPILE){- $config{cc} -}
 CFLAGS={- join(' ', @{$config{cflags}}) -}
 CXX= $(CROSS_COMPILE){- $config{cxx} -}
-CXXFLAGS={- join(' ', @{$config{cxxflags}}) -} -std=c++11
+CXXFLAGS={- join(' ', @{$config{cxxflags}}) -}
 LDFLAGS= {- join(' ', @{$config{lflags}}) -}
 PLIB_LDFLAGS= {- join(' ', @{$config{plib_lflags}}) -}
 EX_LIBS= {- join(' ', @{$config{ex_libs}}) -}
@@ -674,10 +674,11 @@ generate_fuzz_oids:
 ERROR_REBUILD=
 errors:
        ( cd $(SRCDIR); $(PERL) util/ck_errf.pl -strict */*.c */*/*.c )
-       ( cd $(SRCDIR); $(PERL) util/mkerr.pl $(ERROR_REBUILD) -internal )
-       ( cd $(SRCDIR)/engines; \
+       ( b=`pwd`; cd $(SRCDIR); \
+          $(PERL) -I$$b util/mkerr.pl $(ERROR_REBUILD) -internal )
+       ( b=`pwd`; cd $(SRCDIR)/engines; \
           for E in *.ec ; do \
-              $(PERL) ../util/mkerr.pl $(ERROR_REBUILD) -static \
+              $(PERL) -I$$b ../util/mkerr.pl $(ERROR_REBUILD) -static \
                 -conf $$E `basename $$E .ec`.c ; \
           done )
 
@@ -785,8 +786,7 @@ openssl.pc:
 
 configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -}
        @echo "Detected changed: $?"
-       @echo "Reconfiguring..."
-       $(PERL) $(SRCDIR)/Configure reconf
+       $(PERL) configdata.pm -r -v
        @echo "**************************************************"
        @echo "***                                            ***"
        @echo "***   Please run the same make command again   ***"
@@ -794,6 +794,9 @@ configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build
        @echo "**************************************************"
        @false
 
+reconfigure reconf:
+       $(PERL) configdata.pm -r -v
+
 {-
   use File::Basename;
   use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/;
@@ -854,7 +857,7 @@ EOF
 $target: $args{generator}->[0] $deps
        ( trap "rm -f \$@.*" INT 0; \\
          $generator \$@.S; \\
-         \$(CC) $incs \$(CFLAGS) \$(CPPFLAGS) -E \$@.S | \\
+         \$(CPP) $incs $cppflags \$@.S | \\
          \$(PERL) -ne '/^#(line)?\\s*[0-9]+/ or print' > \$@.i && \\
          mv -f \$@.i \$@ )
 EOF
@@ -867,7 +870,7 @@ EOF
           }
           return <<"EOF";
 $args{src}: $args{generator}->[0] $deps
-       \$(CC) $incs \$(CFLAGS) \$(CPPFLAGS) -E $args{generator}->[0] | \\
+       \$(CPP) $incs $cppflags $args{generator}->[0] | \\
        \$(PERL) -ne '/^#(line)?\\s*[0-9]+/ or print' > \$@
 EOF
       }
@@ -888,11 +891,6 @@ EOF
       my $srcs = join(" ",  @srcs);
       my $deps = join(" ", @srcs, @{$args{deps}});
       my $incs = join("", map { " -I".$_ } @{$args{incs}});
-      unless ($disabled{zlib}) {
-          if ($withargs{zlib_include}) {
-              $incs .= " -I".$withargs{zlib_include};
-          }
-      }
       my $cmd = '$(CC)';
       my $cmdflags = '$(CFLAGS)';
       my $cmdcompile = ' -c';