Makefile fix following depend. changes

This commit is contained in:
nethack.allison
2002-03-10 13:31:51 +00:00
parent 2e6f957afe
commit 62ea5a9345
4 changed files with 411 additions and 408 deletions
+3 -3
View File
@@ -172,9 +172,9 @@ vmsmisc.c vmstty.c vmsunix.c
sys/winnt: sys/winnt:
(files for Windows 9x, NT and Windows2000 version) (files for Windows 9x, NT and Windows2000 version)
console.rc defaults.nh Install.nt Makefile.bcc Makefile.msc console.rc defaults.nh Install.nt Makefile.bcc Makefile.gcc
mapimail.c nethack.def nhico.uu nhsetup.bat ntsound.c Makefile.msc mapimail.c nethack.def nhico.uu nhsetup.bat
nttty.c win32api.h winnt.c ntsound.c nttty.c win32api.h winnt.c
util: util:
(files for all versions) (files for all versions)
+3 -3
View File
@@ -652,7 +652,7 @@ $(O)makedefs.o: $(CONFIG_H) $(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\objcla
# files is modified. # files is modified.
# #
$(INCL)\date.h : $(U)makedefs.exe $(INCL)\date.h $(OPTIONS_FILE) : $(U)makedefs.exe
$(U)makedefs -v $(U)makedefs -v
$(INCL)\onames.h : $(U)makedefs.exe $(INCL)\onames.h : $(U)makedefs.exe
@@ -1187,8 +1187,8 @@ $(O)qt_win.o: ..\win\Qt\qt_win.cpp $(HACK_H) $(INCL)\func_tab.h \
$(CXX) $(CXXFLAGS) -c ..\win\Qt\qt_win.cpp $(CXX) $(CXXFLAGS) -c ..\win\Qt\qt_win.cpp
$(O)qt_clust.o: ..\win\Qt\qt_clust.cpp $(INCL)\qt_clust.h $(O)qt_clust.o: ..\win\Qt\qt_clust.cpp $(INCL)\qt_clust.h
$(CXX) $(CXXFLAGS) -c ..\win\Qt\qt_clust.cpp $(CXX) $(CXXFLAGS) -c ..\win\Qt\qt_clust.cpp
$(O)monstr.o: monstr.c $(CONFIG_H) $(O)monstr.o: $(SRC)\monstr.c $(CONFIG_H)
$(O)vis_tab.o: vis_tab.c $(CONFIG_H) $(INCL)\vis_tab.h $(O)vis_tab.o: $(SRC)\vis_tab.c $(CONFIG_H) $(INCL)\vis_tab.h
$(O)allmain.o: allmain.c $(HACK_H) $(O)allmain.o: allmain.c $(HACK_H)
$(O)alloc.o: alloc.c $(CONFIG_H) $(O)alloc.o: alloc.c $(CONFIG_H)
$(O)apply.o: apply.c $(HACK_H) $(INCL)\edog.h $(O)apply.o: apply.c $(HACK_H) $(INCL)\edog.h
+10 -7
View File
@@ -471,7 +471,7 @@ default : $(GAMEFILE)
# The main target. # The main target.
# #
$(GAME): $(O)obj.tag $(O)utility.tag graphicschk $(GAMEFILE) $(GAME) : $(O)obj.tag $(O)utility.tag graphicschk $(GAMEFILE)
@echo $(GAME) is up to date. @echo $(GAME) is up to date.
# #
@@ -609,9 +609,12 @@ $(O)makedefs.o: $(CONFIG_H) $(INCL)/monattk.h $(INCL)/monflag.h $(INCL)/objclass
# files is modified. # files is modified.
# #
$(INCL)/date.h : $(U)makedefs.exe $(INCL)/date.h $(OPTIONS_FILE): $(U)makedefs.exe
$(subst /,\,$(U)makedefs -v) $(subst /,\,$(U)makedefs -v)
#$(OPTIONS_FILE): $(U)makedefs.exe
# $(subst /,\,$(U)makedefs -v)
$(INCL)/onames.h : $(U)makedefs.exe $(INCL)/onames.h : $(U)makedefs.exe
$(subst /,\,$(U)makedefs -o) $(subst /,\,$(U)makedefs -o)
@@ -801,7 +804,7 @@ endif
$(O)obj.tag: $(O)obj.tag:
$(subst /,\,@if not exist $(OBJ)/*.* echo creating directory $(OBJ)) $(subst /,\,@if not exist $(OBJ)/*.* echo creating directory $(OBJ))
$(subst /,\,@if not exist $(OBJ)/*.* mkdir $(OBJ)) $(subst /,\,@if not exist $(OBJ)/*.* mkdir $(OBJ))
$(subst /,\,@echo directory created >$@) $(subst /,\,@echo directory created > $@)
#========================================== #==========================================
@@ -984,8 +987,8 @@ endif
$(subst /,\,if exist $(DAT)/medusa-?.lev del $(DAT)/medusa-?.lev) $(subst /,\,if exist $(DAT)/medusa-?.lev del $(DAT)/medusa-?.lev)
$(subst /,\,if exist $(DAT)/mine*.lev del $(DAT)/mine*.lev) $(subst /,\,if exist $(DAT)/mine*.lev del $(DAT)/mine*.lev)
$(subst /,\,if exist $(DAT)/options del $(DAT)/options) $(subst /,\,if exist $(DAT)/options del $(DAT)/options)
$(subst /,\,if exist $(DAT)\ttyoptions del $(DAT)\ttyoptions) $(subst /,\,if exist $(DAT)/ttyoptions del $(DAT)/ttyoptions)
$(subst /,\,if exist $(DAT)\guioptions del $(DAT)\guioptions) $(subst /,\,if exist $(DAT)/guioptions del $(DAT)/guioptions)
$(subst /,\,if exist $(DAT)/oracle.lev del $(DAT)/oracle.lev) $(subst /,\,if exist $(DAT)/oracle.lev del $(DAT)/oracle.lev)
$(subst /,\,if exist $(DAT)/oracles del $(DAT)/oracles) $(subst /,\,if exist $(DAT)/oracles del $(DAT)/oracles)
$(subst /,\,if exist $(DAT)/orcus.lev del $(DAT)/orcus.lev) $(subst /,\,if exist $(DAT)/orcus.lev del $(DAT)/orcus.lev)
@@ -1180,8 +1183,8 @@ $(O)qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) $(INCL)/func_tab.h \
$(CXX) $(CXXFLAGS) -c ../win/Qt/qt_win.cpp $(CXX) $(CXXFLAGS) -c ../win/Qt/qt_win.cpp
$(O)qt_clust.o: ../win/Qt/qt_clust.cpp $(INCL)/qt_clust.h $(O)qt_clust.o: ../win/Qt/qt_clust.cpp $(INCL)/qt_clust.h
$(CXX) $(CXXFLAGS) -c ../win/Qt/qt_clust.cpp $(CXX) $(CXXFLAGS) -c ../win/Qt/qt_clust.cpp
$(O)monstr.o: monstr.c $(CONFIG_H) $(O)monstr.o: $(SRC)/monstr.c $(CONFIG_H)
$(O)vis_tab.o: vis_tab.c $(CONFIG_H) $(INCL)/vis_tab.h $(O)vis_tab.o: $(SRC)/vis_tab.c $(CONFIG_H) $(INCL)/vis_tab.h
$(O)allmain.o: allmain.c $(HACK_H) $(O)allmain.o: allmain.c $(HACK_H)
$(O)alloc.o: alloc.c $(CONFIG_H) $(O)alloc.o: alloc.c $(CONFIG_H)
$(O)apply.o: apply.c $(HACK_H) $(INCL)/edog.h $(O)apply.o: apply.c $(HACK_H) $(INCL)/edog.h
+3 -3
View File
@@ -604,7 +604,7 @@ $(O)makedefs.o: $(CONFIG_H) $(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\objcla
# files is modified. # files is modified.
# #
$(INCL)\date.h : $(U)makedefs.exe $(INCL)\date.h $(OPTIONS_FILE) : $(U)makedefs.exe
$(U)makedefs -v $(U)makedefs -v
$(INCL)\onames.h : $(U)makedefs.exe $(INCL)\onames.h : $(U)makedefs.exe
@@ -1222,8 +1222,8 @@ $(O)qt_win.o: ..\win\Qt\qt_win.cpp $(HACK_H) $(INCL)\func_tab.h \
$(CXX) $(CXXFLAGS) -c ..\win\Qt\qt_win.cpp $(CXX) $(CXXFLAGS) -c ..\win\Qt\qt_win.cpp
$(O)qt_clust.o: ..\win\Qt\qt_clust.cpp $(INCL)\qt_clust.h $(O)qt_clust.o: ..\win\Qt\qt_clust.cpp $(INCL)\qt_clust.h
$(CXX) $(CXXFLAGS) -c ..\win\Qt\qt_clust.cpp $(CXX) $(CXXFLAGS) -c ..\win\Qt\qt_clust.cpp
$(O)monstr.o: monstr.c $(CONFIG_H) $(O)monstr.o: $(SRC)\monstr.c $(CONFIG_H)
$(O)vis_tab.o: vis_tab.c $(CONFIG_H) $(INCL)\vis_tab.h $(O)vis_tab.o: $(SRC)\vis_tab.c $(CONFIG_H) $(INCL)\vis_tab.h
$(O)allmain.o: allmain.c $(HACK_H) $(O)allmain.o: allmain.c $(HACK_H)
$(O)alloc.o: alloc.c $(CONFIG_H) $(O)alloc.o: alloc.c $(CONFIG_H)
$(O)apply.o: apply.c $(HACK_H) $(INCL)\edog.h $(O)apply.o: apply.c $(HACK_H) $(INCL)\edog.h