Shut whiny make's up.

[openssl.git] / apps / Makefile.ssl

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 1f75cb50f42e0c597ef0d16514ca343e77459166..8fd61bfe54be55cd485a988a017384a3da07f4a8 100644 (file)
--- 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,26 +165,15 @@ $(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 \
                link_app.$${shlib_target}
+       @case "../*.dll" in *\**) ;; *) cp -p ../*.dll .;; esac
        -(cd ..; \
-         OPENSSL="`pwd`/apps/$(EXE)"; export OPENSSL; \
-         if [ -n "$(SHARED_LIBS)" ]; then \
-           LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \
-           DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \
-           SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \
-           LIBPATH="`pwd`:$$LIBPATH"; \
-           if [ "$(PLATFORM)" = "Cygwin" ]; then \
-             PATH="`pwd`:$$PATH"; \
-           fi; \
-           LD_PRELOAD="`pwd`/libssl.so `pwd`/libcrypto.so"; \
-           export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
-           export LD_PRELOAD; \
-         fi; \
+         OPENSSL="`pwd`/util/opensslwrap.sh"; export OPENSSL; \
          $(PERL) tools/c_rehash certs)
 
 progs.h: progs.pl