X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=crypto%2Fui%2FMakefile;h=2a02136f4073b35e555313ba86f360a8d7df8579;hb=ffbf304d4832bd51bb0618f8ca5b7c26647ee664;hp=a31eb2d290daef68e3a4a6b9b144ede431b5800c;hpb=81a86fcf1729dea3c62db53af8890d701870c5ce;p=openssl.git

diff --git a/crypto/ui/Makefile b/crypto/ui/Makefile
index a31eb2d290..2a02136f40 100644
--- a/crypto/ui/Makefile
+++ b/crypto/ui/Makefile
@@ -7,29 +7,20 @@ TOP=	../..
 CC=	cc
 INCLUDES= -I.. -I$(TOP) -I../../include
 CFLAG=-g
-MAKEDEPPROG=	makedepend
-MAKEDEPEND=	$(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
 MAKEFILE=	Makefile
 AR=		ar r
 
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-#TEST= uitest.c
-TEST=
-APPS=
-
-COMPATSRC= ui_compat.c
-COMPATOBJ= ui_compat.o
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC= ui_err.c ui_lib.c ui_openssl.c ui_util.c $(COMPATSRC)
-LIBOBJ= ui_err.o ui_lib.o ui_openssl.o ui_util.o $(COMPATOBJ)
+LIBSRC= ui_err.c ui_lib.c ui_openssl.c ui_util.c
+LIBOBJ= ui_err.o ui_lib.o ui_openssl.o ui_util.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= ui.h ui_compat.h
-HEADER=	$(EXHEADER) ui_locl.h
+HEADER=	ui_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -46,19 +37,6 @@ lib:	$(LIBOBJ)
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
-
-install:
-	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
-	do  \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-
 tags:
 	ctags $(SRC)
 
@@ -67,7 +45,10 @@ tests:
 lint:
 	lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
+	@[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
 	$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 dclean:
@@ -79,10 +60,6 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-ui_compat.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-ui_compat.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-ui_compat.o: ../../include/openssl/stack.h ../../include/openssl/ui.h
-ui_compat.o: ../../include/openssl/ui_compat.h ui_compat.c
 ui_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
 ui_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 ui_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
@@ -96,7 +73,7 @@ ui_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 ui_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 ui_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 ui_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-ui_lib.o: ../cryptlib.h ui_lib.c ui_locl.h
+ui_lib.o: ../include/internal/cryptlib.h ui_lib.c ui_locl.h
 ui_openssl.o: ../../e_os.h ../../include/openssl/bio.h
 ui_openssl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 ui_openssl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
@@ -104,7 +81,7 @@ ui_openssl.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 ui_openssl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 ui_openssl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 ui_openssl.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-ui_openssl.o: ../cryptlib.h ui_locl.h ui_openssl.c
+ui_openssl.o: ../include/internal/cryptlib.h ui_locl.h ui_openssl.c
 ui_util.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 ui_util.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 ui_util.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h