From 1740c16265a1630d12af1412d49c24ef25626590 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 29 Jan 2016 18:07:37 +0100 Subject: [PATCH] Configure et al: split up the lflags configuration item into two The lflags configuration had a weird syntax with a % as separator. If it was present, whatever came before ended up as PEX_LIBS in Makefile (usually, this is LDFLAGS), while whatever came after ended up as EX_LIBS. This change splits that item into lflags and ex_libs, making their use more explicit. Also, PEX_LIBS in all the Makefiles are renamed to LDFLAGS. Reviewed-by: Rich Salz --- Configurations/10-main.conf | 85 ++++++++++++++++------------- Configurations/99-personal-ben.conf | 2 +- Configure | 32 ++++++----- Makefile.in | 6 +- apps/Makefile.in | 4 +- crypto/Makefile.in | 4 +- crypto/pkcs7/Makefile.in | 2 +- crypto/ts/Makefile.in | 2 +- engines/Makefile.in | 2 +- test/Makefile.in | 14 ++--- 10 files changed, 81 insertions(+), 72 deletions(-) diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 929e79e8da..e1c25c0209 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -39,7 +39,7 @@ "solaris-common" => { template => 1, cflags => "-DFILIO_H", - lflags => "-lsocket -lnsl -ldl", + ex_libs => "-lsocket -lnsl -ldl", dso_scheme => "dlfcn", shared_target => "solaris-shared", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -91,7 +91,8 @@ debug_cflags => "-g", release_cflags => "-xO5 -xregs=frameptr -xdepend -xbuiltin", thread_cflag => "-D_REENTRANT", - lflags => add("-mt -lpthread"), + lflags => add("-mt"), + ex_libs => add("-lpthread"), bn_ops => "BN_LLONG RC4_CHAR", shared_cflag => "-KPIC", shared_ldflag => "-G -dy -z text", @@ -103,7 +104,8 @@ debug_cflags => "-g", release_cflags => "-xO5 -xdepend -xbuiltin", thread_cflag => "-D_REENTRANT", - lflags => add("-mt -lpthread"), + lflags => add("-mt"), + ex_libs => add("-lpthread"), bn_ops => "SIXTY_FOUR_BIT_LONG", perlasm_scheme => "elf", shared_cflag => "-KPIC", @@ -153,7 +155,8 @@ debug_cflags => "-g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG", release_cflags => "-xO5 -xdepend", thread_cflag => "-D_REENTRANT", - lflags => add("-mt -lpthread"), + lflags => add("-mt"), + ex_libs => add("-lpthread"), bn_ops => "BN_LLONG RC4_CHAR", shared_cflag => "-KPIC", shared_ldflag => "-G -dy -z text", @@ -228,7 +231,7 @@ debug_cflags => "-g -O0", release_cflags => "-O2", thread_cflag => "-D_SGI_MP_SOURCE", - lflags => "-lpthread", + ex_libs => "-lpthread", bn_ops => "RC4_CHAR SIXTY_FOUR_BIT", perlasm_scheme => "n32", dso_scheme => "dlfcn", @@ -260,7 +263,7 @@ debug_cflags => "-g -O0", release_cflags => "-O2", thread_cflag => "-D_SGI_MP_SOURCE", - lflags => "-lpthread", + ex_libs => "-lpthread", bn_ops => "RC4_CHAR SIXTY_FOUR_BIT_LONG", perlasm_scheme => "64", dso_scheme => "dlfcn", @@ -304,7 +307,7 @@ debug_cflags => "-O0 -g", release_cflags => "-O3", thread_cflag => "-pthread", - lflags => "-Wl,+s -ldld", + ex_libs => "-Wl,+s -ldld", bn_ops => "BN_LLONG", dso_scheme => "dl", shared_target => "hpux-shared", @@ -323,7 +326,7 @@ debug_cflags => "-O0 -g", release_cflags => "-O3", thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", dso_scheme => "dlfcn", shared_target => "hpux-shared", @@ -343,7 +346,7 @@ debug_cflags => "+O0 +d -g", release_cflags => "+O3", thread_cflag => "-D_REENTRANT", - lflags => "-Wl,+s -ldld -lpthread", + ex_libs => "-Wl,+s -ldld -lpthread", bn_ops => "RC4_CHAR", dso_scheme => "dl", shared_target => "hpux-shared", @@ -363,7 +366,7 @@ debug_cflags => "+O0 +d -g", release_cflags => "+O3", thread_cflag => "-D_REENTRANT", - lflags => "-ldl -lpthread", + ex_libs => "-ldl -lpthread", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", dso_scheme => "dlfcn", shared_target => "hpux-shared", @@ -381,7 +384,7 @@ debug_cflags => "+O0 +d -g", release_cflags => "+O2", thread_cflag => "-D_REENTRANT", - lflags => "-ldl -lpthread", + ex_libs => "-ldl -lpthread", bn_ops => "SIXTY_FOUR_BIT", dso_scheme => "dlfcn", shared_target => "hpux-shared", @@ -399,7 +402,7 @@ debug_cflags => "+O0 +d -g", release_cflags => "+O3", thread_cflag => "-D_REENTRANT", - lflags => "-ldl -lpthread", + ex_libs => "-ldl -lpthread", bn_ops => "SIXTY_FOUR_BIT_LONG", dso_scheme => "dlfcn", shared_target => "hpux-shared", @@ -416,7 +419,7 @@ debug_cflags => "-O0 -g", release_cflags => "-O3", thread_cflag => "-pthread", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "SIXTY_FOUR_BIT", dso_scheme => "dlfcn", shared_target => "hpux-shared", @@ -432,7 +435,7 @@ debug_cflags => "-O0 -g", release_cflags => "-O3", thread_cflag => "-pthread", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "SIXTY_FOUR_BIT_LONG", dso_scheme => "dlfcn", shared_target => "hpux-shared", @@ -448,7 +451,7 @@ cflags => "-D_ENDIAN -DBN_DIV2W -O3 -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB", thread_cflag => "(unknown)", sys_id => "MPE", - lflags => "-L/SYSLOG/PUB -lsyslog -lsocket -lcurses", + ex_libs => "-L/SYSLOG/PUB -lsyslog -lsocket -lcurses", bn_ops => "BN_LLONG", }, @@ -496,7 +499,7 @@ debug_cflags => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG", release_cflags => "-O3", thread_cflag => "-pthread", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "BN_LLONG RC4_CHAR", dso_scheme => "dlfcn", shared_target => "linux-shared", @@ -606,7 +609,7 @@ cflags => "-march=i486 -DL_ENDIAN -Wall", debug_cflags => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG", release_cflags => "-O3 -fomit-frame-pointer", - debug_lflags => "-lefence", + debug_ex_libs => "-lefence", bn_ops => "BN_LLONG", }, "linux-aout" => { @@ -756,7 +759,8 @@ # about JNI, i.e. shared libraries, not applications. cflags => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack -Wall", debug_cflags => "-O0 -g", - lflags => "-pie%-ldl", + lflags => "-pie", + ex_libs => "-ldl", shared_cflag => "", }, "android-x86" => { @@ -802,7 +806,8 @@ inherit_from => [ "linux-generic64" ], cflags => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack -Wall", debug_cflags => "-O0 -g", - lflags => "-pie%-ldl", + lflags => "-pie", + ex_libs => "-ldl", shared_cflag => "", }, "android64-aarch64" => { @@ -879,7 +884,7 @@ cc => "gcc", cflags => "-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall", thread_cflag => "(unknown)", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "BN_LLONG", dso_scheme => "dlfcn", shared_target => "bsd-gcc-shared", @@ -910,7 +915,7 @@ }, "QNX6" => { cc => "gcc", - lflags => "-lsocket", + ex_libs => "-lsocket", dso_scheme => "dlfcn", shared_target => "bsd-gcc-shared", shared_cflag => "-fPIC", @@ -920,7 +925,7 @@ inherit_from => [ asm("x86_elf_asm") ], cc => "gcc", cflags => "-DL_ENDIAN -O2 -Wall", - lflags => "-lsocket", + ex_libs => "-lsocket", dso_scheme => "dlfcn", shared_target => "bsd-gcc-shared", shared_cflag => "-fPIC", @@ -943,20 +948,20 @@ cc => "cc", cflags => "-DFILIO_H -DNO_STRINGS_H", thread_cflag => "-Kthread", - lflags => "-lsocket -lnsl -lresolv -lx", + ex_libs => "-lsocket -lnsl -lresolv -lx", }, "unixware-2.1" => { cc => "cc", cflags => "-O -DFILIO_H", thread_cflag => "-Kthread", - lflags => "-lsocket -lnsl -lresolv -lx", + ex_libs => "-lsocket -lnsl -lresolv -lx", }, "unixware-7" => { inherit_from => [ asm("x86_elf_asm") ], cc => "cc", cflags => "-O -DFILIO_H -Kalloca", thread_cflag => "-Kthread", - lflags => "-lsocket -lnsl", + ex_libs => "-lsocket -lnsl", bn_ops => "BN_LLONG", perlasm_scheme => "elf-1", dso_scheme => "dlfcn", @@ -969,7 +974,7 @@ cc => "gcc", cflags => "-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall", thread_cflag => "-D_REENTRANT", - lflags => "-lsocket -lnsl", + ex_libs => "-lsocket -lnsl", bn_ops => "BN_LLONG", perlasm_scheme => "elf-1", dso_scheme => "dlfcn", @@ -983,7 +988,7 @@ cc => "cc", cflags => "-belf", thread_cflag => "(unknown)", - lflags => "-lsocket -lnsl", + ex_libs => "-lsocket -lnsl", perlasm_scheme => "elf-1", dso_scheme => "dlfcn", shared_target => "svr3-shared", @@ -995,7 +1000,7 @@ cc => "gcc", cflags => "-O3 -fomit-frame-pointer", thread_cflag => "(unknown)", - lflags => "-lsocket -lnsl", + ex_libs => "-lsocket -lnsl", bn_ops => "BN_LLONG", perlasm_scheme => "elf-1", dso_scheme => "dlfcn", @@ -1078,7 +1083,7 @@ cc => "c89", cflags => "-O -XLLML -XLLMK -XL -DB_ENDIAN -DCHARSET_EBCDIC", thread_cflag => "(unknown)", - lflags => "-lsocket -lnsl", + ex_libs => "-lsocket -lnsl", bn_ops => "THIRTY_TWO_BIT RC4_CHAR", }, @@ -1162,7 +1167,7 @@ release_cflags => "-O3 -fomit-frame-pointer", thread_cflag => "-D_MT", sys_id => "MINGW32", - lflags => "-lws2_32 -lgdi32 -lcrypt32", + ex_libs => "-lws2_32 -lgdi32 -lcrypt32", bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", perlasm_scheme => "coff", dso_scheme => "win32", @@ -1187,7 +1192,7 @@ release_cflags => "-O3", thread_cflag => "-D_MT", sys_id => "MINGW64", - lflags => "-lws2_32 -lgdi32 -lcrypt32", + ex_libs => "-lws2_32 -lgdi32 -lcrypt32", bn_ops => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN", perlasm_scheme => "mingw64", dso_scheme => "win32", @@ -1311,7 +1316,7 @@ cc => "gcc", cflags => "-I/dev/env/WATT_ROOT/inc -DTERMIO -DL_ENDIAN -fomit-frame-pointer -O2 -Wall", sys_id => "MSDOS", - lflags => "-L/dev/env/WATT_ROOT/lib -lwatt", + ex_libs => "-L/dev/env/WATT_ROOT/lib -lwatt", bn_ops => "BN_LLONG", perlasm_scheme => "a.out", }, @@ -1340,7 +1345,7 @@ release_cflags => "-O3", thread_cflag => "-D_REENTRANT", sys_id => "MACOSX", - lflags => "-Wl,-search_paths_first%", + lflags => "-Wl,-search_paths_first", bn_ops => "BN_LLONG RC4_CHAR", perlasm_scheme => "osx32", dso_scheme => "dlfcn", @@ -1421,7 +1426,7 @@ cc => "gcc", cflags => "-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall", thread_cflag => "-pthread", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "BN_LLONG", dso_scheme => "dlfcn", shared_target => "linux-shared", @@ -1438,13 +1443,13 @@ cc => "ccppc", cflags => "-D_REENTRANT -mrtp -mhard-float -mstrict-align -fno-implicit-fp -DPPC32_fp60x -O2 -fstrength-reduce -fno-builtin -fno-strict-aliasing -Wall -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/usr/h/wrn/coreip", sys_id => "VXWORKS", - lflags => "-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/common", + ex_libs => "-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/common", }, "vxworks-ppcgen" => { cc => "ccppc", cflags => "-D_REENTRANT -mrtp -msoft-float -mstrict-align -O1 -fno-builtin -fno-strict-aliasing -Wall -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/usr/h/wrn/coreip", sys_id => "VXWORKS", - lflags => "-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/sfcommon", + ex_libs => "-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/sfcommon", }, "vxworks-ppc405" => { cc => "ccppc", @@ -1483,7 +1488,7 @@ cflags => "-mrtp -mips2 -O -G 0 -B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DCPU=MIPS32 -msoft-float -mno-branch-likely -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/h/wrn/coreip", thread_cflag => "-D_REENTRANT", sys_id => "VXWORKS", - lflags => "-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon", + ex_libs => "-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon", perlasm_scheme => "o32", ranlib => "ranlibmips", }, @@ -1493,7 +1498,8 @@ cc => "$ENV{'CC'}", cflags => "\$(CFLAGS)", thread_cflag => "-D_REENTRANT", - lflags => "\$(LDFLAGS) \$(LDLIBS)", + lflags => "\$(LDFLAGS)", + ex_libs => "\$(LDLIBS)", bn_ops => "BN_LLONG", dso_scheme => "$ENV{'LIBSSL_dlfcn'}", shared_target => "linux-shared", @@ -1506,7 +1512,8 @@ cc => "$ENV{'CC'}", cflags => "\$(CFLAGS)", thread_cflag => "-D_REENTRANT", - lflags => "\$(LDFLAGS) \$(LDLIBS)", + lflags => "\$(LDFLAGS)", + ex_libs => "\$(LDLIBS)", bn_ops => "SIXTY_FOUR_BIT_LONG", dso_scheme => "$ENV{'LIBSSL_dlfcn'}", shared_target => "linux-shared", diff --git a/Configurations/99-personal-ben.conf b/Configurations/99-personal-ben.conf index 0bebb04b16..c445199bc5 100644 --- a/Configurations/99-personal-ben.conf +++ b/Configurations/99-personal-ben.conf @@ -83,7 +83,7 @@ cflags => "$gcc_devteam_warn -Wno-language-extension-token -Wno-extended-offsetof -arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall", thread_cflag => "-D_REENTRANT", sys_id => "MACOSX", - lflags => "-Wl,-search_paths_first%", + lflags => "-Wl,-search_paths_first", bn_ops => "SIXTY_FOUR_BIT_LONG", perlasm_scheme => "macosx", dso_scheme => "dlfcn", diff --git a/Configure b/Configure index 6d36ae1a6b..dd3d88655f 100755 --- a/Configure +++ b/Configure @@ -811,7 +811,7 @@ $config{openssldir} = catdir($config{prefix}, $config{openssldir}) # Allow environment CC to override compiler... $target{cc} = $ENV{CC} || $target{cc}; -# For cflags and lflags, add the debug_ or release_ attributes +# For cflags, lflags and ex_libs, add the debug_ or release_ attributes # Do it in such a way that no spurious space is appended (hence the grep). $config{cflags} = join(" ", grep { $_ ne "" } ($target{cflags}, @@ -819,6 +819,9 @@ $config{cflags} = join(" ", $config{lflags} = join(" ", grep { $_ ne "" } ($target{lflags}, $target{$build_prefix."lflags"})); +$config{ex_libs} = join(" ", + grep { $_ ne "" } ($target{ex_libs}, + $target{$build_prefix."ex_libs"})); $target{ranlib} = $ENV{'RANLIB'} || $target{ranlib} || $default_ranlib; $target{ar} = $ENV{'AR'} || "ar"; @@ -839,11 +842,6 @@ $config{enginesdir}=$config{prefix} . "/" . $config{libdir} . "/engines"; $config{cflags} .= "$exp_cflags"; -# '%' in $config{lflags} is used to split flags to "pre-" and post-flags -my ($pre,$post)=split('%',$config{lflags}); -if (defined($post)) { $config{prelflags}=$pre; $config{lflags}=$post; } -else { $config{prelflags}=""; $config{lflags}=$pre; } - if ($target =~ /^mingw/ && `$target{cc} --target-help 2>&1` !~ m/-mno-cygwin/m) { $config{cflags} =~ s/-mno-cygwin\s*//; @@ -922,7 +920,7 @@ else # } } -$config{lflags}="$libs$config{lflags}" if ($libs ne ""); +$config{ex_libs}="$libs$config{ex_libs}" if ($libs ne ""); if ($no_asm) { @@ -943,11 +941,11 @@ if ($zlib) { if (defined($withargs{"zlib-lib"})) { - $config{lflags} .= " -L" . $withargs{"zlib-lib"} . " -lz"; + $config{ex_libs} .= " -L" . $withargs{"zlib-lib"} . " -lz"; } else { - $config{lflags} .= " -lz"; + $config{ex_libs} .= " -lz"; } } else @@ -1010,17 +1008,17 @@ if ($target =~ /-icc$/) # Intel C compiler } if ($iccver>=9) { - $config{lflags}.=" -i-static"; - $config{lflags}=~s/-no_cpprt/-no-cpprt/; + $config{ex_libs}.=" -i-static"; + $config{ex_libs}=~s/-no_cpprt/-no-cpprt/; } if ($iccver>=10) { - $config{lflags}=~s/-i-static/-static-intel/; + $config{ex_libs}=~s/-i-static/-static-intel/; } if ($iccver>=11) { $config{cflags}.=" -no-intel-extensions"; # disable Cilk - $config{lflags}=~s/-no-cpprt/-no-cxxlib/; + $config{ex_libs}=~s/-no-cpprt/-no-cxxlib/; } } @@ -1178,7 +1176,7 @@ if ($strict_warnings) } if ($target =~ /^BSD-/) { - $config{lflags} .= " -lexecinfo"; + $config{ex_libs} .= " -lexecinfo"; } } } @@ -1261,7 +1259,8 @@ close(OUT); print "IsMK1MF =", ($target{build_scheme}->[0] eq "mk1mf" ? "yes" : "no"), "\n"; print "CC =$target{cc}\n"; print "CFLAG =$config{cflags}\n"; -print "EX_LIBS =$config{lflags}\n"; +print "LFLAGS =$config{lflags}\n"; +print "EX_LIBS =$config{ex_libs}\n"; print "CPUID_OBJ =$target{cpuid_obj}\n"; print "BN_ASM =$target{bn_obj}\n"; print "EC_ASM =$target{ec_obj}\n"; @@ -1693,8 +1692,11 @@ sub print_table_entry "unistd", "ld", "lflags", + "ex_libs", "debug_lflags", + "debug_ex_libs", "release_lflags", + "release_ex_libs", "bn_ops", "cpuid_obj", "bn_obj", diff --git a/Makefile.in b/Makefile.in index 80d5f175d0..4abda2249c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,8 +62,8 @@ CROSS_COMPILE= {- $config{cross_compile_prefix} -} CC= $(CROSS_COMPILE){- $target{cc} -} CFLAG= {- $config{cflags} -} DEPFLAG= {- $config{depflags} -} -PEX_LIBS= {- $config{prelflags} -} -EX_LIBS= {- $config{lflags} -} +LDFLAGS= {- $config{lflags} -} +EX_LIBS= {- $config{ex_libs} -} EXE_EXT= {- $target{exe_extension} -} ARFLAGS= {- $target{arflags} -} AR=$(CROSS_COMPILE){- $target{ar} -} $(ARFLAGS) r @@ -216,7 +216,7 @@ BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\ ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)' \ EXE_EXT='$(EXE_EXT)' SHARED_LIBS='$(SHARED_LIBS)' \ SHLIB_EXT='$(SHLIB_EXT)' SHLIB_TARGET='$(SHLIB_TARGET)' \ - PEX_LIBS='$(PEX_LIBS)' EX_LIBS='$(EX_LIBS)' \ + LDFLAGS='$(LDFLAGS)' EX_LIBS='$(EX_LIBS)' \ CPUID_OBJ='$(CPUID_OBJ)' BN_ASM='$(BN_ASM)' \ EC_ASM='$(EC_ASM)' DES_ENC='$(DES_ENC)' \ AES_ENC='$(AES_ENC)' CMLL_ENC='$(CMLL_ENC)' \ diff --git a/apps/Makefile.in b/apps/Makefile.in index 8d2433b5c3..6be42c1e63 100644 --- a/apps/Makefile.in +++ b/apps/Makefile.in @@ -11,7 +11,7 @@ MAKEFILE= Makefile PERL= perl RM= rm -f -PEX_LIBS= +LDFLAGS= EX_LIBS= EXE_EXT= @@ -131,7 +131,7 @@ $(EXE): progs.h $(EXE_OBJ) $(DLIBCRYPTO) $(DLIBSSL) LIBRARIES="$(LIBSSL) $(LIBCRYPTO)" ; \ $(MAKE) -f $(TOP)/Makefile.shared -e \ APPNAME=$(EXE) OBJECTS="$(EXE_OBJ)" \ - LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ + LIBDEPS="$(LDFLAGS) $$LIBRARIES $(EX_LIBS)" \ link_app.$${shlib_target} progs.h: progs.pl Makefile diff --git a/crypto/Makefile.in b/crypto/Makefile.in index 21dd827a7c..56a83e1746 100644 --- a/crypto/Makefile.in +++ b/crypto/Makefile.in @@ -20,9 +20,9 @@ RECURSIVE_MAKE= [ -n "$(SDIRS)" ] && for i in $(SDIRS) ; do \ $(MAKE) -e TOP=../.. DIR=$$i INCLUDES='$(INCLUDES)' $$target ) || exit 1; \ done; -PEX_LIBS= +LDFLAGS= EX_LIBS= - + CFLAGS= $(INCLUDE) $(CFLAG) ASFLAGS= $(INCLUDE) $(ASFLAG) AFLAGS=$(ASFLAGS) diff --git a/crypto/pkcs7/Makefile.in b/crypto/pkcs7/Makefile.in index e5854a9873..7c895785ad 100644 --- a/crypto/pkcs7/Makefile.in +++ b/crypto/pkcs7/Makefile.in @@ -10,7 +10,7 @@ CFLAG=-g MAKEFILE= Makefile AR= ar r -PEX_LIBS= +LDFLAGS= EX_LIBS= CFLAGS= $(INCLUDES) $(CFLAG) diff --git a/crypto/ts/Makefile.in b/crypto/ts/Makefile.in index 79fa917f3d..8fe12fc84f 100644 --- a/crypto/ts/Makefile.in +++ b/crypto/ts/Makefile.in @@ -15,7 +15,7 @@ MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) MAKEFILE= Makefile AR= ar r -PEX_LIBS= +LDFLAGS= EX_LIBS= CFLAGS= $(INCLUDES) $(CFLAG) diff --git a/engines/Makefile.in b/engines/Makefile.in index b2580199b9..d91bd5467f 100644 --- a/engines/Makefile.in +++ b/engines/Makefile.in @@ -15,7 +15,7 @@ AR= ar r PADLOCK_ASM_OBJ= -PEX_LIBS= +LDFLAGS= EX_LIBS= CFLAGS= $(INCLUDES) $(CFLAG) diff --git a/test/Makefile.in b/test/Makefile.in index a564ffc56d..9dbf54993f 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -10,7 +10,7 @@ CFLAG= -g MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) PERL= perl -PEX_LIBS= +LDFLAGS= EX_LIBS= #-lnsl -lsocket CFLAGS= $(INCLUDES) $(CFLAG) @@ -180,14 +180,14 @@ BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ LIBRARIES="$(LIBSSL) $(LIBCRYPTO)"; \ $(MAKE) -f $(TOP)/Makefile.shared -e \ APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o $$testutil" \ - LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ + LIBDEPS="$(LDFLAGS) $$LIBRARIES $(EX_LIBS)" \ link_app.$${shlib_target} BUILD_CMD_STATIC=shlib_target=; \ LIBRARIES="$(DLIBSSL) $(DLIBCRYPTO)"; \ $(MAKE) -f $(TOP)/Makefile.shared -e \ APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o $$testutil" \ - LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ + LIBDEPS="$(LDFLAGS) $$LIBRARIES $(EX_LIBS)" \ link_app.$${shlib_target} $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) @@ -242,7 +242,7 @@ FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ fi; \ $(MAKE) -f $(TOP)/Makefile.shared -e \ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ - LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ + LIBDEPS="$(LDFLAGS) $$LIBRARIES $(EX_LIBS)" \ link_app.$${shlib_target} FIPS_CRYPTO_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ @@ -255,7 +255,7 @@ FIPS_CRYPTO_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ [ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \ $(MAKE) -f $(TOP)/Makefile.shared -e \ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ - LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ + LIBDEPS="$(LDFLAGS) $$LIBRARIES $(EX_LIBS)" \ link_app.$${shlib_target} $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO) @@ -368,9 +368,9 @@ $(ASYNCTEST)$(EXE_EXT): $(ASYNCTEST).o #$(AESTEST)$(EXE_EXT): $(AESTEST).o $(DLIBCRYPTO) # if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \ -# $(CC) -o $(AESTEST)$(EXE_EXT) $(CFLAGS) $(AESTEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \ +# $(CC) -o $(AESTEST)$(EXE_EXT) $(CFLAGS) $(AESTEST).o $(LDFLAGS) $(DLIBCRYPTO) $(EX_LIBS) ; \ # else \ -# $(CC) -o $(AESTEST)$(EXE_EXT) $(CFLAGS) $(AESTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \ +# $(CC) -o $(AESTEST)$(EXE_EXT) $(CFLAGS) $(AESTEST).o $(LDFLAGS) $(LIBCRYPTO) $(EX_LIBS) ; \ # fi dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) -- 2.25.1