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

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

diff --git a/crypto/buffer/Makefile.ssl b/crypto/buffer/Makefile.ssl
index 8f7eb449b2b8e3b165283885cc3dab7bfe0dae51..6580766a705cacb708a0275432b0691dcb622144 100644 (file)
--- a/crypto/buffer/Makefile.ssl
+++ b/crypto/buffer/Makefile.ssl
@@ -15,15 +15,13 @@ AR=         ar r
 
 CFLAGS= $(INCLUDES) $(CFLAG)
 
-ERR=buffer
-ERRC=buf_err
 GENERAL=Makefile
 TEST=
 APPS=
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC= buffer.c $(ERRC).c
-LIBOBJ= buffer.o $(ERRC).o
+LIBSRC= buffer.c buf_err.c
+LIBOBJ= buffer.o buf_err.o
 
 SRC= $(LIBSRC)
 
@@ -39,24 +37,23 @@ all:        lib
 
 lib:   $(LIBOBJ)
        $(AR) $(LIB) $(LIBOBJ)
-       sh $(TOP)/util/ranlib.sh $(LIB)
+       $(RANLIB) $(LIB)
        @touch lib
 
 files:
-       perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+       $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
 
 links:
-       /bin/rm -f Makefile
-       $(TOP)/util/point.sh Makefile.ssl Makefile;
-       $(TOP)/util/mklink.sh ../../include $(EXHEADER)
-       $(TOP)/util/mklink.sh ../../test $(TEST)
-       $(TOP)/util/mklink.sh ../../apps $(APPS)
+       @$(TOP)/util/point.sh Makefile.ssl Makefile
+       @$(TOP)/util/mklink.sh ../../include/openssl $(EXHEADER)
+       @$(TOP)/util/mklink.sh ../../test $(TEST)
+       @$(TOP)/util/mklink.sh ../../apps $(APPS)
 
 install:
        @for i in $(EXHEADER) ; \
        do  \
-       (cp $$i $(INSTALLTOP)/include/$$i; \
-       chmod 644 $(INSTALLTOP)/include/$$i ); \
+       (cp $$i $(INSTALLTOP)/include/openssl/$$i; \
+       chmod 644 $(INSTALLTOP)/include/openssl/$$i ); \
        done;
 
 tags:
@@ -71,20 +68,16 @@ depend:
        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
 
 dclean:
-       perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+       $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
        mv -f Makefile.new $(MAKEFILE)
 
 clean:
-       /bin/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
+       rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-buf_err.o: ../../include/err.h buffer.h
-buffer.o: ../../include/bio.h ../../include/e_os.h ../../include/err.h
-buffer.o: ../../include/stack.h ../cryptlib.h ../crypto.h buffer.h
+buf_err.o: ../../include/openssl/buffer.h ../../include/openssl/err.h
+buffer.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+buffer.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+buffer.o: ../../include/openssl/err.h ../../include/openssl/opensslv.h
+buffer.o: ../../include/openssl/stack.h ../cryptlib.h