Change the command line options of mkerr.pl so -static is now default and

[openssl.git] / crypto / conf / Makefile.ssl

diff --git a/crypto/conf/Makefile.ssl b/crypto/conf/Makefile.ssl
index 3a209b562307cdd21cc2dcdc6a31e49707894965..38113fbf1aeab4bff4c866e57aacc415be51d124 100644 (file)
--- a/crypto/conf/Makefile.ssl
+++ b/crypto/conf/Makefile.ssl
@@ -15,16 +15,14 @@ AR=         ar r
 
 CFLAGS= $(INCLUDES) $(CFLAG)
 
-ERR=conf
-ERRC=conf_err
 GENERAL=Makefile
 TEST=
 APPS=
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC= conf.c $(ERRC).c
+LIBSRC= conf.c conf_err.c
 
-LIBOBJ=        conf.o $(ERRC).o
+LIBOBJ=        conf.o conf_err.o
 
 SRC= $(LIBSRC)
 
@@ -77,16 +75,12 @@ dclean:
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
-errors: $(ERRC).c
-
-$(ERRC).c: $(ERR).err
-       $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
-       $(PERL) ../err/err_genc.pl -s $(ERR).h $(ERRC).c
-
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-conf.o: ../../include/bio.h ../../include/buffer.h ../../include/e_os.h
-conf.o: ../../include/err.h ../../include/lhash.h ../../include/stack.h
-conf.o: ../cryptlib.h ../crypto.h ../opensslv.h conf.h conf_lcl.h
-conf_err.o: ../../include/err.h ../../include/lhash.h ../../include/stack.h
-conf_err.o: conf.h
+conf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+conf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+conf.o: ../../include/openssl/e_os.h ../../include/openssl/err.h
+conf.o: ../../include/openssl/lhash.h ../../include/openssl/opensslv.h
+conf.o: ../../include/openssl/stack.h ../cryptlib.h conf_lcl.h
+conf_err.o: ../../include/openssl/conf.h ../../include/openssl/err.h
+conf_err.o: ../../include/openssl/lhash.h ../../include/openssl/stack.h