X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Configurations%2Funix-Makefile.tmpl;h=175718c22aeb62f9edffa9c5c9d5f0d507cd1881;hp=f816b54a7a856b79fde3790f93cd7c274883eaa9;hb=8be7bdb5c613fbf5904f04897f85d17172ad6f7a;hpb=ba327ade803fccb34a4bd4f5803efb33e22dd767 diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index f816b54a7a..175718c22a 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -37,6 +37,10 @@ ENGINES={- join(" ", map { $_."\$(SHLIB_EXT_SIMPLE)" } @{$unified_info{engines}} PROGRAMS={- join(" ", map { $_."\$(EXE_EXT)" } grep { !m|^test/| } @{$unified_info{programs}}) -} TESTPROGS={- join(" ", map { $_."\$(EXE_EXT)" } grep { m|^test/| } @{$unified_info{programs}}) -} SCRIPTS={- join(" ", @{$unified_info{scripts}}) -} +DEPS={- join(" ", map { (my $x = $_) =~ s|\.o$|\$(DEP_EXT)|; $x; } + grep { $unified_info{sources}->{$_}->[0] =~ /\.c$/ } + keys %{$unified_info{sources}}); -} + BIN_SCRIPTS=$(BLDDIR)/tools/c_rehash MISC_SCRIPTS=$(SRCDIR)/tools/c_hash $(SRCDIR)/tools/c_info \ $(SRCDIR)/tools/c_issuer $(SRCDIR)/tools/c_name \ @@ -83,9 +87,13 @@ ENGINESDIR={- use File::Spec::Functions; catdir($prefix,$libdir,"engines") -} MANDIR=$(INSTALLTOP)/share/man -HTMLDIR=$(INSTALLTOP)/share/doc/$(BASENAME)/html +DOCDIR=$(INSTALLTOP)/share/doc/$(BASENAME) +HTMLDIR=$(DOCDIR)/html -MANSUFFIX=ssl +# MANSUFFIX is for the benefit of anyone who may want to have a suffix +# appended after the manpage file section number. "ssl" is popular, +# resulting in files such as config.5ssl rather than config.5. +MANSUFFIX= HTMLSUFFIX=html @@ -94,7 +102,6 @@ CROSS_COMPILE= {- $config{cross_compile_prefix} -} CC= $(CROSS_COMPILE){- $target{cc} -} CFLAGS={- our $cflags2 = join(" ",(map { "-D".$_} @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $config{cflags} -} CFLAGS_Q={- $cflags2 =~ s|([\\"])|\\$1|g; $cflags2 -} {- $config{cflags} -} -DEPFLAGS= {- join(" ",map { "-D".$_} @{$config{depdefines}}) -} LDFLAGS= {- $config{lflags} -} PLIB_LDFLAGS= {- $config{plib_lflags} -} EX_LIBS= {- $config{ex_libs} -} @@ -123,6 +130,7 @@ NM= $(CROSS_COMPILE){- $target{nm} || "nm" -} RM= rm -f TAR= {- $target{tar} || "tar" -} TARFLAGS= {- $target{tarflags} -} +MAKEDEPEND=$(CROSS_COMPILE){- $config{makedepprog} -} BASENAME= openssl NAME= $(BASENAME)-$(VERSION) @@ -143,18 +151,23 @@ PROCESSOR= {- $config{processor} -} # The main targets ################################################### -all: build_libs build_engines build_apps link-utils +all: configdata.pm build_libs_nodep build_engines_nodep build_apps_nodep \ + depend link-utils -# The pkg-config files depend on the libraries as well as Makefile -build_libs: libcrypto.pc libssl.pc openssl.pc -build_engines: $(ENGINES) -build_apps: $(PROGRAMS) $(SCRIPTS) -build_tests: $(TESTPROGS) +build_libs: configdata.pm build_libs_nodep depend +build_libs_nodep: libcrypto.pc libssl.pc openssl.pc +build_engines: configdata.pm build_engines_nodep depend +build_engines_nodep: $(ENGINES) +build_apps: configdata.pm build_apps_nodep depend +build_apps_nodep: $(PROGRAMS) $(SCRIPTS) +build_tests: configdata.pm build_tests_nodep depend +build_tests_nodep: $(TESTPROGS) -test tests: build_tests rehash +test tests: build_tests_nodep build_apps_nodep build_engines_nodep depend rehash ( cd test; \ SRCTOP=../$(SRCDIR) \ BLDTOP=../$(BLDDIR) \ + EXE_EXT=$(EXE_EXT) \ $(PERL) ../$(SRCDIR)/test/run_tests.pl $(TESTS) ) list-tests: @@ -177,20 +190,18 @@ clean: libclean -rm -f `find $(BLDDIR) -type l` rm -f $(TARFILE) -DCLEAN_CMD=sed -e '/^DO NOT DELETE.*/,$$d' -dclean: - $(DCLEAN_CMD) < Makefile >Makefile.new - mv -f Makefile.new Makefile - -DEPS={- join(" ", map { (my $x = $_) =~ s|\.o$|\$(DEP_EXT)|; $x; } - grep { $unified_info{sources}->{$_}->[0] =~ /\.c$/ } - keys %{$unified_info{sources}}); -} -depend: $(DEPS) - ( $(DCLEAN_CMD) < Makefile; \ +# This exists solely for those who still type 'make depend' +depend: Makefile +Makefile: FORCE + @( sed -e '/^# DO NOT DELETE THIS LINE.*/,$$d' < Makefile; \ echo '# DO NOT DELETE THIS LINE -- make depend depends on it.'; \ echo; \ - cat `find . -name '*$(DEP_EXT)'` ) > Makefile.new - mv -f Makefile.new Makefile + for d in $(DEPS); do \ + if [ -f $$d ]; then cat $$d; fi; \ + done ) > Makefile.new + @if ! cmp Makefile.new Makefile >/dev/null 2>&1; then \ + mv -f Makefile.new Makefile; \ + fi # Install helper targets ############################################# @@ -201,6 +212,7 @@ uninstall_sw: uninstall_dev uninstall_engines uninstall_runtime install_docs: install_man_docs install_html_docs uninstall_docs: uninstall_man_docs uninstall_html_docs + $(RM) -r -v $(DESTDIR)$(DOCDIR) install_ssldirs: @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/certs @@ -459,6 +471,7 @@ UNINSTALL_DOCS=\ $(RM) $$top/man$$SEC/$$n$$suf; \ fi; \ done; \ + ( $(RMDIR) $$top/man$$SEC 2>/dev/null || exit 0 ); \ done; \ done @@ -575,7 +588,7 @@ dist: # Helper targets ##################################################### -rehash: link-utils copy-certs +rehash: link-utils copy-certs build_apps_nodep @if [ -z "$(CROSS_COMPILE)" ]; then \ (OPENSSL="$(BLDDIR)/util/shlib_wrap.sh apps/openssl"; \ [ -x "$(BLDDIR)/openssl.exe" ] && OPENSSL="$(BLDDIR)/openssl.exe" || :; \ @@ -588,12 +601,12 @@ rehash: link-utils copy-certs link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/shlib_wrap.sh -$(BLDDIR)/util/opensslwrap.sh: Makefile +$(BLDDIR)/util/opensslwrap.sh: configdata.pm @if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \ mkdir -p "$(BLDDIR)/util"; \ ln -sf "../$(SRCDIR)/util/opensslwrap.sh" "$(BLDDIR)/util"; \ fi -$(BLDDIR)/util/shlib_wrap.sh: Makefile +$(BLDDIR)/util/shlib_wrap.sh: configdata.pm @if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \ mkdir -p "$(BLDDIR)/util"; \ ln -sf "../$(SRCDIR)/util/shlib_wrap.sh" "$(BLDDIR)/util"; \ @@ -647,11 +660,11 @@ $(SRCDIR)/crypto/objects/obj_xref.h: $(SRCDIR)/crypto/objects/objxref.pl \ > $(SRCDIR)/crypto/objects/obj_xref.h @sleep 1; touch $(SRCDIR)/crypto/objects/obj_xref.h; sleep 1 -FORCE : +FORCE: # Building targets ################################################### -libcrypto.pc libssl.pc openssl.pc: Makefile $(LIBS) +libcrypto.pc libssl.pc openssl.pc: configdata.pm $(LIBS) libcrypto.pc: @ ( echo 'prefix=$(INSTALLTOP)'; \ echo 'exec_prefix=$${prefix}'; \ @@ -694,8 +707,8 @@ openssl.pc: # wasn't passed down automatically. It's quite safe to use it like we do # below; if it doesn't exist, the result will be empty and 'make' will pick # up $(MAKEFLAGS) which is passed down as an environment variable. -Makefile: {- $config{build_file_template} -} $(SRCDIR)/Configure $(SRCDIR)/config - @echo "Makefile is older than {- $config{build_file_template} -}, $(SRCDIR)/Configure or $(SRCDIR)/config." +configdata.pm: {- $config{build_file_template} -} $(SRCDIR)/Configure $(SRCDIR)/config + @echo "Detected changed: $?" @echo "Reconfiguring..." $(SRCDIR)/Configure reconf @echo "**************************************************" @@ -728,38 +741,29 @@ Makefile: {- $config{build_file_template} -} $(SRCDIR)/Configure $(SRCDIR)/confi } } @_; } - sub src2dep { + sub src2obj { my %args = @_; - my $dep = $args{obj}.'$(DEP_EXT)'; - my $obj = $args{obj}.'$(OBJ_EXT)'; + my $obj = $args{obj}; my $srcs = join(" ", @{$args{srcs}}); my $deps = join(" ", @{$args{srcs}}, @{$args{deps}}); my $incs = join(" ", map { " -I".$_ } @{$args{incs}}); my $makedepprog = $config{makedepprog}; if ($makedepprog eq "makedepend") { return <<"EOF"; -$dep : $deps +$obj\$(DEP_EXT): $deps rm -f \$\@.tmp; touch \$\@.tmp - \$(MAKEDEPEND) -f\$\@.tmp -o"|$obj"\ - -- -DOPENSSL_DOING_MAKEDEPEND \$(DEPFLAGS)$incs \ - -- $srcs - sed -e 's/^.*|//' -e 's/ \\/\\(\\\\.\\|[^ ]\\)*//g' -e '/: *\$/d' -e '/^\\(#.*\\| *\\)\$/d' \$\@.tmp > \$\@ + \$(MAKEDEPEND) -f\$\@.tmp -o"|$obj" -- \$(CFLAGS)$incs -- $srcs \\ + 2>/dev/null + sed -e 's/^.*|//' -e 's/ \\/\\(\\\\.\\|[^ ]\\)*//g' -e '/: *\$\$/d' -e '/^\\(#.*\\| *\\)\$\$/d' \$\@.tmp > \$\@ rm \$\@.tmp +$obj\$(OBJ_EXT): $obj\$(DEP_EXT) + \$(CC) \$(CFLAGS)$incs -c -o \$\@ $srcs EOF } return <<"EOF"; -$dep : $deps Makefile - \$(CC) -DOPENSSL_DOING_MAKEDEPEND \$(DEPFLAGS)$incs -MM -MF \$\@ -MQ $obj $srcs -EOF - } - sub src2obj { - my %args = @_; - my $obj = $args{obj}.'$(OBJ_EXT)'; - my $srcs = join(" ", @{$args{srcs}}); - my $deps = join(" ", @{$args{srcs}}, @{$args{deps}}); - my $incs = join(" ", map { " -I".$_ } @{$args{incs}}); - return <<"EOF"; -$obj : $deps +$obj\$(DEP_EXT): $deps + \$(CC) \$(CFLAGS)$incs -MM -MF \$\@ -MQ $obj $srcs +$obj\$(OBJ_EXT): $obj\$(DEP_EXT) \$(CC) \$(CFLAGS)$incs -c -o \$\@ $srcs EOF } @@ -790,7 +794,7 @@ EOF # It's not necessary to have both as targets. The choice falls on the # simplest, {libname}\$(SHLIB_EXT_SIMPLE).a for Windows POSIX layers and # {libname}\$(SHLIB_EXT_SIMPLE) for the Unix platforms. -$shlibtarget : $lib\$(LIB_EXT) $deps $ordinalsfile +$shlibtarget: $lib\$(LIB_EXT) $deps $ordinalsfile \$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\ PLATFORM=\$(PLATFORM) \\ PERL=\$(PERL) SRCDIR="\$(SRCDIR)" DSTDIR="$libd" \\ @@ -843,7 +847,7 @@ EOF my $lib = $args{lib}; my $objs = join(" ", map { $_."\$(OBJ_EXT)" } @{$args{objs}}); return <<"EOF"; -$lib\$(LIB_EXT) : $objs +$lib\$(LIB_EXT): $objs \$(AR) \$\@ $objs \$(RANLIB) \$\@ || echo Never mind. EOF @@ -862,7 +866,7 @@ EOF " -L$d -l$l" } @{$args{deps}}); my $shlib_target = $config{no_shared} ? "" : $target{shared_target}; return <<"EOF"; -$bin\$(EXE_EXT) : $objs $deps +$bin\$(EXE_EXT): $objs $deps \$(RM) $bin\$(EXE_EXT) \$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\ PERL=\$(PERL) SRCDIR=\$(SRCDIR) \\ @@ -881,7 +885,7 @@ EOF "util", "dofile.pl")), rel2abs($config{builddir})); return <<"EOF"; -$script : $sources +$script: $sources \$(PERL) "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\ "-o$target{build_file}" $sources > "$script" chmod a+x $script