win32 and msdos recover

Since the ports have SELF_RECOVER defined,
remove the build of recover.exe from the default steps.
You must explicitly use 'make recover' now.

diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC
index 5f59cf11fa5cead082bc8938137e171edbecbfb7..b8eb15dcf2820d4dc567e7f06c8d2cc01b27d797 100644 (file)
--- a/sys/msdos/Makefile.GCC
+++ b/sys/msdos/Makefile.GCC
@@ -380,11 +380,6 @@ DJ1 = $(dir $(DJGPP))
 CWSDPMI = $(subst /,\,$(DJ1))bin\CWSDPMI.*
 endif
 
-ifdef BUILDRECOVER
-RECOVEREXE = $(U)RECOVER.EXE
-RECOVEROBJ = $(O)RECOVER.O
-endif
-
 #==========================================
 #  Primary Targets.
 #==========================================
@@ -402,12 +397,16 @@ util: $(O)utility.tag
 
 $(O)utility.tag: $(INCL)/date.h $(INCL)/trap.h    $(INCL)/onames.h            \
        $(INCL)/pm.h      monstr.c   vis_tab.c  \
-       $(U)lev_comp.exe $(U)dgn_comp.exe $(RECOVEREXE) $(TILEUTIL)
+       $(U)lev_comp.exe $(U)dgn_comp.exe $(TILEUTIL)
        $(subst /,\,echo utilities made > $@)
 
 tileutil: $(U)gif2txt.exe $(U)txt2ppm.exe
        @echo Optional tile development utilities are up to date.
 
+recover: $(U)recover.exe
+       @$(subst /,\,if exist $(U)recover.exe copy $(U)recover.exe $(GAMEDIR))
+       @$(subst /,\,if exist $(DOC)/recover.txt copy $(DOC)/recover.txt $(GAMEDIR))
+
 $(O)install.tag: $(O)dat.tag $(GAMEFILE)
 ifeq ($(USE_DLB),Y)
        @$(subst /,\,copy $(DAT)/nhdat $(GAMEDIR))
@@ -425,13 +424,7 @@ endif
        @$(subst /,\,if exist $(DAT)/*.tib copy $(DAT)/*.tib $(GAMEDIR))
        @$(subst /,\,copy $(SSHR)/NetHack.cnf  $(GAMEDIR)/defaults.nh)
        @$(subst /,\,copy $(MSYS)/NHAccess.nh  $(GAMEDIR))
-ifdef BUILDRECOVER
-       @$(subst /,\,copy $(RECOVEREXE)      $(GAMEDIR))
-endif
        @$(subst /,\,copy $(DOC)/guidebo*.txt  $(GAMEDIR))
-ifdef BUILDRECOVER
-       @$(subst /,\,if exist $(DOC)/recover.txt copy $(DOC)/recover.txt $(GAMEDIR))
-endif
        @$(subst /,\,if exist $(DOC)/nethack.txt copy $(DOC)/nethack.txt $(GAMEDIR))
 ifdef CWSDPMI
        @$(subst /,\,if exist $(CWSDPMI) copy $(CWSDPMI) $(GAMEDIR))
@@ -504,9 +497,7 @@ spotless: clean
        $(subst /,\,if exist $(U)makedefs.exe del $(U)makedefs.exe)
        $(subst /,\,if exist $(U)lev_comp.exe del $(U)lev_comp.exe)
        $(subst /,\,if exist $(U)dgn_comp.exe del $(U)dgn_comp.exe)
-ifdef BUILDRECOVER
-       $(subst /,\,if exist $(RECOVEREXE) del $(RECOVEREXE))
-endif
+       $(subst /,\,if exist $(U)recover.exe del $(U)recover.exe)
        $(subst /,\,if exist $(U)tilemap.exe del $(U)tilemap.exe)
        $(subst /,\,if exist $(U)tile2bin.exe del $(U)tile2bin.exe)
        $(subst /,\,if exist $(U)til2bin2.exe del $(U)til2bin2.exe)
@@ -716,13 +707,11 @@ endif
 #  Recover Utility
 #==========================================
 
-ifdef BUILDRECOVER
 $(U)recover.exe:   $(RECOVOBJS)
        $(LINK) $(LFLAGS) -o$@ $(O)recover.o
 
 $(O)recover.o:   $(CONFIG_H) $(U)recover.c
        $(CC) $(cflags) -o$@ $(U)recover.c
-endif
 
 #==========================================
 #  Header file moves required for tile support

diff --git a/sys/winnt/Makefile.bcc b/sys/winnt/Makefile.bcc
index a805b4b3b8dd9f77f037948f22db35284cecd9c0..6f71b43d35fac51792235476ece9e5d73c8200fd 100644 (file)
--- a/sys/winnt/Makefile.bcc
+++ b/sys/winnt/Makefile.bcc
@@ -525,15 +525,17 @@ $(O)install.tag:  $(DAT)\data     $(DAT)\rumors    $(DAT)\dungeon \
 ! ENDIF
        if exist $(DOC)\guidebook.txt copy $(DOC)\guidebook.txt $(GAMEDIR)\Guidebook.txt
        if exist $(DOC)\nethack.txt copy $(DOC)\nethack.txt $(GAMEDIR)\NetHack.txt
-       if exist $(DOC)\recover.txt copy $(DOC)\recover.txt $(GAMEDIR)\recover.txt
        @if exist $(SRC)\$(GAME).PDB copy $(SRC)\$(GAME).pdb $(GAMEDIR)\$(GAME).pdb
        @if exist $(GAMEDIR)\$(GAME).PDB echo NOTE: You may want to remove $(GAMEDIR)\$(GAME).pdb to conserve space
        -copy $(NTSYS)\defaults.nh   $(GAMEDIR)\defaults.nh
-       copy $(U)recover.exe  $(GAMEDIR)
        echo install done > $@
 
 #      copy $(NTSYS)\winnt.hlp    $(GAMEDIR)
 
+recover: $(U)recover.exe
+       if exist $(U)recover.exe copy $(U)recover.exe  $(GAMEDIR)
+       if exist $(DOC)\recover.txt copy $(DOC)\recover.txt $(GAMEDIR)\recover.txt
+
 $(O)sp_lev.tag: $(O)utility.tag $(DAT)\bigroom.des  $(DAT)\castle.des \
        $(DAT)\endgame.des $(DAT)\gehennom.des $(DAT)\knox.des   \
        $(DAT)\medusa.des  $(DAT)\oracle.des   $(DAT)\tower.des  \
@@ -573,7 +575,7 @@ $(O)sp_lev.tag: $(O)utility.tag $(DAT)\bigroom.des  $(DAT)\castle.des \
 $(O)utility.tag: $(INCL)\date.h $(INCL)\onames.h $(INCL)\pm.h \
                $(SRC)\monstr.c         $(SRC)\vis_tab.c  \
                $(U)lev_comp.exe        $(INCL)\vis_tab.h \
-               $(U)dgn_comp.exe $(U)recover.exe  $(TILEUTIL16)
+               $(U)dgn_comp.exe $(TILEUTIL16)
              @echo utilities made >$@
             @echo utilities made.
 
@@ -894,11 +896,11 @@ nhdat:    $(U)dlb_main.exe $(DAT)\data $(DAT)\oracles $(OPTIONS_FILE) \
 #==========================================
 
 $(U)recover.exe: $(RECOVOBJS) $(SRC)\uuid.lib
-       @$(link) $(LFLAGSU) $(startobj) $(RECOVOBJS), $@,,$(libsmt)
+       $(link) $(LFLAGSU) $(startobj) $(RECOVOBJS), $@,,$(libsmt)
 
 
 $(O)recover.o: $(CONFIG_H) $(U)recover.c $(INCL)\win32api.h
-       @$(cc) $(CFLAGSU) -o$@ $(U)recover.c
+       $(cc) $(CFLAGSU) -o$@ $(U)recover.c
 
 #==========================================
 #  Tile Mapping

diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc
index 600d4e0fddf143a6567049a4392513a3582ecc00..bd610c146075198ecc923276e5c97b959e6df073 100644 (file)
--- a/sys/winnt/Makefile.gcc
+++ b/sys/winnt/Makefile.gcc
@@ -506,15 +506,17 @@ else
 endif
        $(subst /,\,if exist $(DOC)/guidebook.txt copy $(DOC)/guidebook.txt $(GAMEDIR)/Guidebook.txt)
        $(subst /,\,if exist $(DOC)/nethack.txt copy $(DOC)/nethack.txt $(GAMEDIR)/NetHack.txt)
-       $(subst /,\,if exist $(DOC)/recover.txt copy $(DOC)/recover.txt $(GAMEDIR)/recover.txt)
        $(subst /,\,@if exist $(SRC)/$(GAME).PDB copy $(SRC)/$(GAME).pdb $(GAMEDIR)/$(GAME).pdb)
        $(subst /,\,@if exist $(GAMEDIR)/$(GAME).PDB echo NOTE: You may want to remove $(GAMEDIR)/$(GAME).pdb to conserve space)
        $(subst /,\,-copy $(NTSYS)/defaults.nh   $(GAMEDIR)/defaults.nh)
-       $(subst /,\,copy $(U)recover.exe  $(GAMEDIR))
        $(subst /,\,echo install done > $@)
 
 #  copy $(NTSYS)/winnt.hlp    $(GAMEDIR)
 
+recover: $(U)recover.exe
+       $(subst /,\,if exist $(U)recover.exe copy $(U)recover.exe  $(GAMEDIR))
+       $(subst /,\,if exist $(DOC)/recover.txt copy $(DOC)/recover.txt $(GAMEDIR)/recover.txt)
+
 $(O)sp_lev.tag: $(O)utility.tag $(DAT)/bigroom.des  $(DAT)/castle.des \
    $(DAT)/endgame.des $(DAT)/gehennom.des $(DAT)/knox.des   \
    $(DAT)/medusa.des  $(DAT)/oracle.des   $(DAT)/tower.des  \
@@ -554,7 +556,7 @@ $(O)sp_lev.tag: $(O)utility.tag $(DAT)/bigroom.des  $(DAT)/castle.des \
 $(O)utility.tag: $(INCL)/date.h $(INCL)/onames.h $(INCL)/pm.h \
        $(SRC)/monstr.c          $(SRC)/vis_tab.c  \
        $(U)lev_comp.exe    $(INCL)/vis_tab.h \
-       $(U)dgn_comp.exe $(U)recover.exe  $(TILEUTIL16)
+       $(U)dgn_comp.exe $(TILEUTIL16)
        $(subst /,\,@echo utilities made >$@)
        @echo utilities made.
 
@@ -875,11 +877,10 @@ nhdat:  $(U)dlb_main.exe $(DAT)/data $(DAT)/oracles $(OPTIONS_FILE) \
 #==========================================
 
 $(U)recover.exe: $(RECOVOBJS)
-       @$(link) $(LFLAGSU) -o$@ $(RECOVOBJS)
-
+       $(link) $(LFLAGSU) -o$@ $(RECOVOBJS)
 
 $(O)recover.o: $(CONFIG_H) $(U)recover.c $(INCL)/win32api.h
-       @$(cc) $(CFLAGSU) -o$@ $(U)recover.c
+       $(cc) $(CFLAGSU) -o$@ $(U)recover.c
 
 #==========================================
 #  Tile Mapping

diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc
index 09d5ec20253d8777f91122046837611358a5d838..0b7bcb14fb18e5e1c3cd39bd0b7d3b6db6985bdd 100644 (file)
--- a/sys/winnt/Makefile.msc
+++ b/sys/winnt/Makefile.msc
@@ -477,15 +477,17 @@ $(O)install.tag:  $(DAT)\data     $(DAT)\rumors    $(DAT)\dungeon \
 ! ENDIF
        if exist $(DOC)\guidebook.txt copy $(DOC)\guidebook.txt $(GAMEDIR)\Guidebook.txt
        if exist $(DOC)\nethack.txt copy $(DOC)\nethack.txt $(GAMEDIR)\NetHack.txt
-       if exist $(DOC)\recover.txt copy $(DOC)\recover.txt $(GAMEDIR)\recover.txt
        @if exist $(SRC)\$(GAME).PDB copy $(SRC)\$(GAME).pdb $(GAMEDIR)\$(GAME).pdb
        @if exist $(GAMEDIR)\$(GAME).PDB echo NOTE: You may want to remove $(GAMEDIR)\$(GAME).pdb to conserve space
        -copy $(NTSYS)\defaults.nh   $(GAMEDIR)\defaults.nh
-       copy $(U)recover.exe  $(GAMEDIR)
        echo install done > $@
 
 #      copy $(NTSYS)\winnt.hlp    $(GAMEDIR)
 
+recover: $(U)recover.exe
+       if exist $(U)recover.exe copy $(U)recover.exe  $(GAMEDIR)
+       if exist $(DOC)\recover.txt copy $(DOC)\recover.txt $(GAMEDIR)\recover.txt
+
 $(O)sp_lev.tag: $(O)utility.tag $(DAT)\bigroom.des  $(DAT)\castle.des \
        $(DAT)\endgame.des $(DAT)\gehennom.des $(DAT)\knox.des   \
        $(DAT)\medusa.des  $(DAT)\oracle.des   $(DAT)\tower.des  \
@@ -525,7 +527,7 @@ $(O)sp_lev.tag: $(O)utility.tag $(DAT)\bigroom.des  $(DAT)\castle.des \
 $(O)utility.tag: $(INCL)\date.h $(INCL)\onames.h $(INCL)\pm.h \
                $(SRC)\monstr.c         $(SRC)\vis_tab.c  \
                $(U)lev_comp.exe        $(INCL)\vis_tab.h \
-               $(U)dgn_comp.exe $(U)recover.exe
+               $(U)dgn_comp.exe
              @echo utilities made >$@
             @echo utilities made.
 
@@ -884,10 +886,10 @@ nhdat:    $(U)dlb_main.exe $(DAT)\data $(DAT)\oracles $(OPTIONS_FILE) \
 #==========================================
 
 $(U)recover.exe: $(RECOVOBJS)
-       @$(link) $(LFLAGSU) -out:$@ $(RECOVOBJS)
+       $(link) $(LFLAGSU) -out:$@ $(RECOVOBJS)
 
 $(O)recover.o: $(CONFIG_H) $(U)recover.c $(INCL)\win32api.h
-       @$(CC) $(CFLAGSU) -Fo$@ $(U)recover.c
+       $(CC) $(CFLAGSU) -Fo$@ $(U)recover.c
 
 #==========================================
 #  Tile Mapping