Commit 2f3c39bc authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Minor (final?) Makefiles polish.

parent c5de8b2a

Makefile.org

+3 −1
Original line number Diff line number Diff line
@@ -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}'	\

apps/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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)