RT3497: Clean up "dclean" targets

[openssl.git] / crypto / Makefile

diff --git a/crypto/Makefile b/crypto/Makefile
index 874495793ff08cdd584553cc859fd828e849052e..6a6ac32dbb8b313aaff7eecca9a00edc5cdc5683 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -7,7 +7,7 @@ TOP=            ..
 CC=            cc
 INCLUDE=       -I. -I$(TOP) -I../include $(ZLIB_INCLUDE)
 # INCLUDES targets sudbirs!
-INCLUDES=      -I.. -I../.. -I../modes -I../asn1 -I../evp -I../../include $(ZLIB_INCLUDE)
+INCLUDES=      -I.. -I../.. -I../modes -I../asn1 -I../evp -I../include -I../../include $(ZLIB_INCLUDE)
 CFLAG=         -g
 MAKEDEPPROG=   makedepend
 MAKEDEPEND=    $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
@@ -46,7 +46,8 @@ 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_str.h o_dir.h $(EXHEADER)
+HEADER=        cryptlib.h buildinf.h md32_common.h o_str.h o_dir.h \
+       constant_time_locl.h $(EXHEADER)
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -87,9 +88,9 @@ 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
-       (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
+       (preproc=$$$$.$@.S; trap "rm $$preproc" INT; \
        $(PERL) alphacpuid.pl > $$preproc && \
-       $(CC) -E $$preproc > $@ && rm $$preproc)
+       $(CC) -E -P $$preproc > $@ && rm $$preproc)
 
 subdirs:
        @target=all; $(RECURSIVE_MAKE)
@@ -108,7 +109,7 @@ links:
 lib:   $(LIB)
        @touch lib
 $(LIB):        $(LIBOBJ)
-       $(ARX) $(LIB) $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
 
 shared: buildinf.h lib subdirs
@@ -140,12 +141,12 @@ depend:
 
 clean:
        rm -f buildinf.h *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+       rm -f opensslconf.h
        @target=clean; $(RECURSIVE_MAKE)
 
 dclean:
        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
        mv -f Makefile.new $(MAKEFILE)
-       rm -f opensslconf.h
        @target=dclean; $(RECURSIVE_MAKE)
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.