projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure the rand_byte buffer in padlock engine is cleansed.
[openssl.git]
/
engines
/
Makefile.in
diff --git
a/engines/Makefile.in
b/engines/Makefile.in
index 99ba822fb2fce56f37b57e10e7613e74df9ae80e..e37c4e2be98b3ebf551e892a92ca0b49514c6b32 100644
(file)
--- a/
engines/Makefile.in
+++ b/
engines/Makefile.in
@@
-2,9
+2,6
@@
# OpenSSL/engines/Makefile
#
# OpenSSL/engines/Makefile
#
-#The following engines have been disabled as they currently do not build
-# sureware ubsec
-
DIR= engines
TOP= ..
CC= cc
DIR= engines
TOP= ..
CC= cc
@@
-13,13
+10,18
@@
CFLAG=-g
MAKEFILE= Makefile
AR= ar r
MAKEFILE= Makefile
AR= ar r
+RECURSIVE_MAKE= for i in $${ENGDIRS:-$(ENGDIRS)} ; do \
+ (cd $$i && echo "making $$target in $(DIR)/$$i..." && \
+ $(MAKE) -e TOP=../.. DIR=$$i $$target ) || exit 1; \
+ done;
+
PADLOCK_ASM_OBJ=
PLIB_LDFLAG=
EX_LIBS=
PADLOCK_ASM_OBJ=
PLIB_LDFLAG=
EX_LIBS=
-CFLAGS= $(INCLUDES) $(CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+CFLAGS= $(INCLUDES) $(CFLAG)
$(SHARED_CFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG)
$(SHARED_CFLAG)
AFLAGS= $(ASFLAGS)
GENERAL=Makefile engines.com install.com engine_vector.mar
AFLAGS= $(ASFLAGS)
GENERAL=Makefile engines.com install.com engine_vector.mar
@@
-43,8
+45,6
@@
TESTLIBOBJ= e_ossltest.o
SRC= $(LIBSRC)
HEADER= \
SRC= $(LIBSRC)
HEADER= \
- e_chil_err.c e_chil_err.h \
- e_ubsec_err.c e_ubsec_err.h \
e_capi_err.c e_capi_err.h \
e_ossltest_err.c e_ossltest_err.h \
e_dasync_err.c e_dasync_err.h
e_capi_err.c e_capi_err.h \
e_ossltest_err.c e_ossltest_err.h \
e_dasync_err.c e_dasync_err.h
@@
-54,10
+54,10
@@
ALL= $(GENERAL) $(SRC) $(HEADER)
top:
(cd ..; $(MAKE) DIRS=$(DIR) all)
top:
(cd ..; $(MAKE) DIRS=$(DIR) all)
-all: lib
+all: lib
subdirs
lib: $(LIBOBJ) $(TESTLIBOBJ)
lib: $(LIBOBJ) $(TESTLIBOBJ)
- @if [
-n "$(SHARED_LIBS)"
]; then \
+ @if [
"$(DYNAMIC_ENGINES)" = 1
]; then \
set -e; \
for l in $(LIBNAMES) $(TESTLIBNAMES); do \
$(MAKE) -f ../Makefile.shared -e \
set -e; \
for l in $(LIBNAMES) $(TESTLIBNAMES); do \
$(MAKE) -f ../Makefile.shared -e \
@@
-72,12
+72,12
@@
lib: $(LIBOBJ) $(TESTLIBOBJ)
touch lib
e_padlock-x86.s: asm/e_padlock-x86.pl
touch lib
e_padlock-x86.s: asm/e_padlock-x86.pl
- $(PERL) asm/e_padlock-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)
>
$@
+ $(PERL) asm/e_padlock-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) $@
e_padlock-x86_64.s: asm/e_padlock-x86_64.pl
e_padlock-x86_64.s: asm/e_padlock-x86_64.pl
- $(PERL) asm/e_padlock-x86_64.pl $(PERLASM_SCHEME)
>
$@
+ $(PERL) asm/e_padlock-x86_64.pl $(PERLASM_SCHEME) $@
-
file
s:
- $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
subdir
s:
+ @target=all; $(RECURSIVE_MAKE)
install:
@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
install:
@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
@@
-90,6
+90,7
@@
install:
mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$${l}$(DSO_EXT).new $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$${l}$(DSO_EXT); \
done; \
fi
mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$${l}$(DSO_EXT).new $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$${l}$(DSO_EXT); \
done; \
fi
+ @target=install; $(RECURSIVE_MAKE)
uninstall:
@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
uninstall:
@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
@@
-99,6
+100,7
@@
uninstall:
$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$${l}$(DSO_EXT); \
done; \
fi
$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$${l}$(DSO_EXT); \
done; \
fi
+ @target=install; $(RECURSIVE_MAKE)
errors:
set -e; for l in $(LIBNAMES); do \
errors:
set -e; for l in $(LIBNAMES); do \
@@
-112,5
+114,6
@@
depend:
clean:
rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
clean:
rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+ @target=clean; $(RECURSIVE_MAKE)
# DO NOT DELETE THIS LINE -- make depend depends on it.
# DO NOT DELETE THIS LINE -- make depend depends on it.