Shut whiny make's up.

[openssl.git] / apps / Makefile.ssl

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 4f9ae326be0bb59926333950a9c3a054d2eb7878..8fd61bfe54be55cd485a988a017384a3da07f4a8 100644 (file)
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -38,7 +38,7 @@ LIBSSL=-L.. -lssl
 
 PROGRAM= openssl
 
-SCRIPTS=CA.sh CA.pl der_chop
+SCRIPTS=CA.sh CA.pl
 
 EXE= $(PROGRAM)$(EXE_EXT)
 
@@ -94,7 +94,8 @@ req: sreq.o $(A_OBJ) $(DLIBCRYPTO)
                shlib_target="$(SHLIB_TARGET)"; \
        fi; \
        $(NEWMAKE) -f $(TOP)/Makefile.shared \
-               APPNAME=req LDFLAGS="$(CFLAG)" \
+               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 \
@@ -164,19 +165,16 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
          LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
        fi; \
        $(NEWMAKE) -f $(TOP)/Makefile.shared \
-               APPNAME=$(EXE) LDFLAGS="$(CFLAG)" \
+               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}
-       -(cd ..; OPENSSL="`pwd`/apps/$(EXE)"; export OPENSSL; \
-               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; \
-               export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
-               $(PERL) tools/c_rehash certs)
+       @case "../*.dll" in *\**) ;; *) cp -p ../*.dll .;; esac
+       -(cd ..; \
+         OPENSSL="`pwd`/util/opensslwrap.sh"; export OPENSSL; \
+         $(PERL) tools/c_rehash certs)
 
 progs.h: progs.pl
        $(PERL) progs.pl $(E_EXE) >progs.h