From 7abae22b939796acdde6f8e83c0e1ed9f5c9b799 Mon Sep 17 00:00:00 2001
From: Walter Wong <wcw@cmu.edu>
Date: Fri, 7 Sep 2001 04:38:19 +0000
Subject: [PATCH] winnt-more-makefile-fixes-for-cvs-head-20010906

take care of some places where we got out of sync between unix and windows,
add media target in afs_setup_utils
---
 src/WINNT/afs_setup_utils/NTMakefile |  2 ++
 src/config/NTMakefile                |  4 ++++
 src/des/NTMakefile                   | 22 +++++++++-------------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/WINNT/afs_setup_utils/NTMakefile b/src/WINNT/afs_setup_utils/NTMakefile
index 0d03963892..8ac4df935b 100644
--- a/src/WINNT/afs_setup_utils/NTMakefile
+++ b/src/WINNT/afs_setup_utils/NTMakefile
@@ -88,6 +88,8 @@ $(AFSRM_EXEFILE): $(AFSRM_EXEOBJS) $(AFSRM_EXELIBS)
 
 install : $(INSTALL_UTILS_DLLFILE) $(SERVER_UNINST_DLLFILE) $(CLIENT_UNINST_DLLFILE) \
           $(CC_UNINST_DLLFILE) $(LIGHT_CLIENT_UNINST_DLLFILE) $(DOCS_UNINST_DLLFILE) \
+
+media : install
           $(AFSRM_EXEFILE) lang
 		  cd _isuser
 		  nmake -fntmakefile install
diff --git a/src/config/NTMakefile b/src/config/NTMakefile
index 65667c7d10..311f97acad 100644
--- a/src/config/NTMakefile
+++ b/src/config/NTMakefile
@@ -23,6 +23,7 @@ INCFILES =\
 	$(INCFILEDIR)\afs_args.h \
 	$(INCFILEDIR)\debug.h \
 	$(INCFILEDIR)\param.h \
+	$(INCFILEDIR)\afsconfig.h \
 	$(INCFILEDIR)\afs_sysnames.h \
 	$(INCFILEDIR)\stds.h \
 	$(INCFILEDIR)\icl.h 
@@ -31,6 +32,9 @@ INCFILES =\
 $(INCFILEDIR)\param.h: param.$(SYS_NAME).h
 	$(COPY) $? $@
 
+$(INCFILEDIR)\afsconfig.h: afsconfig-windows.h
+	$(COPY) $? $@
+
 idirs: doclink
 !	IF (!EXIST($(DESTDIR)))
 		$(MKDIR) $(DESTDIR)
diff --git a/src/des/NTMakefile b/src/des/NTMakefile
index ee9e41e705..1f15d978b2 100644
--- a/src/des/NTMakefile
+++ b/src/des/NTMakefile
@@ -56,7 +56,7 @@ LIBOBJS = \
 	weak_key.obj \
 	read_pssword.obj \
 	strng_to_key.obj \
-	misco.obj \
+	misc.obj \
 	util.obj \
 	crypt.obj
 
@@ -65,10 +65,6 @@ LIBFILE = $(DESTDIR)\lib\afsdes.lib
 $(LIBFILE): $(LIBOBJS)
 	$(LIBARCH)
 
-# Special case, since misc.c includes a "main" for the table generators.
-misco.obj: misc.c
-	$(C2OBJ) misc.c /Fomisco.obj -DDONT_INCL_MAIN
-
 #####################
 # Generator Files ###
 #####################
@@ -113,28 +109,28 @@ ip.c: make_ip.exe
 # Make generators.
 misc.obj: AFS_component_version_number.c
 
-make_keyperm.exe: make_keyperm.obj misc.obj
+make_keyperm.exe: make_keyperm.obj misc.obj main.obj
 	$(EXECONLINK)
 
-make_p_table.exe: make_p_table.obj misc.obj
+make_p_table.exe: make_p_table.obj misc.obj main.obj
 	$(EXECONLINK)
 
-make_s_table.exe: make_s_table.obj misc.obj
+make_s_table.exe: make_s_table.obj misc.obj main.obj
 	$(EXECONLINK)
 
-make_odd.exe: make_odd.obj misc.obj
+make_odd.exe: make_odd.obj misc.obj main.obj
 	$(EXECONLINK)
 
-make_p.exe: make_p.obj misc.obj
+make_p.exe: make_p.obj misc.obj main.obj
 	$(EXECONLINK)
 
-make_s.exe: make_s.obj misc.obj
+make_s.exe: make_s.obj misc.obj main.obj
 	$(EXECONLINK)
 
-make_fp.exe: make_fp.obj misc.obj
+make_fp.exe: make_fp.obj misc.obj main.obj
 	$(EXECONLINK)
 
-make_ip.exe: make_ip.obj misc.obj
+make_ip.exe: make_ip.obj misc.obj main.obj
 	$(EXECONLINK)
 
 install: $(GENERATED_FILES) $(LIBFILE) $(INCFILES)