Please BSD make...

This commit is contained in:
Andy Polyakov 2005-01-25 22:09:11 +00:00
parent e532a6c449
commit fbdce13e5a
4 changed files with 4 additions and 3 deletions

View File

@ -244,7 +244,7 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
BUILD_CMD=if echo " $(DIRS) " | grep " $$dir " >/dev/null 2>/dev/null; then \ BUILD_CMD=if echo " $(DIRS) " | grep " $$dir " >/dev/null 2>/dev/null; then \
if [ -d "$$dir" ]; then \ if [ -d "$$dir" ]; then \
(cd $$dir && echo "making $$target in $$dir..." && \ (cd $$dir && echo "making $$target in $$dir..." && \
$(MAKE) $(BUILDENV) $$target ) || exit 1; \ $(MAKE) -e $(BUILDENV) $$target ) || exit 1; \
else \ else \
$(MAKE) $$dir; \ $(MAKE) $$dir; \
fi; fi fi; fi

View File

@ -165,7 +165,7 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \ LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
fi; \ fi; \
$(NEWMAKE) -f $(TOP)/Makefile.shared \ $(NEWMAKE) -f $(TOP)/Makefile.shared \
APPNAME=$(EXE) CC="$(CC)" LDFLAGS="$(LDFLAG)" \ APPNAME=$(EXE) CC="$(CC)" LDFLAGS="$(CFLAG)" \
SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
OBJECTS="$(PROGRAM).o $(E_OBJ)" \ OBJECTS="$(PROGRAM).o $(E_OBJ)" \
LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \

View File

@ -85,7 +85,7 @@ subdirs:
@for i in $(SDIRS) ;\ @for i in $(SDIRS) ;\
do \ do \
(cd $$i && echo "making all in crypto/$$i..." && \ (cd $$i && echo "making all in crypto/$$i..." && \
$(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \ $(MAKE) -e INCLUDES='${INCLUDES}' all ) || exit 1; \
done; done;
files: files:

View File

@ -21,6 +21,7 @@ AES_ASM_OBJ=aes_core.o aes_cbc.o
CFLAGS= $(INCLUDES) $(CFLAG) CFLAGS= $(INCLUDES) $(CFLAG)
ASFLAGS= $(INCLUDES) $(ASFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG)
AFLAGS= $(ASFLAGS)
GENERAL=Makefile GENERAL=Makefile
#TEST=aestest.c #TEST=aestest.c