From b17f0c78b4708f6617a635015d7d73360edf93eb Mon Sep 17 00:00:00 2001 From: David Griffith Date: Sun, 1 Sep 2019 18:29:53 -0700 Subject: [PATCH] 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. --- Makefile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 20efd1c..5a8457d 100644 --- 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) -- 2.34.1