X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fobjects%2FMakefile.ssl;h=2397287f1161d9dcbf245e8d48f248b7b6dd842b;hp=320523cea1334d0134eda4656c3ded33257baaa6;hb=99aab1619f02b184f140150c72276bf55716cc42;hpb=7dfb0b774e6592dcbfe47015168a0ac8b44e2a17

diff --git a/crypto/objects/Makefile.ssl b/crypto/objects/Makefile.ssl
index 320523cea1..2397287f11 100644
--- a/crypto/objects/Makefile.ssl
+++ b/crypto/objects/Makefile.ssl
@@ -9,7 +9,7 @@ INCLUDES= -I.. -I../../include
 CFLAG=-g
 INSTALLTOP=/usr/local/ssl
 MAKE=		make -f Makefile.ssl
-MAKEDEPEND=	makedepend -f Makefile.ssl
+MAKEDEPEND=	$(TOP)/util/domd $(TOP)
 MAKEFILE=	Makefile.ssl
 AR=		ar r
 
@@ -22,8 +22,8 @@ TEST=
 APPS=
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC=	obj_dat.c obj_lib.c $(ERRC).c
-LIBOBJ= obj_dat.o obj_lib.o $(ERRC).o
+LIBSRC=	o_names.c obj_dat.c obj_lib.c $(ERRC).c
+LIBOBJ= o_names.o obj_dat.o obj_lib.o $(ERRC).o
 
 SRC= $(LIBSRC)
 
@@ -38,22 +38,21 @@ top:
 all:	obj_dat.h lib
 
 obj_dat.h: objects.h obj_dat.pl
-	perl ./obj_dat.pl < objects.h > obj_dat.h
+	$(PERL) ./obj_dat.pl < objects.h > obj_dat.h
 
 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 $(EXHEADER)
+	@$(TOP)/util/mklink.sh ../../test $(TEST)
+	@$(TOP)/util/mklink.sh ../../apps $(APPS)
 
 install:
 	@for i in $(EXHEADER) ; \
@@ -74,14 +73,31 @@ 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
+	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
-errors:
-	perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
-	perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c
+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.
+
+o_names.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
+o_names.o: ../../include/crypto.h ../../include/lhash.h
+o_names.o: ../../include/opensslv.h ../../include/stack.h objects.h
+obj_dat.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
+obj_dat.o: ../../include/buffer.h ../../include/crypto.h ../../include/e_os.h
+obj_dat.o: ../../include/err.h ../../include/lhash.h ../../include/opensslv.h
+obj_dat.o: ../../include/stack.h ../cryptlib.h obj_dat.h objects.h
+obj_err.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
+obj_err.o: ../../include/crypto.h ../../include/err.h ../../include/opensslv.h
+obj_err.o: ../../include/stack.h objects.h
+obj_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/bn.h
+obj_lib.o: ../../include/buffer.h ../../include/crypto.h ../../include/e_os.h
+obj_lib.o: ../../include/err.h ../../include/lhash.h ../../include/opensslv.h
+obj_lib.o: ../../include/stack.h ../cryptlib.h objects.h