Move gmtime functions to crypto.h.

[openssl.git] / crypto / Makefile

diff --git a/crypto/Makefile b/crypto/Makefile
index 1a882f02e9bd2591cc83b0f2872cfb9dc49b98b5..77b3921362ef5ca44b2e3432b4db3a2bf37aaf4f 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -45,7 +45,7 @@ SRC= $(LIBSRC)
 
 EXHEADER= crypto.h opensslv.h opensslconf.h ebcdic.h symhacks.h \
        ossl_typ.h
-HEADER=        cryptlib.h buildinf.h md32_common.h o_time.h o_str.h o_dir.h $(EXHEADER)
+HEADER=        cryptlib.h buildinf.h md32_common.h o_str.h o_dir.h $(EXHEADER)
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -86,30 +86,15 @@ ia64cpuid.s:        ia64cpuid.S;    $(CC) $(CFLAGS) -E ia64cpuid.S > $@
 ppccpuid.s:    ppccpuid.pl;    $(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@
 pariscid.s:    pariscid.pl;    $(PERL) pariscid.pl $(PERLASM_SCHEME) $@
 alphacpuid.s:  alphacpuid.pl
-       $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
-
-o_init.o: o_init.c
-       case "`(uname -s) 2>/dev/null`" in \
-       OSF1|IRIX*)     _WL_INIT="-Wl,-init,OPENSSL_init"       ;; \
-       HP-UX)          _WL_INIT="-Wl,+init,OPENSSL_init"       ;; \
-       AIX)            _WL_INIT="-Wl,-binitfini:OPENSSL_init,-bnoobjreorder";; \
-       Darwin)         (   while [ "x$1" != "x" -a "x$1" != "x-dynamiclib" ]; do shift; done; \
-                           [ $# -ge 1 ] \
-                       ) && _WL_INIT="-Wl,-init,_OPENSSL_init" ;; \
-       esac ; \
-       $(CC) $(CFLAGS) $(_WL_INIT) -c -o $@ $<
-
-testapps:
-       [ -z "$(THIS)" ] || (   if expr " $(SDIRS) " : ".* des " >/dev/null; \
-                               then cd des && $(MAKE) -e des; fi )
-       [ -z "$(THIS)" ] || ( cd pkcs7 && $(MAKE) -e testapps );
-       @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+       (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
+       $(PERL) alphacpuid.pl > $$preproc && \
+       $(CC) -E $$preproc > $@ && rm $$preproc)
 
 subdirs:
        @target=all; $(RECURSIVE_MAKE)
 
 files:
-       $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+       $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
        @target=files; $(RECURSIVE_MAKE)
 
 links: