diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-06-26 17:47:44 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-06-26 17:47:44 +0000 |
| commit | 2f3c39bc623bf198a7f8c54efe08595750e5b846 (patch) | |
| tree | 83270a7cd5b276e0b247504b6d976621dfbbf02e | |
| parent | c5de8b2a27e5f8be39673095ad033fe8b4f1894c (diff) | |
| download | openssl-2f3c39bc623bf198a7f8c54efe08595750e5b846.tar.gz | |
Minor (final?) Makefiles polish.
| -rw-r--r-- | Makefile.org | 4 | ||||
| -rw-r--r-- | apps/Makefile | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.org b/Makefile.org index 3dba4a1a28..ba60f70696 100644 --- a/Makefile.org +++ b/Makefile.org @@ -160,6 +160,8 @@ CLEARENV= TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS} \ $${EXHEADER+EXHEADER} $${HEADER+HEADER} \ $${GENERAL+GENERAL} $${CFLAGS+CFLAGS} \ $${ASFLAGS+ASFLAGS} $${AFLAGS+AFLAGS} \ + $${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS} \ + $${SHAREDCMD+SHAREDCMD} $${SHAREDFLAGS+SHAREDFLAGS} \ $${SHARED_LIB+SHARED_LIB} $${LIBEXTRAS+LIBEXTRAS} BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ @@ -172,7 +174,7 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \ DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}' \ MAKEDEPPROG='${MAKEDEPPROG}' \ - LDFLAGS='${LDFLAGS}' SHARED_LDFLAGS='${SHARED_LDFLAGS}' \ + SHARED_LDFLAGS='${SHARED_LDFLAGS}' \ KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' \ EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' \ SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' \ diff --git a/apps/Makefile b/apps/Makefile index 4bd2646520..fc4d69d027 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -162,7 +162,6 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ link_app.$${shlib_target} - @case "../*.dll" in *\**) ;; *) cp -p ../*.dll .;; esac -(cd ..; \ OPENSSL="`pwd`/util/opensslwrap.sh"; export OPENSSL; \ $(PERL) tools/c_rehash certs) |