Fix mess with defines.

There was an ongoing problem with how I was handling defs.h et al
causing things to be entirely rebuilt or not rebuilt at all without
first doing a "make clean".  This fixes those problems that were last
addressed in 03e0c58b2363e5daecc29da44edf27fe4bc4beaa.

diff --git a/Makefile b/Makefile
index 20efd1cabc638e0a86d09df60f8db1c085c1eed4..5a8457d8462a8584de169a2281b33a4713bc3c51 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -280,9 +280,10 @@ $(DUMB_LIB): $(COMMON_DEFINES) $(HASH)
        $(MAKE) -C $(DUMB_DIR)
 
 $(BLORB_LIB): $(BLORB_DIR)
+       $(MAKE) -C $(BLORB_DIR)
 
-$(SUBDIRS):
-       $(MAKE) -C $@
+#$(SUBDIRS):
+#      $(MAKE) -C $@
 
 $(SUB_CLEAN):
        -$(MAKE) -C $(@:%-clean=%) clean
@@ -450,9 +451,5 @@ help:
 
 .PHONY: all clean dist curses ncurses dumb sdl hash help \
        common_defines curses_defines nosound nosound_helper\
-       $(COMMON_DEFINES) $(CURSES_DEFINES) $(HASH) \
        blorb_lib common_lib curses_lib dumb_lib \
-       install install_dfrotz install_sfrotz \
-       $(SUBDIRS) $(SUB_CLEAN) \
-       $(COMMON_DIR)/defines.h $(CURSES_DIR)/defines.h \
-       $(DOS_BIN) dos
+       install install_dfrotz install_sfrotz $(SUB_CLEAN)