Fix build errors with enable-ec_nistp_64_gcc_128

[openssl.git] / crypto / modes / Makefile

diff --git a/crypto/modes/Makefile b/crypto/modes/Makefile
index d03284e869d6f03a44c767679034d977d74432e2..ce27c2d8588ae34ada1060f0c9cedd3993d85d81 100644 (file)
--- a/crypto/modes/Makefile
+++ b/crypto/modes/Makefile
@@ -17,20 +17,16 @@ ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile
-TEST=
-APPS=
 
 LIB=$(TOP)/libcrypto.a
 LIBSRC= cbc128.c ctr128.c cts128.c cfb128.c ofb128.c gcm128.c \
-       ccm128.c xts128.c wrap128.c
+       ccm128.c xts128.c wrap128.c ocb128.c
 LIBOBJ= cbc128.o ctr128.o cts128.o cfb128.o ofb128.o gcm128.o \
-       ccm128.o xts128.o wrap128.o $(MODES_ASM_OBJ)
+       ccm128.o xts128.o wrap128.o ocb128.o $(MODES_ASM_OBJ)
 
 SRC= $(LIBSRC)
 
-#EXHEADER= store.h str_compat.h
-EXHEADER= modes.h
-HEADER=        modes_lcl.h $(EXHEADER)
+HEADER=        modes_lcl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -40,7 +36,7 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 
@@ -55,13 +51,15 @@ aesni-gcm-x86_64.s: asm/aesni-gcm-x86_64.pl
 ghash-sparcv9.s:       asm/ghash-sparcv9.pl
        $(PERL) asm/ghash-sparcv9.pl $@ $(CFLAGS)
 ghash-alpha.s: asm/ghash-alpha.pl
-       (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
+       (preproc=$$$$.$@.S; trap "rm $$preproc" INT; \
        $(PERL) asm/ghash-alpha.pl > $$preproc && \
-       $(CC) -E $$preproc > $@ && rm $$preproc)
+       $(CC) -E -P $$preproc > $@ && rm $$preproc)
 ghash-parisc.s:        asm/ghash-parisc.pl
        $(PERL) asm/ghash-parisc.pl $(PERLASM_SCHEME) $@
 ghashv8-armx.S:        asm/ghashv8-armx.pl
        $(PERL) asm/ghashv8-armx.pl $(PERLASM_SCHEME) $@
+ghashp8-ppc.s: asm/ghashp8-ppc.pl
+       $(PERL) asm/ghashp8-ppc.pl $(PERLASM_SCHEME) $@
 
 # GNU make "catch all"
 ghash-%.S:     asm/ghash-%.pl; $(PERL) $< $(PERLASM_SCHEME) $@
@@ -72,19 +70,6 @@ ghashv8-armx.o:      ghashv8-armx.S
 files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-       @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-       @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-       @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-       @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-       @headerlist="$(EXHEADER)"; for i in $$headerlist; \
-       do  \
-       (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-       done;
-
 tags:
        ctags $(SRC)
 
@@ -93,6 +78,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
@@ -136,6 +123,11 @@ gcm128.o: ../../include/openssl/modes.h ../../include/openssl/opensslconf.h
 gcm128.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 gcm128.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 gcm128.o: ../../include/openssl/symhacks.h gcm128.c modes_lcl.h
+ocb128.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+ocb128.o: ../../include/openssl/modes.h ../../include/openssl/opensslconf.h
+ocb128.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ocb128.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ocb128.o: ../../include/openssl/symhacks.h modes_lcl.h ocb128.c
 ofb128.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 ofb128.o: ../../include/openssl/modes.h ../../include/openssl/opensslconf.h
 ofb128.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
@@ -148,7 +140,7 @@ wrap128.o: ../../include/openssl/lhash.h ../../include/openssl/modes.h
 wrap128.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 wrap128.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 wrap128.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-wrap128.o: ../cryptlib.h wrap128.c
+wrap128.o: ../include/internal/cryptlib.h wrap128.c
 xts128.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 xts128.o: ../../include/openssl/modes.h ../../include/openssl/opensslconf.h
 xts128.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h