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
This commit is contained in:
Walter Wong 2001-09-07 04:38:19 +00:00 committed by Derrick Brashear
parent 653b001612
commit 7abae22b93
3 changed files with 15 additions and 13 deletions

View File

@ -88,6 +88,8 @@ $(AFSRM_EXEFILE): $(AFSRM_EXEOBJS) $(AFSRM_EXELIBS)
install : $(INSTALL_UTILS_DLLFILE) $(SERVER_UNINST_DLLFILE) $(CLIENT_UNINST_DLLFILE) \ install : $(INSTALL_UTILS_DLLFILE) $(SERVER_UNINST_DLLFILE) $(CLIENT_UNINST_DLLFILE) \
$(CC_UNINST_DLLFILE) $(LIGHT_CLIENT_UNINST_DLLFILE) $(DOCS_UNINST_DLLFILE) \ $(CC_UNINST_DLLFILE) $(LIGHT_CLIENT_UNINST_DLLFILE) $(DOCS_UNINST_DLLFILE) \
media : install
$(AFSRM_EXEFILE) lang $(AFSRM_EXEFILE) lang
cd _isuser cd _isuser
nmake -fntmakefile install nmake -fntmakefile install

View File

@ -23,6 +23,7 @@ INCFILES =\
$(INCFILEDIR)\afs_args.h \ $(INCFILEDIR)\afs_args.h \
$(INCFILEDIR)\debug.h \ $(INCFILEDIR)\debug.h \
$(INCFILEDIR)\param.h \ $(INCFILEDIR)\param.h \
$(INCFILEDIR)\afsconfig.h \
$(INCFILEDIR)\afs_sysnames.h \ $(INCFILEDIR)\afs_sysnames.h \
$(INCFILEDIR)\stds.h \ $(INCFILEDIR)\stds.h \
$(INCFILEDIR)\icl.h $(INCFILEDIR)\icl.h
@ -31,6 +32,9 @@ INCFILES =\
$(INCFILEDIR)\param.h: param.$(SYS_NAME).h $(INCFILEDIR)\param.h: param.$(SYS_NAME).h
$(COPY) $? $@ $(COPY) $? $@
$(INCFILEDIR)\afsconfig.h: afsconfig-windows.h
$(COPY) $? $@
idirs: doclink idirs: doclink
! IF (!EXIST($(DESTDIR))) ! IF (!EXIST($(DESTDIR)))
$(MKDIR) $(DESTDIR) $(MKDIR) $(DESTDIR)

View File

@ -56,7 +56,7 @@ LIBOBJS = \
weak_key.obj \ weak_key.obj \
read_pssword.obj \ read_pssword.obj \
strng_to_key.obj \ strng_to_key.obj \
misco.obj \ misc.obj \
util.obj \ util.obj \
crypt.obj crypt.obj
@ -65,10 +65,6 @@ LIBFILE = $(DESTDIR)\lib\afsdes.lib
$(LIBFILE): $(LIBOBJS) $(LIBFILE): $(LIBOBJS)
$(LIBARCH) $(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 ### # Generator Files ###
##################### #####################
@ -113,28 +109,28 @@ ip.c: make_ip.exe
# Make generators. # Make generators.
misc.obj: AFS_component_version_number.c 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) $(EXECONLINK)
make_p_table.exe: make_p_table.obj misc.obj make_p_table.exe: make_p_table.obj misc.obj main.obj
$(EXECONLINK) $(EXECONLINK)
make_s_table.exe: make_s_table.obj misc.obj make_s_table.exe: make_s_table.obj misc.obj main.obj
$(EXECONLINK) $(EXECONLINK)
make_odd.exe: make_odd.obj misc.obj make_odd.exe: make_odd.obj misc.obj main.obj
$(EXECONLINK) $(EXECONLINK)
make_p.exe: make_p.obj misc.obj make_p.exe: make_p.obj misc.obj main.obj
$(EXECONLINK) $(EXECONLINK)
make_s.exe: make_s.obj misc.obj make_s.exe: make_s.obj misc.obj main.obj
$(EXECONLINK) $(EXECONLINK)
make_fp.exe: make_fp.obj misc.obj make_fp.exe: make_fp.obj misc.obj main.obj
$(EXECONLINK) $(EXECONLINK)
make_ip.exe: make_ip.obj misc.obj make_ip.exe: make_ip.obj misc.obj main.obj
$(EXECONLINK) $(EXECONLINK)
install: $(GENERATED_FILES) $(LIBFILE) $(INCFILES) install: $(GENERATED_FILES) $(LIBFILE) $(INCFILES)