--- rsaref/install/dos/makefile	2018/04/24 16:37:52	1.1.1.1
+++ rsaref/install/dos/makefile	2018/04/24 16:38:24	1.1.1.2
@@ -6,43 +6,46 @@ O = obj
 # commands
 CC = cl
 LIB = lib
-ASM = masm
 
 # name of temporary library script
 TEMPFILE = $(TEMP)\temp.mak
 
-# standard include directory
-STDINCDIR = i:\msc6\include
-
 # The places to look for include files (in order).
-INCL =  -I. -I$(SRCDIR) -I$(STDINCDIR)
+INCL =  -I. -I$(RSAREFDIR)
 
 # Normal C flags.
-CFLAGS = -W3 -AL -Zp $(INCL) -c -DPROTOTYPES=1 -DUSEMPILIB
+CFLAGS = -Ox -W3 -AL $(INCL) -nologo -c
 LFLAGS = /stack:26000
 
 # Debugging C flags.
-#CFLAGS =  -W3 -AL -Zpi -Od $(INCL) -c -DPROTOTYPES=1
-#LFLAGS = /codeview /map /stack:26000
+# CFLAGS =  -W3 -AL -Zi -Od $(INCL) -nologo -c
+# LFLAGS = /codeview /map /stack:26000
  
 # The location of the common source directory.
-SRCDIR = ..\source\#
-SRCLIB = rsaref.lib
+RSAREFDIR = ..\source\#
+RSAREFLIB = rsaref.lib
 
 # The location of the demo source directory.
 RDEMODIR = ..\rdemo\#
 
-all : $(SRCLIB)
+all : rdemo.exe dhdemo.exe
 
-rdemo.exe : rdemo.$(O) $(SRCLIB)
-	link @<<temp.lnk
+rdemo.exe : rdemo.$(O) $(RSAREFLIB)
+	link @<<rdemo.lnk
 $(LFLAGS) rdemo.$(O)
+$@,NUL,
+$(RSAREFLIB);
+<<NOKEEP
+
+dhdemo.exe : dhdemo.$(O) $(RSAREFLIB)
+	link @<<dhdemo.lnk
+$(LFLAGS) dhdemo.$(O)
 $@,,
-$(SRCLIB);
+$(RSAREFLIB);
 <<NOKEEP
 
-$(SRCLIB) : desc.$(O) digit.$(O) md2c.$(O) nn.$(O) prime.$(O)\
-  rsa.$(O) r_encode.$(O) r_enhanc.$(O) r_keygen.$(O) r_random.$(O)\
+$(RSAREFLIB) : desc.$(O) digit.$(O) md2c.$(O) md5c.$(O) nn.$(O) prime.$(O)\
+  rsa.$(O) r_encode.$(O) r_dh.$(O) r_enhanc.$(O) r_keygen.$(O) r_random.$(O)\
   r_stdlib.$(O)
   @if NOT EXIST $@ $(LIB) $@;
   @echo $@ > $(TEMPFILE)
@@ -50,7 +53,10 @@ $(SRCLIB) : desc.$(O) digit.$(O) md2c.$(
   @echo ;' >> $(TEMPFILE)
   @$(LIB) @$(TEMPFILE)
 
-rdemo.$(O) : $(RDEMODIR)rdemo.c global.h $(SRCDIR)rsaref.h
+rdemo.$(O) : $(RDEMODIR)rdemo.c $(RSAREFDIR)global.h $(RSAREFDIR)rsaref.h
 	$(CC) $(CFLAGS) $(RDEMODIR)rdemo.c
 
-!INCLUDE $(SRCDIR)targets.mak
+dhdemo.$(O) : $(RDEMODIR)dhdemo.c $(RSAREFDIR)global.h $(RSAREFDIR)rsaref.h
+	$(CC) $(CFLAGS) $(RDEMODIR)dhdemo.c
+
+!INCLUDE $(RSAREFDIR)targets.mak