Fix potential memory leak in ASN1_TIME_to_generalizedtime()

[oweals/openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 76fdbdf6ac5c2a015a387e6671e4bc532ab188b9..f51f0a756c3e08fb5301cbe2bf31e503389879e2 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -66,6 +66,7 @@ EXE_EXT=
 ARFLAGS=
 AR=ar $(ARFLAGS) r
 RANLIB= ranlib
+RC= windres
 NM= nm
 PERL= perl
 TAR= tar
@@ -200,7 +201,8 @@ CLEARENV=   TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}     \
                $${ASFLAGS+ASFLAGS} $${AFLAGS+AFLAGS}           \
                $${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS} $${SCRIPTS+SCRIPTS} \
                $${SHAREDCMD+SHAREDCMD} $${SHAREDFLAGS+SHAREDFLAGS}     \
-               $${SHARED_LIB+SHARED_LIB} $${LIBEXTRAS+LIBEXTRAS}
+               $${SHARED_LIB+SHARED_LIB} $${LIBEXTRAS+LIBEXTRAS}       \
+               $${APPS+APPS}
 
 # LC_ALL=C ensures that error [and other] messages are delivered in
 # same language for uniform treatment.
@@ -208,6 +210,7 @@ BUILDENV=   LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\
                CC='$(CC)' CFLAG='$(CFLAG)'                     \
                AS='$(CC)' ASFLAG='$(CFLAG) -c'                 \
                AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'        \
+               RC='$(RC)'                                      \
                CROSS_COMPILE='$(CROSS_COMPILE)'        \
                PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'             \
                SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)'     \
@@ -366,6 +369,7 @@ libcrypto.pc: Makefile
            echo 'exec_prefix=$${prefix}'; \
            echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
            echo 'includedir=$${prefix}/include'; \
+           echo 'enginesdir=$${libdir}/engines'; \
            echo ''; \
            echo 'Name: OpenSSL-libcrypto'; \
            echo 'Description: OpenSSL cryptography library'; \
@@ -420,6 +424,14 @@ clean:     libclean
        rm -fr $$i/*; \
        done
 
+distclean: clean
+       -$(RM) `find . -name .git -prune -o -type l -print`
+       $(RM) apps/CA.pl
+       $(RM) test/evptests.txt test/newkey.pem test/testkey.pem test/testreq.pem
+       $(RM) tools/c_rehash
+       $(RM) crypto/opensslconf.h
+       $(RM) Makefile Makefile.bak
+
 makefile.one: files
        $(PERL) util/mk1mf.pl >makefile.one; \
        sh util/do_ms.sh