projects / oweals / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add missing '.text' in crypto/bn/asm/ppc.pl
[oweals/openssl.git] / Configurations / unix-Makefile.tmpl
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index b92dae28134164ca206f1fcb631fc8f6be2162cb..1292053546f5f60592407eeaa5f64ed47282beec 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -227,6 +227,7 @@ TARFLAGS= {- $target{TARFLAGS} -}
 
 BASENAME=       openssl
 NAME=           $(BASENAME)-$(VERSION)
+# Relative to $(SRCDIR)
 TARFILE=        ../$(NAME).tar
 
 ##### Project flags ##################################################
@@ -259,8 +260,8 @@ LIB_CPPFLAGS={- our $lib_cppflags =
                 join(' ', $target{lib_cppflags} || (),
                           $target{shared_cppflag} || (),
                           (map { '-D'.$_ }
-                               @{$config{lib_defines}},
-                               @{$config{shared_defines}}),
+                               @{$config{lib_defines} || ()},
+                               @{$config{shared_defines} || ()}),
                           @{$config{lib_cppflags}},
                           @{$config{shared_cppflag}});
                 join(' ', $lib_cppflags,
@@ -284,6 +285,9 @@ LIB_LDFLAGS={- join(' ', $target{shared_ldflag} || (),
 LIB_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS)
 DSO_CPPFLAGS={- join(' ', $target{dso_cppflags} || (),
                           $target{module_cppflags} || (),
+                          (map { '-D'.$_ }
+                               @{$config{dso_defines} || ()},
+                               @{$config{module_defines} || ()}),
                           @{$config{dso_cppflags}},
                           @{$config{module_cppflags}},
                           '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -}
@@ -304,6 +308,7 @@ DSO_LDFLAGS={- join(' ', $target{dso_ldflags} || (),
                          '$(CNF_LDFLAGS)', '$(LDFLAGS)') -}
 DSO_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS)
 BIN_CPPFLAGS={- join(' ', $target{bin_cppflags} || (),
+                          (map { '-D'.$_ } @{$config{bin_defines} || ()}),
                           @{$config{bin_cppflags}},
                           '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -}
 BIN_CFLAGS={- join(' ', $target{bin_cflags} || (),
@@ -437,7 +442,7 @@ depend:
 
 # Install helper targets #############################################
 
-install_sw: all install_dev install_engines install_runtime
+install_sw: install_dev install_engines install_runtime
 
 uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
 
@@ -491,7 +496,7 @@ install_ssldirs:
                chmod 644 $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf; \
        fi
 
-install_dev:
+install_dev: install_runtime_libs
        @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
        @$(ECHO) "*** Installing development files"
        @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/include/openssl
@@ -524,11 +529,6 @@ install_dev:
                fn1=`basename $$s1`; \
                fn2=`basename $$s2`; \
                : {- output_off(); output_on() unless windowsdll() or sharedaix(); "" -}; \
-               $(ECHO) "install $$s1 -> $(DESTDIR)$(libdir)/$$fn1"; \
-               cp $$s1 $(DESTDIR)$(libdir)/$$fn1.new; \
-               chmod 755 $(DESTDIR)$(libdir)/$$fn1.new; \
-               mv -f $(DESTDIR)$(libdir)/$$fn1.new \
-                     $(DESTDIR)$(libdir)/$$fn1; \
                if [ "$$fn1" != "$$fn2" ]; then \
                        $(ECHO) "link $(DESTDIR)$(libdir)/$$fn2 -> $(DESTDIR)$(libdir)/$$fn1"; \
                        ln -sf $$fn1 $(DESTDIR)$(libdir)/$$fn2; \
@@ -568,7 +568,7 @@ install_dev:
        @cp openssl.pc $(DESTDIR)$(libdir)/pkgconfig
        @chmod 644 $(DESTDIR)$(libdir)/pkgconfig/openssl.pc
 
-uninstall_dev:
+uninstall_dev: uninstall_runtime_libs
        @$(ECHO) "*** Uninstalling development files"
        @ : {- output_off() unless grep { $_ eq "OPENSSL_USE_APPLINK" } (@{$target{defines}}, @{$config{defines}}); "" -}
        @$(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c"
@@ -612,7 +612,7 @@ uninstall_dev:
        -$(RMDIR) $(DESTDIR)$(libdir)/pkgconfig
        -$(RMDIR) $(DESTDIR)$(libdir)
 
-install_engines:
+install_engines: install_runtime_libs build_engines
        @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
        @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(ENGINESDIR)/
        @$(ECHO) "*** Installing engines"
@@ -639,20 +639,23 @@ uninstall_engines:
        done
        -$(RMDIR) $(DESTDIR)$(ENGINESDIR)
 
-install_runtime:
+install_runtime: install_programs
+
+install_runtime_libs: build_libs
        @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/bin
        @ : {- output_off() if windowsdll(); "" -}
        @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(libdir)
-       @ : {- output_on() if windowsdll(); "" -}
-       @$(ECHO) "*** Installing runtime files"
+       @ : {- output_on() if windowsdll(); output_off() unless windowsdll(); "" -}
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/bin
+       @ : {- output_on() unless windowsdll(); "" -}
+       @$(ECHO) "*** Installing runtime libraries"
        @set -e; for s in dummy $(INSTALL_SHLIBS); do \
                if [ "$$s" = "dummy" ]; then continue; fi; \
                fn=`basename $$s`; \
                : {- output_off() unless windowsdll(); "" -}; \
                $(ECHO) "install $$s -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
                cp $$s $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
-               chmod 644 $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
+               chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
                mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new \
                      $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
                : {- output_on() unless windowsdll(); "" -}{- output_off() if windowsdll(); "" -}; \
@@ -663,6 +666,11 @@ install_runtime:
                      $(DESTDIR)$(libdir)/$$fn; \
                : {- output_on() if windowsdll(); "" -}; \
        done
+
+install_programs: install_runtime_libs build_programs
+       @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/bin
+       @$(ECHO) "*** Installing runtime programs"
        @set -e; for x in dummy $(INSTALL_PROGRAMS); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
@@ -682,8 +690,10 @@ install_runtime:
                      $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
        done
 
-uninstall_runtime:
-       @$(ECHO) "*** Uninstalling runtime files"
+uninstall_runtime: uninstall_programs uninstall_runtime_libs
+
+uninstall_programs:
+       @$(ECHO) "*** Uninstalling runtime programs"
        @set -e; for x in dummy $(INSTALL_PROGRAMS); \
        do  \
                if [ "$$x" = "dummy" ]; then continue; fi; \
@@ -698,6 +708,10 @@ uninstall_runtime:
                $(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
                $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
        done
+       -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin
+
+uninstall_runtime_libs:
+       @$(ECHO) "*** Uninstalling runtime libraries"
        @ : {- output_off() unless windowsdll(); "" -}
        @set -e; for s in dummy $(INSTALL_SHLIBS); do \
                if [ "$$s" = "dummy" ]; then continue; fi; \
@@ -706,7 +720,6 @@ uninstall_runtime:
                $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
        done
        @ : {- output_on() unless windowsdll(); "" -}
-       -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin
 
 
 install_man_docs:
@@ -822,37 +835,8 @@ tags TAGS: FORCE
 
 # Release targets (note: only available on Unix) #####################
 
-# If your tar command doesn't support --owner and --group, make sure to
-# use one that does, for example GNU tar
-TAR_COMMAND=$(TAR) $(TARFLAGS) --owner 0 --group 0 -cf -
-PREPARE_CMD=:
 tar:
-       set -e; \
-       TMPDIR=/var/tmp/openssl-copy.$$$$; \
-       DISTDIR=$(NAME); \
-       mkdir -p $$TMPDIR/$$DISTDIR; \
-       (cd $(SRCDIR); \
-        excl_re=`git submodule status | sed -e 's/^.//' | cut -d' ' -f2`; \
-        excl_re="^(fuzz/corpora|Configurations/.*\.norelease\.conf|`echo $$excl_re | sed -e 's/ /$$|/g'`\$$)"; \
-        echo "$$excl_re"; \
-        git ls-tree -r --name-only --full-tree HEAD \
-        | egrep -v "$$excl_re" \
-        | while read F; do \
-              mkdir -p $$TMPDIR/$$DISTDIR/`dirname $$F`; \
-              cp $$F $$TMPDIR/$$DISTDIR/$$F; \
-          done); \
-       (cd $$TMPDIR/$$DISTDIR; \
-        $(PREPARE_CMD); \
-        find . -type d -print | xargs chmod 755; \
-        find . -type f -print | xargs chmod a+r; \
-        find . -type f -perm -0100 -print | xargs chmod a+x); \
-       (cd $$TMPDIR; $(TAR_COMMAND) $$DISTDIR) \
-       | (cd $(SRCDIR); gzip --best > $(TARFILE).gz); \
-       rm -rf $$TMPDIR
-       cd $(SRCDIR); ls -l $(TARFILE).gz
-
-dist:
-       @$(MAKE) PREPARE_CMD='$(PERL) ./Configure dist' TARFILE="$(TARFILE)" NAME="$(NAME)" tar
+       (cd $(SRCDIR); ./util/mktar.sh --name='$(NAME)' --tarfile='$(TARFILE)')
 
 # Helper targets #####################################################
 
@@ -1242,6 +1226,10 @@ EOF
                       lib => $libext,
                       bin => $exeext );
 
+      # We already have a 'test' target, and the top directory is just plain
+      # silly
+      return if $dir eq "test" || $dir eq ".";
+
       foreach my $type (("dso", "lib", "bin", "script")) {
           next unless defined($unified_info{dirinfo}->{$dir}->{products}->{$type});
           # For lib object files, we could update the library.  However, it
@@ -1262,7 +1250,7 @@ EOF
       my $deps = join(" ", @deps);
       my $actions = join("\n", "", @actions);
       return <<"EOF";
-$args{dir} $args{dir}/: $deps$actions
+$dir $dir/: $deps$actions
 EOF
   }
   ""    # Important!  This becomes part of the template result.
Unnamed repository; edit this file 'description' to name the repository.