Group make output & remove useless code

11 files changed, 63 insertions, 77 deletions

diff --git a/Makefile b/Makefile
index c416e1d..da1d386 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 #!/usr/bin/make -f
 
-VERSION	= 3
-PATCHLEVEL = .0
+VERSION	= 4
+PATCHLEVEL = ~a1
 SUBLEVEL = 
 EXTRAVERSION =
-NAME = instalable
+NAME = graphic
 
 export	VERSION
 export	PATCHLEVEL
diff --git a/bin/Makefile b/bin/Makefile
index fafbfef..3a6448c 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -60,7 +60,7 @@ all: $(ALL)
 
 $(BIN_NAME): $(MAIN_OBJS)
 	$(Q)$(CC) $^ -o $@ $(LIBS)
-	@echo  "\tLD $@"
+	@echo  "\tLD	$@"
 	@echo  ""
 
 
diff --git a/libalx/obj/Makefile b/libalx/obj/Makefile
index cd410ee..717c7af 100644
--- a/libalx/obj/Makefile
+++ b/libalx/obj/Makefile
@@ -10,7 +10,8 @@ SRC_DIR = $(LIBALX_DIR)/src/
 
 # dependencies
 
-ALL = alx_cmp.o alx_file.o alx_getnum.o alx_mask.o alx_math.o alx_ncur.o alx_seed.o
+_ALL = alx_cmp.o alx_file.o alx_getnum.o alx_mask.o alx_math.o alx_ncur.o alx_seed.o
+ALL	= $(_ALL) alx_lib.o
 
 CMP_INC = alx_cmp.h
 CMP_DEPS = $(SRC_DIR)/alx_cmp.c $(patsubst %,$(INC_DIR)/%,$(CMP_INC))
@@ -46,40 +47,39 @@ SEED_INC_DIRS = -I $(INC_DIR)
 all: $(ALL)
 
 
-alx_cmp.o: $(CMP_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(CMP_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
+alx_lib.o: $(_ALL)
+	$(Q)$(LD) -r $^ -o $@
+	@echo  "\tLD	$@"
 	@echo  ""
 
+
+alx_cmp.o: $(CMP_DEPS)
+	$(Q)$(CC) $(CFLAGS) $(CMP_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
+
 alx_file.o: $(FILE_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(FILE_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(FILE_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 alx_getnum.o: $(GETN_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(GETN_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(GETN_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 alx_mask.o: $(MASK_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(MASK_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(MASK_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 alx_math.o: $(MATH_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(MATH_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(MATH_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 alx_ncur.o: $(NCUR_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(NCUR_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(NCUR_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 alx_seed.o: $(SEED_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(SEED_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(SEED_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 
 clean:
diff --git a/modules/about/obj/Makefile b/modules/about/obj/Makefile
index 701c308..2c1886b 100644
--- a/modules/about/obj/Makefile
+++ b/modules/about/obj/Makefile
@@ -30,14 +30,13 @@ all: $(ALL)
 
 about_mod.o: $(_ALL)
 	$(Q)$(LD) -r $^ -o $@
-	@echo  "\tLD $@"
+	@echo  "\tLD	$@"
 	@echo  ""
 
 
 about.o: $(ABOU_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(ABOU_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(ABOU_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 
 clean:
diff --git a/modules/ctrl/obj/Makefile b/modules/ctrl/obj/Makefile
index 79c85a6..a0e4537 100644
--- a/modules/ctrl/obj/Makefile
+++ b/modules/ctrl/obj/Makefile
@@ -39,14 +39,13 @@ all: $(ALL)
 
 ctrl_mod.o: $(_ALL)
 	$(Q)$(LD) -r $^ -o $@
-	@echo  "\tLD $@"
+	@echo  "\tLD	$@"
 	@echo  ""
 
 
 start.o: $(STRT_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(STRT_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(STRT_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 
 clean:
diff --git a/modules/game/obj/Makefile b/modules/game/obj/Makefile
index c0053c8..5cd2974 100644
--- a/modules/game/obj/Makefile
+++ b/modules/game/obj/Makefile
@@ -51,19 +51,17 @@ all: $(ALL)
 
 game_mod.o: $(_ALL)
 	$(Q)$(LD) -r $^ -o $@
-	@echo  "\tLD $@"
+	@echo  "\tLD	$@"
 	@echo  ""
 
 
 game.o: $(GAME_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(GAME_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(GAME_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 game_iface.o: $(GAMEI_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(GAMEI_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(GAMEI_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 
 clean:
diff --git a/modules/menu/obj/Makefile b/modules/menu/obj/Makefile
index de999f8..c32d449 100644
--- a/modules/menu/obj/Makefile
+++ b/modules/menu/obj/Makefile
@@ -102,29 +102,25 @@ all: $(ALL)
 
 menu_mod.o: $(_ALL)
 	$(Q)$(LD) -r $^ -o $@
-	@echo  "\tLD $@"
+	@echo  "\tLD	$@"
 	@echo  ""
 
 
 parser.o: $(PARS_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(PARS_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(PARS_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 menu_iface.o: $(MENUI_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(MENUI_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(MENUI_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 menu_clui.o: $(MENUCLUI_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(MENUCLUI_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(MENUCLUI_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 menu_tui.o: $(MENUTUI_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(MENUTUI_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(MENUTUI_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 
 clean:
diff --git a/modules/player/obj/Makefile b/modules/player/obj/Makefile
index 4cef87b..0af8225 100644
--- a/modules/player/obj/Makefile
+++ b/modules/player/obj/Makefile
@@ -51,24 +51,21 @@ all: $(ALL)
 
 player_mod.o: $(_ALL)
 	$(Q)$(LD) -r $^ -o $@
-	@echo  "\tLD $@"
+	@echo  "\tLD	$@"
 	@echo  ""
 
 
 player_iface.o: $(PLAYI_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(PLAYI_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(PLAYI_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 player_clui.o: $(PLAYCLUI_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(PLAYCLUI_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(PLAYCLUI_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 player_tui.o: $(PLAYTUI_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(PLAYTUI_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(PLAYTUI_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 
 clean:
diff --git a/modules/save/obj/Makefile b/modules/save/obj/Makefile
index e4cbf5d..016a57b 100644
--- a/modules/save/obj/Makefile
+++ b/modules/save/obj/Makefile
@@ -45,19 +45,17 @@ all: $(ALL)
 
 save_mod.o: $(_ALL)
 	$(Q)$(LD) -r $^ -o $@
-	@echo  "\tLD $@"
+	@echo  "\tLD	$@"
 	@echo  ""
 	
 
 save.o: $(SAVE_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(SAVE_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(SAVE_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 score.o: $(SCORE_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(SCORE_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(SCORE_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 
 clean:
diff --git a/modules/xyzzy/obj/Makefile b/modules/xyzzy/obj/Makefile
index 0a79bda..2d96e2b 100644
--- a/modules/xyzzy/obj/Makefile
+++ b/modules/xyzzy/obj/Makefile
@@ -30,14 +30,13 @@ all: $(ALL)
 
 xyzzy_mod.o: $(_ALL)
 	$(Q)$(LD) -r $^ -o $@
-	@echo  "\tLD $@"
+	@echo  "\tLD	$@"
 	@echo  ""
 	
 
 xyzzy.o: $(XYZZY_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(XYZZY_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
-	@echo  ""
+	$(Q)$(CC) $(CFLAGS) $(XYZZY_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 
 
 clean:
diff --git a/obj/Makefile b/obj/Makefile
index 3a6f482..70823a4 100644
--- a/obj/Makefile
+++ b/obj/Makefile
@@ -60,8 +60,8 @@ MAIN_INC_DIRS	= -I $(LIBALX_INC_DIR) \
 all: $(ALL)
 
 main.o: $(MAIN_DEPS)
-	$(Q)$(CC) $(CFLAGS) $(MAIN_INC_DIRS) -c $< -o $@ $(LIBS)
-	@echo  "\tCC $<"
+	$(Q)$(CC) $(CFLAGS) $(MAIN_INC_DIRS) -c $< -o $@
+	@echo  "\tCC	$@"
 	@echo  ""