revise a couple of recent changes

include/.gitignore should continue to ignore old files in case
someone checks out an older version, builds, then checks out the
current version without running 'make spotless' first.

sys/unix/Makefile.utl:  tiletxt.o depends on tilemap.c in addition
to tiletxt.c.

diff --git a/include/.gitignore b/include/.gitignore
index e3ffcebde7af2e86b26d26febd47edf067325201..1930f4302fc8b7c42213d43787e19031f4c3006e 100644 (file)
--- a/include/.gitignore
+++ b/include/.gitignore
@@ -1,5 +1,17 @@
-.cvsignore
+# generated at build time so not managed by git
+nhlua.h
+# obsolete but still built by 'makedefs' in conjunction with dat/options for
+# potential use by old port-specific code that isn't being actively maintained
 date.h
+# obsolete but can still be built by 'makedefs' for reference purposes
 onames.h
 pm.h
-nhlua.h
+# these are obsolete--or now reside elsewhere--but are still listed here to be
+# ignored in case the directory contains remnants of building an older version
+dgn_comp.h
+lev_comp.h
+vis_tab.h
+tile.h
+win32api.h
+# really obsolete...
+.cvsignore

diff --git a/sys/unix/Makefile.utl b/sys/unix/Makefile.utl
index edc239fb0ad49a959b290155fc41e7e24419310e..6c9cfb3eef115cfde50f99e97761cbc9320ce166 100644 (file)
--- a/sys/unix/Makefile.utl
+++ b/sys/unix/Makefile.utl
@@ -319,7 +319,7 @@ tilemap: tilemap.o $(OBJDIR)/objects.o $(OBJDIR)/monst.o $(OBJDIR)/drawing.o
 
 tiletext.o: ../win/share/tiletext.c $(CONFIG_H) ../win/share/tile.h
        $(CC) $(CFLAGS) -I../win/share -c ../win/share/tiletext.c -o $@
-tiletxt.o: ../win/share/tiletxt.c $(HACK_H)
+tiletxt.o: ../win/share/tiletxt.c ../win/share/tilemap.c $(HACK_H)
        $(CC) $(CFLAGS) -I../win/share -c ../win/share/tiletxt.c -o $@
 tilemap.o: ../win/share/tilemap.c $(HACK_H)
        $(CC) $(CFLAGS) -c ../win/share/tilemap.c -o $@