X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Configurations%2Funix-Makefile.tmpl;h=57108ce9acdc2cfa8f4a1d6e8779e6748a54c4d4;hp=3cfbfd2e4564fe408b9054b58949d409744188ee;hb=0fb3b629026831339489b0bae506281e7f2064e6;hpb=f325fba50c6e1cab053e449c420f76256b551867 diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 3cfbfd2e45..57108ce9ac 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -4,10 +4,50 @@ ## {- join("\n## ", @autowarntext) -} {- sub windowsdll { $config{target} =~ /^(?:Cygwin|mingw)/ } - sub shlib_ext { $target{shared_extension} || ".so" } - sub shlib_ext_simple { (my $x = $target{shared_extension}) - =~ s/\.\$\(SHLIB_MAJOR\)\.\$\(SHLIB_MINOR\)//; - $x } + + # shlib and shlib_simple both take a static library name and figure + # out what the shlib name should be. + # + # When OpenSSL is configured "no-shared", these functions will just + # return empty lists, making them suitable to join(). + # + # With Windows DLL producers, shlib($libname) will return the shared + # library name (which usually is different from the static library + # name) with the default shared extension appended to it, while + # shlib_simple($libname) will return the static library name with + # the shared extension followed by ".a" appended to it. The former + # result is used as the runtime shared library while the latter is + # used as the DLL import library. + # + # On all Unix systems, shlib($libname) will return the library name + # with the default shared extension, while shlib_simple($libname) + # will return the name from shlib($libname) with any SO version number + # removed. On some systems, they may therefore return the exact same + # string. + sub shlib { + return () if $config{no_shared}; + my $lib = shift; + return $unified_info{sharednames}->{$lib} . '$(SHLIB_EXT)'; + } + sub shlib_simple { + return () if $config{no_shared}; + + my $lib = shift; + if (windowsdll()) { + return $lib . '$(SHLIB_EXT_IMPORT)'; + } + return $lib . '$(SHLIB_EXT_SIMPLE)'; + } + + # 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. + sub dso { + return () if $config{no_shared}; + my $engine = shift; + + return $engine . '$(DSO_EXT)'; + } -} PLATFORM={- $config{target} -} OPTIONS={- $config{options} -} @@ -26,22 +66,30 @@ SHLIB_TARGET={- $target{shared_target} -} EXE_EXT={- $target{exe_extension} || "" -} LIB_EXT={- $target{lib_extension} || ".a" -} -SHLIB_EXT={- shlib_ext() -} -SHLIB_EXT_SIMPLE={- shlib_ext_simple() -} +SHLIB_EXT={- $target{shared_extension} || ".so" -} +SHLIB_EXT_SIMPLE={- $target{shared_extension_simple} || ".so" -} +SHLIB_EXT_IMPORT={- $target{shared_import_extension} || "" -} +DSO_EXT={- $target{dso_extension} || ".so" -} OBJ_EXT={- $target{obj_extension} || ".o" -} DEP_EXT={- $target{dep_extension} || ".d" -} LIBS={- join(" ", map { $_."\$(LIB_EXT)" } @{$unified_info{libraries}}) -} -SHLIBS={- join(" ", map { $_."\$(SHLIB_EXT)" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -} -ENGINES={- join(" ", map { $_."\$(SHLIB_EXT_SIMPLE)" } @{$unified_info{engines}}) -} +SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{libraries}}) -} +ENGINES={- join(" ", map { dso($_) } @{$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 \ $(BLDDIR)/apps/CA.pl $(SRCDIR)/apps/tsget +SHLIB_INFO={- join(" ", map { "\"".shlib($_).";".shlib_simple($_)."\"" } @{$unified_info{libraries}}) -} + # DESTDIR is for package builders so that they can configure for, say, # /usr/ and yet have everything installed to /tmp/somedir/usr/. # Normally it is left empty. @@ -83,7 +131,8 @@ 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 is for the benefit of anyone who may want to have a suffix # appended after the manpage file section number. "ssl" is popular, @@ -123,6 +172,7 @@ AR=$(CROSS_COMPILE){- $target{ar} || "ar" -} $(ARFLAGS) r RANLIB= {- $target{ranlib} -} NM= $(CROSS_COMPILE){- $target{nm} || "nm" -} RM= rm -f +RMDIR= rmdir TAR= {- $target{tar} || "tar" -} TARFLAGS= {- $target{tarflags} -} MAKEDEPEND=$(CROSS_COMPILE){- $config{makedepprog} -} @@ -146,15 +196,19 @@ 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 build_apps build_engines rehash +test tests: build_tests_nodep build_apps_nodep build_engines_nodep depend rehash ( cd test; \ SRCTOP=../$(SRCDIR) \ BLDTOP=../$(BLDDIR) \ @@ -165,7 +219,17 @@ list-tests: @TOP=$(SRCDIR) PERL=$(PERL) $(PERL) $(SRCDIR)/test/run_tests.pl list libclean: - -rm -f `find $(BLDDIR) -name '*$(LIB_EXT)' -o -name '*$(SHLIB_EXT)'` + @set -e; for s in $(SHLIB_INFO); do \ + s1=`echo "$$s" | cut -f1 -d";"`; \ + s2=`echo "$$s" | cut -f2 -d";"`; \ + echo $(RM) $$s1; \ + $(RM) $$s1; \ + if [ "$$s1" != "$$s2" ]; then \ + echo $(RM) $$s2; \ + $(RM) $$s2; \ + fi; \ + done + $(RM) $(LIBS) install: install_sw install_ssldirs install_docs @@ -181,30 +245,29 @@ 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 ############################################# install_sw: all install_dev install_engines install_runtime -uninstall_sw: uninstall_dev uninstall_engines uninstall_runtime +uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev 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 @@ -232,25 +295,28 @@ install_dev: $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \ done @ : {- output_off() if $config{no_shared}; "" -} - @set -e; for s in $(SHLIBS); do \ - fn=`basename $$s`; \ - echo "install $$s -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \ - cp $$s $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.new; \ - chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.new; \ - mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.new \ - $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \ - if [ "$(SHLIB_EXT)" != "$(SHLIB_EXT_SIMPLE)" ]; then \ - echo "link $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2 -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \ - fn2=`basename $$fn $(SHLIB_EXT)`$(SHLIB_EXT_SIMPLE); \ - ln -sf $$fn $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2; \ + @set -e; for s in $(SHLIB_INFO); do \ + s1=`echo "$$s" | cut -f1 -d";"`; \ + s2=`echo "$$s" | cut -f2 -d";"`; \ + fn1=`basename $$s1`; \ + fn2=`basename $$s2`; \ + : {- output_off() if windowsdll(); "" -}; \ + echo "install $$s1 -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn1"; \ + cp $$s1 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn1.new; \ + chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn1.new; \ + mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn1.new \ + $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn1; \ + if [ "$$fn1" != "$$fn2" ]; then \ + echo "link $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2 -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn1"; \ + ln -sf $$fn1 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2; \ fi; \ + : {- output_on() if windowsdll(); "" -}{- output_off() unless windowsdll(); "" -}; \ + echo "install $$s2 -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2"; \ + cp $$s2 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2.new; \ + chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2.new; \ + mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2.new \ + $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2; \ : {- output_off() unless windowsdll(); "" -}; \ - echo "install $$s.a -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a"; \ - cp $$s.a $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a.new; \ - chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a.new; \ - mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a.new \ - $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a; \ - : {- output_on() unless windowsdll(); "" -}; \ done @ : {- output_on() if $config{no_shared}; "" -} @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig @@ -272,31 +338,42 @@ uninstall_dev: echo "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \ $(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \ done + -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include/openssl + -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include @set -e; for l in $(LIBS); do \ fn=`basename $$l`; \ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \ $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \ done - @set -e; for s in $(SHLIBS); do \ - fn=`basename $$s`; \ - if [ "$(SHLIB_EXT)" != "$(SHLIB_EXT_SIMPLE)" ]; then \ - fn2=`basename $$fn $(SHLIB_EXT)`$(SHLIB_EXT_SIMPLE); \ + @ : {- output_off() if $config{no_shared}; "" -} + @set -e; for s in $(SHLIB_INFO); do \ + s1=`echo "$$s" | cut -f1 -d";"`; \ + s2=`echo "$$s" | cut -f2 -d";"`; \ + fn1=`basename $$s1`; \ + fn2=`basename $$s2`; \ + : {- output_off() if windowsdll(); "" -}; \ + echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn1"; \ + $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn1; \ + if [ "$$fn1" != "$$fn2" ]; then \ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2"; \ $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2; \ fi; \ - echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \ - $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \ + : {- output_on() if windowsdll(); "" -}{- output_off() unless windowsdll(); "" -}; \ + echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2"; \ + $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2; \ : {- output_off() unless windowsdll(); "" -}; \ - echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a"; \ - $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a; \ - : {- output_on() unless windowsdll(); "" -}; \ done + @ : {- output_on() if $config{no_shared}; "" -} @echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc" @$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc @echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc" @$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc @echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc" @$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc + @echo $(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig + -@$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig + @echo $(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR) + -@$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR) install_engines: @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @@ -304,7 +381,10 @@ install_engines: @echo "*** Installing engines" @set -e; for e in $(ENGINES); do \ fn=`basename $$e`; \ - echo "install $$e -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ + if [ "$$fn" = '{- dso("ossltest") -}' ]; then \ + continue; \ + fi; \ + echo "install $$e -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn"; \ cp $$e $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn.new; \ chmod 755 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn.new; \ mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn.new \ @@ -315,9 +395,14 @@ uninstall_engines: @echo "*** Uninstalling engines" @set -e; for e in $(ENGINES); do \ fn=`basename $$e`; \ - echo "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ + if [ "$$fn" = '{- dso("ossltest") -}' ]; then \ + continue; \ + fi; \ + echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn"; \ $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn; \ done + @echo "$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines" + -@$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines install_runtime: @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @@ -326,7 +411,7 @@ install_runtime: @echo "*** Installing runtime files" : {- output_off() unless windowsdll(); "" -}; @set -e; for s in $(SHLIBS); do \ - fn=`basename $$i`; \ + fn=`basename $$s`; \ echo "install $$s -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ cp $$s $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \ chmod 644 $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \ @@ -385,12 +470,16 @@ uninstall_runtime: done : {- output_off() unless windowsdll(); "" -}; @set -e; for s in $(SHLIBS); do \ - fn=`basename $$i`; \ + fn=`basename $$s`; \ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \ done : {- output_on() unless windowsdll(); "" -}; $(RM) $(DESTDIR)$(OPENSSLDIR)/openssl.cnf + @echo "$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin" + -@$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin + @echo "$(RMDIR) $(DESTDIR)$(OPENSSLDIR)/misc" + -@$(RMDIR) $(DESTDIR)$(OPENSSLDIR)/misc # A method to extract all names from a .pod file # The first sed extracts everything between "=head1 NAME" and the next =head1 @@ -463,6 +552,7 @@ UNINSTALL_DOCS=\ $(RM) $$top/man$$SEC/$$n$$suf; \ fi; \ done; \ + ( $(RMDIR) $$top/man$$SEC 2>/dev/null || exit 0 ); \ done; \ done @@ -579,7 +669,7 @@ dist: # Helper targets ##################################################### -rehash: link-utils copy-certs build_apps +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" || :; \ @@ -592,12 +682,12 @@ rehash: link-utils copy-certs build_apps 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"; \ @@ -651,11 +741,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}'; \ @@ -698,8 +788,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 "**************************************************" @@ -723,13 +813,7 @@ Makefile: {- $config{build_file_template} -} $(SRCDIR)/Configure $(SRCDIR)/confi # Depending on shared libraries: # On Windows POSIX layers, we depend on {libname}.dll.a # On Unix platforms, we depend on {shlibname}.so - return map { if (windowsdll()) { - "$_\$(SHLIB_EXT_SIMPLE).a" - } else { - my $libname = - $unified_info{sharednames}->{$_} || $_; - "$libname\$(SHLIB_EXT_SIMPLE)" - } } @_; + return map { shlib_simple($_) } @_; } sub src2obj { @@ -775,17 +859,16 @@ EOF my $deps = join(" ",compute_lib_depends(@{$args{deps}})); my $shlib_target = $target{shared_target}; my $ordinalsfile = defined($args{ordinals}) ? $args{ordinals}->[1] : ""; - my $shlibtarget = windowsdll() ? - "$lib\$(SHLIB_EXT_SIMPLE).a" : "$shlib\$(SHLIB_EXT_SIMPLE)"; + my $target = shlib_simple($lib); return <<"EOF" # With a build on a Windows POSIX layer (Cygwin or Mingw), we know for a fact # that two files get produced, {shlibname}.dll and {libname}.dll.a. # With all other Unix platforms, we often build a shared library with the # SO version built into the file name and a symlink without the SO version # 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 +# simplest, {libname}\$(SHLIB_EXT_IMPORT) for Windows POSIX layers and # {libname}\$(SHLIB_EXT_SIMPLE) for the Unix platforms. -$shlibtarget: $lib\$(LIB_EXT) $deps $ordinalsfile +$target : $lib\$(LIB_EXT) $deps $ordinalsfile \$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\ PLATFORM=\$(PLATFORM) \\ PERL=\$(PERL) SRCDIR="\$(SRCDIR)" DSTDIR="$libd" \\ @@ -797,7 +880,7 @@ $shlibtarget: $lib\$(LIB_EXT) $deps $ordinalsfile CROSS_COMPILE="\$(CROSS_COMPILE)" \\ SHARED_LDFLAGS="\$(SHARED_LDFLAGS)" SHLIB_EXT=\$(SHLIB_EXT) \\ SHARED_RCFLAGS="\$(SHARED_RCFLAGS)" \\ - link_a.$shlib_target + link_shlib.$shlib_target EOF . (windowsdll() ? <<"EOF" : ""); rm -f apps/$shlib\$(SHLIB_EXT) @@ -806,7 +889,7 @@ EOF cp -p $shlib\$(SHLIB_EXT) test/ EOF } - sub obj2dynlib { + sub obj2dso { my %args = @_; my $lib = $args{lib}; my $libd = dirname($lib); @@ -819,8 +902,9 @@ EOF my $deps = join(" ",compute_lib_depends(@{$args{deps}})); my $shlib_target = $target{shared_target}; my $objs = join(" ", map { $_."\$(OBJ_EXT)" } @{$args{objs}}); + my $target = dso($lib); return <<"EOF"; -$lib\$(SHLIB_EXT_SIMPLE): $objs $deps +$target: $objs $deps \$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\ PLATFORM=\$(PLATFORM) \\ PERL=\$(PERL) SRCDIR="\$(SRCDIR)" DSTDIR="$libd" \\ @@ -828,9 +912,9 @@ $lib\$(SHLIB_EXT_SIMPLE): $objs $deps LIBNAME=$libname LDFLAGS="\$(LDFLAGS)" \\ CC="\$(CC)" CFLAGS="\$(CFLAGS)" \\ SHARED_LDFLAGS="\$(SHARED_LDFLAGS)" \\ - SHLIB_EXT=\$(SHLIB_EXT_SIMPLE) \\ + SHLIB_EXT=\$(DSO_EXT) \\ LIBEXTRAS="$objs" \\ - link_o.$shlib_target + link_dso.$shlib_target EOF } sub obj2lib { @@ -861,7 +945,7 @@ $bin\$(EXE_EXT): $objs $deps \$(RM) $bin\$(EXE_EXT) \$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\ PERL=\$(PERL) SRCDIR=\$(SRCDIR) \\ - APPNAME=$bin OBJECTS="$objs" \\ + APPNAME=$bin\$(EXE_EXT) OBJECTS="$objs" \\ LIBDEPS="\$(PLIB_LDFLAGS) $linklibs \$(EX_LIBS)" \\ CC="\$(CC)" CFLAGS="\$(CFLAGS)" LDFLAGS="\$(LDFLAGS)" \\ LIBRPATH="\$(INSTALLTOP)/\$(LIBDIR)" \\