Minor changes

11 files changed, 79 insertions, 74 deletions

diff --git a/Makefile b/Makefile
index 3ec709b..d94c02f 100644
--- a/Makefile
+++ b/Makefile
@@ -195,7 +195,7 @@ export	LIBS
 
 # That's the default target when none is given on the command line
 PHONY := all
-all: binary
+all: libalx modules main binary
 
 
 PHONY += libalx
@@ -204,21 +204,25 @@ libalx:
 	$(Q)$(MAKE) base	-C $(LIBALX_DIR)
 	$(Q)$(MAKE) io		-C $(LIBALX_DIR)
 	$(Q)$(MAKE) curses	-C $(LIBALX_DIR)
+	@echo
 
 PHONY += modules
 modules: libalx
 	@echo	'	MAKE	modules'
 	$(Q)$(MAKE) -C $(MODULES_DIR)
+	@echo
 
-PHONY += object
-object: modules libalx
-	@echo	'	MAKE	obj'
+PHONY += main
+main: libalx modules
+	@echo	'	MAKE	main'
 	$(Q)$(MAKE) -C $(TMP_DIR)
+	@echo
 
 PHONY += binary
-binary: object
+binary: main
 	@echo	'	MAKE	bin'
 	$(Q)$(MAKE) -C $(BIN_DIR)
+	@echo
 
 PHONY += install
 install: uninstall
diff --git a/libalx b/libalx
-Subproject 6d6b1a657df6110cda6ba806917d2460ea87586
+Subproject a088b2ec37f0c1b868eaa336a62bee65fbf42c6
diff --git a/modules/Makefile b/modules/Makefile
index 0f89677..4b389d4 100644
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -28,31 +28,40 @@ export	XYZZY_DIR
 # target: dependencies
 #	action
 
+PHONY := all
 all:
-	$(Q)cd $(ABOUT_DIR) && $(MAKE) && cd ..
-	$(Q)cd $(CTRL_DIR) && $(MAKE) && cd ..
-	$(Q)cd $(GAME_DIR) && $(MAKE) && cd ..
-	$(Q)cd $(MENU_DIR) && $(MAKE) && cd ..
-	$(Q)cd $(PLAY_DIR) && $(MAKE) && cd ..
-	$(Q)cd $(SAVE_DIR) && $(MAKE) && cd ..
-	$(Q)cd $(XYZZY_DIR) && $(MAKE) && cd ..
-	$(Q)cd $(TMP_DIR) && $(MAKE) && cd ..
+	@echo	'	MAKE	modules:	about'
+	$(Q)$(MAKE) -C $(ABOUT_DIR)
+	@echo	'	MAKE	modules:	ctrl'
+	$(Q)$(MAKE) -C $(CTRL_DIR)
+	@echo	'	MAKE	modules:	game'
+	$(Q)$(MAKE) -C $(GAME_DIR)
+	@echo	'	MAKE	modules:	menu'
+	$(Q)$(MAKE) -C $(MENU_DIR)
+	@echo	'	MAKE	modules:	play'
+	$(Q)$(MAKE) -C $(PLAY_DIR)
+	@echo	'	MAKE	modules:	save'
+	$(Q)$(MAKE) -C $(SAVE_DIR)
+	@echo	'	MAKE	modules:	xyzzy'
+	$(Q)$(MAKE) -C $(XYZZY_DIR)
+	@echo	'	MAKE	modules:	tmp'
+	$(Q)$(MAKE) -C $(TMP_DIR)
 
 
+PHONY += clean
 clean:
-	$(Q)cd $(ABOUT_DIR) && $(MAKE) clean && cd ..
-	$(Q)cd $(CTRL_DIR) && $(MAKE) clean && cd ..
-	$(Q)cd $(GAME_DIR) && $(MAKE) clean && cd ..
-	$(Q)cd $(MENU_DIR) && $(MAKE) clean && cd ..
-	$(Q)cd $(PLAY_DIR) && $(MAKE) clean && cd ..
-	$(Q)cd $(SAVE_DIR) && $(MAKE) clean && cd ..
-	$(Q)cd $(XYZZY_DIR) && $(MAKE) clean && cd ..
-	$(Q)cd $(TMP_DIR) && $(MAKE) clean && cd ..
+	@echo	'	RM	*.o *.s *.a'
+	$(Q)find . -type f -name '*.o' -exec rm '{}' '+'
+	$(Q)find . -type f -name '*.s' -exec rm '{}' '+'
+	$(Q)find . -type f -name '*.a' -exec rm '{}' '+'
 
 ################################################################################
-######## End of file ###########################################################
-################################################################################
-######## End of file ###########################################################
+# Declare the contents of the .PHONY variable as phony.
+.PHONY: $(PHONY)
+
+
+
+
 ################################################################################
 ######## End of file ###########################################################
 ################################################################################
diff --git a/modules/about/tmp/Makefile b/modules/about/tmp/Makefile
index b75a882..dad4f88 100644
--- a/modules/about/tmp/Makefile
+++ b/modules/about/tmp/Makefile
@@ -29,17 +29,16 @@ all: $(ALL)
 
 
 about_mod.o: $(_ALL)
+	@echo	"	LD	$@"
 	$(Q)$(LD) -r $^ -o $@
-	@echo  "	LD	$@"
-	@echo  ""
 
 
 about.s: $(ABOU_DEPS)
+	@echo	"	CC	$@"
 	$(Q)$(CC) $(CFLAGS) $(ABOU_INC_DIRS) -S $< -o $@
-	@echo  "	CC	$@"
 about.o: about.s
+	@echo	"	AS	$@"
 	$(Q)$(AS) $< -o $@
-	@echo  "	AS	$@"
 
 
 clean:
diff --git a/modules/ctrl/tmp/Makefile b/modules/ctrl/tmp/Makefile
index a7b18d6..82f9c1f 100644
--- a/modules/ctrl/tmp/Makefile
+++ b/modules/ctrl/tmp/Makefile
@@ -34,20 +34,19 @@ STRT_INC_DIRS = -I $(INC_DIR) \
 #	action
 
 all: $(ALL)
-	
+
 
 ctrl_mod.o: $(_ALL)
+	@echo	"	LD	$@"
 	$(Q)$(LD) -r $^ -o $@
-	@echo  "	LD	$@"
-	@echo  ""
 
 
 start.s: $(STRT_DEPS)
+	@echo	"	CC	$@"
 	$(Q)$(CC) $(CFLAGS) $(STRT_INC_DIRS) -S $< -o $@
-	@echo  "	CC	$@"
 start.o: start.s
+	@echo	"	AS	$@"
 	$(Q)$(AS) $< -o $@
-	@echo  "	AS	$@"
 
 
 clean:
diff --git a/modules/game/tmp/Makefile b/modules/game/tmp/Makefile
index 74cbf4f..1895019 100644
--- a/modules/game/tmp/Makefile
+++ b/modules/game/tmp/Makefile
@@ -47,27 +47,26 @@ GAMEI_INC_DIRS = -I $(INC_DIR) \
 #	action
 
 all: $(ALL)
-	
+
 
 game_mod.o: $(_ALL)
 	$(Q)$(LD) -r $^ -o $@
-	@echo  "	LD	$@"
-	@echo  ""
+	@echo	"	LD	$@"
 
 
 game.s: $(GAME_DEPS)
 	$(Q)$(CC) $(CFLAGS) $(GAME_INC_DIRS) -S $< -o $@
-	@echo  "	CC	$@"
+	@echo	"	CC	$@"
 game.o: game.s
 	$(Q)$(AS) $< -o $@
-	@echo  "	AS	$@"
+	@echo	"	AS	$@"
 
 game_iface.s: $(GAMEI_DEPS)
 	$(Q)$(CC) $(CFLAGS) $(GAMEI_INC_DIRS) -S $< -o $@
-	@echo  "	CC	$@"
+	@echo	"	CC	$@"
 game_iface.o: game_iface.s
 	$(Q)$(AS) $< -o $@
-	@echo  "	AS	$@"
+	@echo	"	AS	$@"
 
 
 clean:
diff --git a/modules/menu/tmp/Makefile b/modules/menu/tmp/Makefile
index cdff0ea..eba74e8 100644
--- a/modules/menu/tmp/Makefile
+++ b/modules/menu/tmp/Makefile
@@ -121,45 +121,44 @@ all: $(ALL)
 
 
 menu_mod.o: $(_ALL)
+	@echo	"	LD	$@"
 	$(Q)$(LD) -r $^ -o $@
-	@echo  "	LD	$@"
-	@echo  ""
 
 
 parser.s: $(PARS_DEPS)
+	@echo	"	CC	$@"
 	$(Q)$(CC) $(CFLAGS) $(PARS_INC_DIRS) -S $< -o $@
-	@echo  "	CC	$@"
 parser.o: parser.s
+	@echo	"	AS	$@"
 	$(Q)$(AS) $< -o $@
-	@echo  "	AS	$@"
 
 menu_iface.s: $(MENUI_DEPS)
+	@echo	"	CC	$@"
 	$(Q)$(CC) $(CFLAGS) $(MENUI_INC_DIRS) -S $< -o $@
-	@echo  "	CC	$@"
 menu_iface.o: menu_iface.s
+	@echo	"	AS	$@"
 	$(Q)$(AS) $< -o $@
-	@echo  "	AS	$@"
 
 menu_clui.s: $(MENUCLUI_DEPS)
+	@echo	"	CC	$@"
 	$(Q)$(CC) $(CFLAGS) $(MENUCLUI_INC_DIRS) -S $< -o $@
-	@echo  "	CC	$@"
 menu_clui.o: menu_clui.s
+	@echo	"	AS	$@"
 	$(Q)$(AS) $< -o $@
-	@echo  "	AS	$@"
 
 menu_tui.s: $(MENUTUI_DEPS)
+	@echo	"	CC	$@"
 	$(Q)$(CC) $(CFLAGS) $(MENUTUI_INC_DIRS) -S $< -o $@
-	@echo  "	CC	$@"
 menu_tui.o: menu_tui.s
+	@echo	"	AS	$@"
 	$(Q)$(AS) $< -o $@
-	@echo  "	AS	$@"
 
 menu_gui.s: $(MENUGUI_DEPS)
+	@echo	"	CC	$@"
 	$(Q)$(CC) $(CFLAGS) $(MENUGUI_INC_DIRS) -S $< -o $@
-	@echo  "	CC	$@"
 menu_gui.o: menu_gui.s
+	@echo	"	AS	$@"
 	$(Q)$(AS) $< -o $@
-	@echo  "	AS	$@"
 
 
 clean:
diff --git a/modules/player/tmp/Makefile b/modules/player/tmp/Makefile
index 70d252a..0c4838b 100644
--- a/modules/player/tmp/Makefile
+++ b/modules/player/tmp/Makefile
@@ -65,38 +65,37 @@ all: $(ALL)
 
 
 player_mod.o: $(_ALL)
+	@echo	"	LD	$@"
 	$(Q)$(LD) -r $^ -o $@
-	@echo  "	LD	$@"
-	@echo  ""
 
 
 player_iface.s: $(PLAYI_DEPS)
+	@echo	"	CC	$@"
 	$(Q)$(CC) $(CFLAGS) $(PLAYI_INC_DIRS) -S $< -o $@
-	@echo  "	CC	$@"
 player_iface.o: player_iface.s
+	@echo	"	AS	$@"
 	$(Q)$(AS) $< -o $@
-	@echo  "	AS	$@"
 
 player_clui.s: $(PLAYCLUI_DEPS)
+	@echo	"	CC	$@"
 	$(Q)$(CC) $(CFLAGS) $(PLAYCLUI_INC_DIRS) -S $< -o $@
-	@echo  "	CC	$@"
 player_clui.o: player_clui.s
+	@echo	"	AS	$@"
 	$(Q)$(AS) $< -o $@
-	@echo  "	AS	$@"
 
 player_tui.s: $(PLAYTUI_DEPS)
+	@echo	"	CC	$@"
 	$(Q)$(CC) $(CFLAGS) $(PLAYTUI_INC_DIRS) -S $< -o $@
-	@echo  "	CC	$@"
 player_tui.o: player_tui.s
+	@echo	"	AS	$@"
 	$(Q)$(AS) $< -o $@
-	@echo  "	AS	$@"
 
 player_gui.s: $(PLAYGUI_DEPS)
+	@echo	"	CC	$@"
 	$(Q)$(CC) $(CFLAGS) $(PLAYGUI_INC_DIRS) -S $< -o $@
-	@echo  "	CC	$@"
 player_gui.o: player_gui.s
+	@echo	"	AS	$@"
 	$(Q)$(AS) $< -o $@
-	@echo  "	AS	$@"
 
 
 clean:
diff --git a/modules/save/tmp/Makefile b/modules/save/tmp/Makefile
index 07807b1..4fc63d8 100644
--- a/modules/save/tmp/Makefile
+++ b/modules/save/tmp/Makefile
@@ -44,24 +44,23 @@ all: $(ALL)
 
 
 save_mod.o: $(_ALL)
+	@echo	"	LD	$@"
 	$(Q)$(LD) -r $^ -o $@
-	@echo  "	LD	$@"
-	@echo  ""
 	
 
 save.s: $(SAVE_DEPS)
+	@echo	"	CC	$@"
 	$(Q)$(CC) $(CFLAGS) $(SAVE_INC_DIRS) -S $< -o $@
-	@echo  "	CC	$@"
 save.o: save.s
+	@echo	"	AS	$@"
 	$(Q)$(AS) $< -o $@
-	@echo  "	AS	$@"
 
 score.s: $(SCORE_DEPS)
+	@echo	"	CC	$@"
 	$(Q)$(CC) $(CFLAGS) $(SCORE_INC_DIRS) -S $< -o $@
-	@echo  "	CC	$@"
 score.o: score.s
+	@echo	"	AS	$@"
 	$(Q)$(AS) $< -o $@
-	@echo  "	AS	$@"
 
 
 clean:
diff --git a/modules/tmp/Makefile b/modules/tmp/Makefile
index cc37aab..3cf4748 100644
--- a/modules/tmp/Makefile
+++ b/modules/tmp/Makefile
@@ -38,9 +38,8 @@ all: $(ALL)
 
 
 modules.o: $(MODS_OBJS)
+	@echo	"	LD	$@"
 	$(Q)$(LD) -r $^ -o $@
-	@echo  "	LD	$@"
-	@echo  ""
 
 
 clean:
diff --git a/modules/xyzzy/tmp/Makefile b/modules/xyzzy/tmp/Makefile
index 5ad3b0c..afe43ba 100644
--- a/modules/xyzzy/tmp/Makefile
+++ b/modules/xyzzy/tmp/Makefile
@@ -29,17 +29,16 @@ all: $(ALL)
 
 
 xyzzy_mod.o: $(_ALL)
+	@echo	"	LD	$@"
 	$(Q)$(LD) -r $^ -o $@
-	@echo  "	LD	$@"
-	@echo  ""
 	
 
 xyzzy.s: $(XYZZY_DEPS)
+	@echo	"	CC	$@"
 	$(Q)$(CC) $(CFLAGS) $(XYZZY_INC_DIRS) -S $< -o $@
-	@echo  "	CC	$@"
 xyzzy.o: xyzzy.s
+	@echo	"	AS	$@"
 	$(Q)$(AS) $< -o $@
-	@echo  "	AS	$@"
 
 
 clean: