diff options
-rw-r--r-- | Makefile.shared | 88 | ||||
-rw-r--r-- | apps/Makefile.ssl | 8 | ||||
-rw-r--r-- | test/Makefile.ssl | 124 |
3 files changed, 110 insertions, 110 deletions
diff --git a/Makefile.shared b/Makefile.shared index 878530bc20..313dd5e7eb 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -91,7 +91,7 @@ LINK_APP= \ LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \ LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ - $$LDCMD $(LDFLAGS) $$LDFLAGS -o $$APPNAME $(OBJECTS) $$LIBDEPS ) + $$LDCMD $$LDFLAGS -o $$APPNAME $(OBJECTS) $$LIBDEPS ) LINK_SO= \ ( $(DEBUG); \ @@ -99,7 +99,7 @@ LINK_SO= \ LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \ LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ - $$SHAREDCMD $(SHARED_LDFLAGS) $$SHAREDFLAGS -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ + $$SHAREDCMD $$SHAREDFLAGS -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS ) && \ $(SYMLINK_SO); ( $(DEBUG); rm -f lib$(LIBNAME).exp ) SYMLINK_SO= \ @@ -141,10 +141,10 @@ DO_GNU_SO=$(CALC_VERSIONS); \ LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS='-Wl,--whole-archive'; \ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ - SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \ + SHAREDFLAGS="$(CFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \ SHAREDCMD='$(CC)' DO_GNU_APP=LDCMD=$(CC);\ - LDFLAGS="-Wl,-rpath,$(LIBRPATH)"; \ + LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"; \ LIBDEPS="$(LIBDEPS) -lc"; \ APPNAME=$(APPNAME) @@ -155,7 +155,7 @@ DO_GNU_APP=LDCMD=$(CC);\ #else... link_app.: LDCMD=$(CC); \ - LDFLAGS=""; \ + LDFLAGS="$(CFLAGS)"; \ LIBDEPS="$(LIBDEPS)"; \ APPNAME="$(APPNAME)"; \ $(LINK_APP) @@ -175,7 +175,7 @@ link_o.bsd: LIBDEPS=; \ ALLSYMSFLAGS="-Wl,-Bforcearchive"; \ NOALLSYMSFLAGS=; \ - SHAREDFLAGS="-shared -nostdlib"; \ + SHAREDFLAGS="$(CFLAGS) -shared -nostdlib"; \ SHAREDCMD=$(CC); \ fi; $(LINK_SO_O) link_a.bsd: @@ -186,13 +186,13 @@ link_a.bsd: LIBDEPS=; \ ALLSYMSFLAGS="-Wl,-Bforcearchive"; \ NOALLSYMSFLAGS=; \ - SHAREDFLAGS="-shared -nostdlib"; \ + SHAREDFLAGS="$(CFLAGS) -shared -nostdlib"; \ SHAREDCMD=$(CC); \ fi; $(LINK_SO_A) link_app.bsd: @if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \ LDCMD=$(CC); \ - LDFLAGS="-Wl,-rpath,$(LIBPATH)"; \ + LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBPATH)"; \ LIBDEPS="$(LIBDEPS)"; \ APPNAME="$(APPNAME)"; \ fi; $(LINK_APP) @@ -205,7 +205,7 @@ link_o.darwin: LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS='-all_load'; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS="-dynamiclib"; \ + SHAREDFLAGS="$(CFLAGS) -dynamiclib"; \ SHAREDCMD='$(CC)'; \ if [ -n "$(LIBVERSION)" ]; then \ SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \ @@ -221,7 +221,7 @@ link_a.darwin: LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS='-all_load'; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS="-dynamiclib"; \ + SHAREDFLAGS="$(CFLAGS) -dynamiclib"; \ SHAREDCMD='$(CC)'; \ if [ -n "$(LIBVERSION)" ]; then \ SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \ @@ -232,7 +232,7 @@ link_a.darwin: $(LINK_SO_A) link_app.darwin: LDCMD=$(CC);\ - LDFLAGS=""; \ + LDFLAGS="$(CFLAGS)"; \ LIBDEPS="$(LIBDEPS) -lc"; \ APPNAME="$(APPNAME)"; \ $(LINK_APP) @@ -247,7 +247,7 @@ link_o.cygwin: SHLIB_SOVER=-$(LIBVERSION); \ ALLSYMSFLAGS='-Wl,--whole-archive'; \ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ - SHAREDFLAGS="-Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \ + SHAREDFLAGS="$(CFLAGS) -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \ SHAREDCMD='${CC}'; \ $(LINK_SO_O) link_a.cygwin: @@ -260,12 +260,12 @@ link_a.cygwin: SHLIB_SOVER=; \ ALLSYMSFLAGS='-Wl,--whole-archive'; \ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ - SHAREDFLAGS="-Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \ + SHAREDFLAGS="$(CFLAGS) -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \ SHAREDCMD='${CC}'; \ $(LINK_SO_A) link_app.cygwin: LDCMD=$(CC);\ - LDFLAGS=""; \ + LDFLAGS="$(CFLAGS)"; \ LIBDEPS="$(LIBDEPS)"; \ APPNAME="$(APPNAME)"; \ $(LINK_APP) @@ -286,7 +286,7 @@ link_o.alpha-osf1: SHLIB_SOVER=; \ ALLSYMSFLAGS='-all'; \ NOALLSYMSFLAGS='-none'; \ - SHAREDFLAGS="-shared"; \ + SHAREDFLAGS="$(CFLAGS) -shared"; \ SHAREDCMD='$(CC)'; \ if [ -n "$$SHLIB_HIST" ]; then \ SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \ @@ -309,7 +309,7 @@ link_a.alpha-osf1: SHLIB_SOVER=; \ ALLSYMSFLAGS='-all'; \ NOALLSYMSFLAGS='-none'; \ - SHAREDFLAGS="-shared"; \ + SHAREDFLAGS="$(CFLAGS) -shared"; \ SHAREDCMD='$(CC)'; \ if [ -n "$$SHLIB_HIST" ]; then \ SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \ @@ -321,7 +321,7 @@ link_app.alpha-osf1: $(DO_GNU_APP); \ else \ LDCMD=$(CC);\ - LDFLAGS=""; \ + LDFLAGS="$(CFLAGS)"; \ LIBDEPS="$(LIBDEPS) -lc"; \ APPNAME="$(APPNAME)" fi; \ @@ -345,7 +345,7 @@ link_o.tru64: SHLIB_SOVER=; \ ALLSYMSFLAGS='-all'; \ NOALLSYMSFLAGS='-none'; \ - SHAREDFLAGS="-shared -msym -rpath $(LIBRPATH)"; \ + SHAREDFLAGS="$(CFLAGS) -shared -msym -rpath $(LIBRPATH)"; \ SHAREDCMD='$(CC)'; \ if [ -n "$$SHLIB_HIST" ]; then \ SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \ @@ -368,7 +368,7 @@ link_a.tru64: SHLIB_SOVER=; \ ALLSYMSFLAGS='-all'; \ NOALLSYMSFLAGS='-none'; \ - SHAREDFLAGS="-shared -msym -rpath $(LIBRPATH)"; \ + SHAREDFLAGS="$(CFLAGS) -shared -msym -rpath $(LIBRPATH)"; \ SHAREDCMD='$(CC)'; \ if [ -n "$$SHLIB_HIST" ]; then \ SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \ @@ -380,7 +380,7 @@ link_app.tru64: $(DO_GNU_APP); \ else \ LDCMD=$(CC);\ - LDFLAGS="-rpath $(LIBRPATH)"; \ + LDFLAGS="$(CFLAGS) -rpath $(LIBRPATH)"; \ LIBDEPS="$(LIBDEPS) -lc"; \ APPNAME="$(APPNAME)"; \ fi; \ @@ -404,7 +404,7 @@ link_o.tru64-rpath: SHLIB_SOVER=; \ ALLSYMSFLAGS='-all'; \ NOALLSYMSFLAGS='-none'; \ - SHAREDFLAGS="-shared -msym -rpath $(LIBRPATH)"; \ + SHAREDFLAGS="$(CFLAGS) -shared -msym -rpath $(LIBRPATH)"; \ SHAREDCMD='$(CC)'; \ if [ -n "$$SHLIB_HIST" ]; then \ SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \ @@ -427,7 +427,7 @@ link_a.tru64-rpath: SHLIB_SOVER=; \ ALLSYMSFLAGS='-all'; \ NOALLSYMSFLAGS='-none'; \ - SHAREDFLAGS="-shared -msym -rpath $(LIBRPATH)"; \ + SHAREDFLAGS="$(CFLAGS) -shared -msym -rpath $(LIBRPATH)"; \ SHAREDCMD='$(CC)'; \ if [ -n "$$SHLIB_HIST" ]; then \ SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \ @@ -439,7 +439,7 @@ link_app.tru64-rpath: $(DO_GNU_APP); \ else \ LDCMD=$(CC);\ - LDFLAGS="-rpath $(LIBRPATH)"; \ + LDFLAGS="$(CFLAGS) -rpath $(LIBRPATH)"; \ LIBDEPS="$(LIBDEPS) -lc"; \ APPNAME="$(APPNAME)"; \ fi; \ @@ -457,7 +457,7 @@ link_o.solaris: LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS="$${MINUSZ}allextract"; \ NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \ - SHAREDFLAGS="-G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH) -Wl,-Bsymbolic"; \ + SHAREDFLAGS="$(CFLAGS) -G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH) -Wl,-Bsymbolic"; \ SHAREDCMD='$(CC)'; \ fi; \ $(LINK_SO_O) @@ -473,7 +473,7 @@ link_a.solaris: LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS="$${MINUSZ}allextract"; \ NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \ - SHAREDFLAGS="-G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH) -Wl,-Bsymbolic"; \ + SHAREDFLAGS="$(CFLAGS) -G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH) -Wl,-Bsymbolic"; \ SHAREDCMD='$(CC)'; \ fi; \ $(LINK_SO_A) @@ -482,7 +482,7 @@ link_app.solaris: $(DO_GNU_APP); \ else \ LDCMD=$(CC);\ - LDFLAGS="-R $(LIBRPATH)"; \ + LDFLAGS="$(CFLAGS) -R $(LIBRPATH)"; \ LIBDEPS="$(LIBDEPS) -lc"; \ APPNAME="$(APPNAME)"; \ fi; \ @@ -499,7 +499,7 @@ link_o.svr3: LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS=''; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS="-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ + SHAREDFLAGS="$(CFLAGS) -G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ SHAREDCMD='$(CC)'; \ fi; \ $(LINK_SO_O) @@ -513,7 +513,7 @@ link_a.svr3: LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS=''; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS="-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ + SHAREDFLAGS="$(CFLAGS) -G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ SHAREDCMD='$(CC)'; \ fi; \ $(LINK_SO_A_UNPACKED) @@ -522,7 +522,7 @@ link_app.svr3: $(DO_GNU_APP); \ else \ LDCMD=$(CC);\ - LDFLAGS=""; \ + LDFLAGS="$(CFLAGS)"; \ LIBDEPS="$(LIBDEPS) -lc"; \ APPNAME="$(APPNAME)"; \ fi; \ @@ -541,7 +541,7 @@ link_o.svr5: LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS=''; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS="$${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ + SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ SHAREDCMD='$(CC)'; \ fi; \ $(LINK_SO_O) @@ -557,7 +557,7 @@ link_a.svr5: LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS=''; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS="$${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ + SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ SHAREDCMD='$(CC)'; \ fi; \ $(LINK_SO_A_UNPACKED) @@ -566,7 +566,7 @@ link_app.svr5: $(DO_GNU_APP); \ else \ LDCMD=$(CC);\ - LDFLAGS=""; \ + LDFLAGS="$(CFLAGS)"; \ LIBDEPS="$(LIBDEPS) -lc"; \ APPNAME="$(APPNAME)"; \ fi; \ @@ -584,7 +584,7 @@ link_o.irix: ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \ ALLSYMSFLAGS="$${MINUSWL}-all"; \ NOALLSYMSFLAGS="$${MINUSWL}-none"; \ - SHAREDFLAGS="-shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \ + SHAREDFLAGS="$(CFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \ SHAREDCMD='$(CC)'; \ fi; \ $(LINK_SO_O) @@ -600,7 +600,7 @@ link_a.irix: ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \ ALLSYMSFLAGS="$${MINUSWL}-all"; \ NOALLSYMSFLAGS="$${MINUSWL}-none"; \ - SHAREDFLAGS="-shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \ + SHAREDFLAGS="$(CFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \ SHAREDCMD='$(CC)'; \ fi; \ $(LINK_SO_A) @@ -609,7 +609,7 @@ link_app.irix: $(DO_GNU_APP); \ else \ LDCMD=$(CC);\ - LDFLAGS="-Wl,-rpath,$(LIBRPATH)"; \ + LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"; \ LIBDEPS="$(LIBDEPS) -lc"; \ APPNAME="$(APPNAME)"; \ fi; \ @@ -633,7 +633,7 @@ link_o.hpux: ALLSYMSFLAGS='-Wl,-Fl'; \ NOALLSYMSFLAGS=''; \ expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \ - SHAREDFLAGS="-Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+cdp,../:,+cdp,./:,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+b,$(LIBRPATH)"; \ + SHAREDFLAGS="$(CFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+cdp,../:,+cdp,./:,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+b,$(LIBRPATH)"; \ SHAREDCMD=$(CC); \ fi; \ $(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX @@ -647,14 +647,14 @@ link_a.hpux: ALLSYMSFLAGS='-Wl,-Fl'; \ NOALLSYMSFLAGS=''; \ expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \ - SHAREDFLAGS="-Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+cdp,../:,+cdp,./:,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+b,$(LIBRPATH)"; \ + SHAREDFLAGS="$(CFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+cdp,../:,+cdp,./:,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+b,$(LIBRPATH)"; \ SHAREDCMD='$(CC)'; \ fi; \ $(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX link_app.hpux: @if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \ LDCMD=$(CC);\ - LDFLAGS="-Wl,+s,+cdp,../:,+cdp,./:,+b,$(LIBRPATH)"; \ + LDFLAGS="$(CFLAGS) -Wl,+s,+cdp,../:,+cdp,./:,+b,$(LIBRPATH)"; \ LIBDEPS="$(LIBDEPS)"; \ APPNAME="$(APPNAME)"; \ fi; \ @@ -667,7 +667,7 @@ link_o.aix: LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS='-bnogc'; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS='-G -bE:lib$(LIBNAME).exp -bM:SRE -blibpath:$(LIBRPATH)'; \ + SHAREDFLAGS='$(CFLAGS) -G -bE:lib$(LIBNAME).exp -bM:SRE -blibpath:$(LIBRPATH)'; \ SHAREDCMD='$(CC)'; \ $(LINK_SO_O) link_a.aix: @@ -677,12 +677,12 @@ link_a.aix: LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS='-bnogc'; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS='-G -bE:lib$(LIBNAME).exp -bM:SRE -blibpath:$(LIBRPATH)'; \ + SHAREDFLAGS='$(CFLAGS) -G -bE:lib$(LIBNAME).exp -bM:SRE -blibpath:$(LIBRPATH)'; \ SHAREDCMD='$(CC)'; \ $(LINK_SO_A_VIA_O) link_app.aix: LDCMD=$(CC);\ - LDFLAGS="-blibpath:$(LIBRPATH)"; \ + LDFLAGS="$(CFLAGS) -blibpath:$(LIBRPATH)"; \ LIBDEPS="$(LIBDEPS) -lc"; \ APPNAME="$(APPNAME)" $(LINK_APP) @@ -694,7 +694,7 @@ link_o.reliantunix: LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS=; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS='-G'; \ + SHAREDFLAGS='$(CFLAGS) -G'; \ SHAREDCMD='$(CC)'; \ $(LINK_SO_O) link_a.reliantunix: @@ -704,12 +704,12 @@ link_a.reliantunix: LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS=; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS='-G'; \ + SHAREDFLAGS='$(CFLAGS) -G'; \ SHAREDCMD='$(CC)'; \ $(LINK_SO_A_UNPACKED) link_app.reliantunix: LDCMD=$(CC);\ - LDFLAGS=""; \ + LDFLAGS="$(CFLAGS)"; \ LIBDEPS="$(LIBDEPS) -lc"; \ APPNAME="$(APPNAME)" $(LINK_APP) diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl index 1f75cb50f4..dc5b3d7754 100644 --- a/apps/Makefile.ssl +++ b/apps/Makefile.ssl @@ -94,8 +94,8 @@ req: sreq.o $(A_OBJ) $(DLIBCRYPTO) shlib_target="$(SHLIB_TARGET)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=req CC="$(CC)" LDFLAGS="$(CFLAG)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=req CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAG)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="sreq.o $(A_OBJ) $(RAND_OBJ)" \ LIBDEPS="$(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -165,8 +165,8 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(EXE) CC="$(CC)" LDFLAGS="$(CFLAG)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(EXE) CC="$(CC)" CFLAGS="$(CFLAG)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(PROGRAM).o $(E_OBJ)" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ diff --git a/test/Makefile.ssl b/test/Makefile.ssl index 8302f43b06..85d3247b41 100644 --- a/test/Makefile.ssl +++ b/test/Makefile.ssl @@ -333,8 +333,8 @@ $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(RSATEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(LDFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(RSATEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(RSATEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -350,8 +350,8 @@ $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(BNTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(BNTEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(BNTEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -367,8 +367,8 @@ $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(ECTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(ECTEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(ECTEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -384,8 +384,8 @@ $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(EXPTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(EXPTEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(EXPTEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -401,8 +401,8 @@ $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(IDEATEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(IDEATEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(IDEATEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -418,8 +418,8 @@ $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(MD2TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(MD2TEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(MD2TEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -435,8 +435,8 @@ $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(SHATEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(SHATEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(SHATEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -452,8 +452,8 @@ $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(SHA1TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(SHA1TEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(SHA1TEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -469,8 +469,8 @@ $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(SHA256TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(SHA256TEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(SHA256TEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -486,8 +486,8 @@ $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(SHA512TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(SHA512TEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(SHA512TEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -503,8 +503,8 @@ $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(RMDTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(RMDTEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(RMDTEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -520,8 +520,8 @@ $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(MDC2TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(MDC2TEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(MDC2TEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -537,8 +537,8 @@ $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(MD4TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(MD4TEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(MD4TEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -554,8 +554,8 @@ $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(MD5TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(MD5TEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(MD5TEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -571,8 +571,8 @@ $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(HMACTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(HMACTEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(HMACTEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -588,8 +588,8 @@ $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(RC2TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(RC2TEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(RC2TEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -605,8 +605,8 @@ $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(BFTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(BFTEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(BFTEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -622,8 +622,8 @@ $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(CASTTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(CASTTEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(CASTTEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -639,8 +639,8 @@ $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(RC4TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(RC4TEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(RC4TEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -656,8 +656,8 @@ $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(RC5TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(RC5TEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(RC5TEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -673,8 +673,8 @@ $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(DESTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(DESTEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(DESTEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -690,8 +690,8 @@ $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(RANDTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(RANDTEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(RANDTEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -707,8 +707,8 @@ $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(DHTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(DHTEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(DHTEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -724,8 +724,8 @@ $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(DSATEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(DSATEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(DSATEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -741,8 +741,8 @@ $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(METHTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(METHTEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(METHTEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -758,8 +758,8 @@ $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO) LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(SSLTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(SSLTEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(SSLTEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -775,8 +775,8 @@ $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(ENGINETEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(ENGINETEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(ENGINETEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -792,8 +792,8 @@ $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(EVPTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(EVPTEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(EVPTEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -809,8 +809,8 @@ $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(ECDSATEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(ECDSATEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(ECDSATEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -826,8 +826,8 @@ $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(ECDHTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=$(ECDHTEST)$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(ECDHTEST).o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ @@ -853,8 +853,8 @@ dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) LIBRARIES="$(LIBCRYPTO)"; \ fi; \ $(NEWMAKE) -f $(TOP)/Makefile.shared \ - APPNAME=dummytest$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \ - SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ + APPNAME=dummytest$(EXE_EXT) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="dummytest.o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ |