Minor changes

4 files changed, 31 insertions, 23 deletions

diff --git a/Makefile b/Makefile
index 73b3557..e994b24 100644
--- a/Makefile
+++ b/Makefile
@@ -138,33 +138,43 @@ export	LD
 
 ################################################################################
 # cflags
-CFLAGS		= -std=c11
-CFLAGS	       += `pkg-config --cflags gtk+-2.0`
-CFLAGS	       += -D PROG_VERSION=\"$(PROGRAMVERSION)\"
-CFLAGS	       += -D 'INSTALL_SHARE_DIR="$(INSTALL_SHARE_DIR)"'
-CFLAGS	       += -D SHARE_DIR=\"$(SHARE_DIR)\"
-CFLAGS	       += -D 'INSTALL_VAR_DIR="$(INSTALL_VAR_DIR)"'
-CFLAGS	       += -D VAR_DIR=\"$(VAR_DIR)\"
+CFLAGS_STD	= -std=c11
+CFLAGS_GTK	= `pkg-config --cflags gtk+-2.0`
+
+CFLAGS_D	= -D PROG_VERSION=\"$(PROGRAMVERSION)\"
+CFLAGS_D       += -D 'INSTALL_SHARE_DIR="$(INSTALL_SHARE_DIR)"'
+CFLAGS_D       += -D SHARE_DIR=\"$(SHARE_DIR)\"
+CFLAGS_D       += -D 'INSTALL_VAR_DIR="$(INSTALL_VAR_DIR)"'
+CFLAGS_D       += -D VAR_DIR=\"$(VAR_DIR)\"
 
 ifeq ($(OS), linux)
-  CFLAGS       += -D OS_LINUX
+  CFLAGS_D     += -D OS_LINUX
 else ifeq ($(OS), win)
-  CFLAGS       += -D OS_WIN
+  CFLAGS_D     += -D OS_WIN
   # curses
-  CFLAGS       += -D _XOPEN_SOURCE=500 -I /mingw64/include/ncurses
+  CFLAGS_CURSES	= -D _XOPEN_SOURCE=500 -I /mingw64/include/ncurses
+endif
+
+ifeq ($(OS), linux)
+  CFLAGS	= $(CFLAGS_STD) $(CFLAGS_D) $(CFLAGS_GTK)
+else ifeq ($(OS), win)
+  CFLAGS	= $(CFLAGS_STD) $(CFLAGS_D) $(CFLAGS_CURSES) $(CFLAGS_GTK)
 endif
 
 export	CFLAGS
 
 ################################################################################
 # libs
-CURSES_LIBS	= -l ncurses
-GTK_LIBS	= `pkg-config --libs gtk+-2.0`
+LIBS_STATIC	= -static
+
+LIBS_MATH	= -l m
+LIBS_CURSES	= -l ncurses
+LIBS_GTK	= `pkg-config --libs gtk+-2.0`
 
 ifeq ($(OS), linux)
-  LIBS		= -l m $(CURSES_LIBS) $(GTK_LIBS)
+  LIBS		= $(LIBS_MATH) $(LIBS_CURSES) $(LIBS_GTK)
 else ifeq ($(OS), win)
-  LIBS		= -static -l m $(CURSES_LIBS) $(GTK_LIBS)
+  LIBS		= $(LIBS_STATIC) $(LIBS_MATH) $(LIBS_CURSES) $(LIBS_GTK)
 endif
 
 export	LIBS
diff --git a/bin/Makefile b/bin/Makefile
index 6107a75..bf7fcc6 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -28,7 +28,7 @@ all: $(ALL)
 
 $(BIN_NAME): $(MAIN_OBJS)
 	$(Q)$(CC) $^ -o $@ $(LIBS)
-	@echo  "\tCC	$@"
+	@echo  "	CC	$@"
 	@echo  ""
 
 
diff --git a/modules/menu/src/menu_tui.c b/modules/menu/src/menu_tui.c
index 18f4881..2ce2429 100644
--- a/modules/menu/src/menu_tui.c
+++ b/modules/menu/src/menu_tui.c
@@ -6,9 +6,7 @@
 /******************************************************************************

  ******* headers **************************************************************

  ******************************************************************************/

-/*	*	*	*	*	*	*	*	*	*

- *	*	* Standard	*	*	*	*	*	*

- *	*	*	*	*	*	*	*	*	*/

+/* Standard C ----------------------------------------------------------------*/

 		/* INFINITY */

 	#include <math.h>

 	#include <ncurses.h>

@@ -16,17 +14,17 @@
 		/* srand() */

 	#include <stdlib.h>

 

-/*	*	*	*	*	*	*	*	*	*

- *	*	* Other	*	*	*	*	*	*	*

- *	*	*	*	*	*	*	*	*	*/

+/* libalx --------------------------------------------------------------------*/

 	#include "alx_ncur.h"

 

+/* Project -------------------------------------------------------------------*/

 	#include "about.h"

 	#include "game_iface.h"

 	#include "save.h"

 	#include "score.h"

 	#include "start.h"

 

+/* Module --------------------------------------------------------------------*/

 	#include "menu_iface.h"

 

 	#include "menu_tui.h"

diff --git a/tmp/Makefile b/tmp/Makefile
index c34a266..ed82f37 100644
--- a/tmp/Makefile
+++ b/tmp/Makefile
@@ -61,10 +61,10 @@ all: $(ALL)
 
 main.s: $(MAIN_DEPS)
 	$(Q)$(CC) $(CFLAGS) $(MAIN_INC_DIRS) -S $< -o $@
-	@echo  "\tCC	$@"
+	@echo  "	CC	$@"
 main.o: main.s
 	$(Q)$(AS) $< -o $@
-	@echo  "\tAS	$@"
+	@echo  "	AS	$@"
 	@echo  ""