Index: trunk/Softwares/Makefile.Software
===================================================================
--- trunk/Softwares/Makefile.Software	(revision 136)
+++ trunk/Softwares/Makefile.Software	(revision 137)
@@ -13,5 +13,8 @@
 endif
 
+include				$(MORPHEO_TOPLEVEL)/Softwares/Makefile.defs
+
 #-----[ Directory ]---------------------------------------------------------------
+
 DIR_OBJ			        = obj
 DIR_BIN			        = bin
@@ -19,17 +22,35 @@
 EXE				= soft
 
-DIR_COMMON     		= $(MORPHEO_TOPLEVEL)/Softwares/Common
-DIR_COMMON_C		= $(DIR_COMMON)/src/c
-DIR_COMMON_ASM		= $(DIR_COMMON)/src/asm
-DIR_COMMON_SYS		= $(DIR_COMMON)/src/sys
-DIR_COMMON_INC       	= $(DIR_COMMON)/include
+DIR_COMMON     			= $(MORPHEO_TOPLEVEL)/Softwares/Common
+DIR_COMMON_C			= $(DIR_COMMON)/src/c
+DIR_COMMON_ASM			= $(DIR_COMMON)/src/asm
+DIR_COMMON_SYS			= $(DIR_COMMON)/src/sys
+DIR_COMMON_INC       		= $(DIR_COMMON)/include
 
-OBJECTS_COMMON		= 	$(patsubst $(DIR_COMMON_SYS)/%.s,$(DIR_OBJ)/%.o,$(wildcard $(DIR_COMMON_SYS)/*.s))	\
-				$(patsubst $(DIR_COMMON_ASM)/%.s,$(DIR_OBJ)/%.o,$(wildcard $(DIR_COMMON_ASM)/*.s))	\
-				$(patsubst $(DIR_COMMON_C)/%.c,$(DIR_OBJ)/%.o,$(wildcard $(DIR_COMMON_C)/*.c))
+OBJECTS_COMMON			= 	$(patsubst $(DIR_COMMON_SYS)/%.s,$(DIR_OBJ)/%.o,$(wildcard $(DIR_COMMON_SYS)/*.s))\
+					$(patsubst $(DIR_COMMON_ASM)/%.s,$(DIR_OBJ)/%.o,$(wildcard $(DIR_COMMON_ASM)/*.s))\
+					$(patsubst $(DIR_COMMON_C)/%.c,$(DIR_OBJ)/%.o,$(wildcard $(DIR_COMMON_C)/*.c))
 
 
 #-----[ To the compilation ]------------------------------------------------------
-OPTIMIZE			= -O3 -std=c99 -fomit-frame-pointer -fdelayed-branch -mror -mcmov -msext -mhard-mul -msoft-div -msoft-float
+
+#~~~~~[ OS : Newlib ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+NEWLIB_DIR_LDSCRIPT			= $(NEWLIB)/lib/
+#NEWLIB_INCDIR
+#NEWLIB_LIBDIR
+#NEWLIB_LIBNAME
+NEWLIB_OBJECTS				= $(NEWLIB)/lib/*.o
+
+#~~~~~[ OS : UNIX ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+UNIX_DIR_LDSCRIPT			= 
+UNIX_INCDIR				=
+UNIX_LIBDIR				=
+UNIX_LIBNAME				= -lm
+UNIX_OBJECTS				= 
+
+
+#~~~~~[ TARGET : MORPHEO ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+MORPHEO_OPTIMIZE			= -O3 -std=c99 -fomit-frame-pointer -fdelayed-branch -mror -mcmov -msext -mhard-mul -msoft-div -msoft-float
 
 #Option :
@@ -48,17 +69,33 @@
 
 # Tools
-OR32_CC				= $(OR1K_BIN)/or32-elf-gcc
-OR32_AS				= $(OR1K_BIN)/or32-elf-as
-OR32_LD				= $(OR1K_BIN)/or32-elf-ld
-OR32_OBJDUMP			= $(OR1K_BIN)/or32-elf-objdump
-OR32_NM           		= $(OR1K_BIN)/or32-elf-nm
+MORPHEO_CC			= $(OR1K_BIN)/or32-elf-gcc
+MORPHEO_AS			= $(OR1K_BIN)/or32-elf-as
+MORPHEO_LD			= $(OR1K_BIN)/or32-elf-ld
+MORPHEO_OBJDUMP			= $(OR1K_BIN)/or32-elf-objdump
+MORPHEO_NM           		= $(OR1K_BIN)/or32-elf-nm
 
 # Tools's option
-OR32_CC_OPT			= -Wall $(INCDIR) $(OPTIMIZE) -Wlong-long -DMorpheo $(FLAGS)
+MORPHEO_CC_OPT			= -Wall $(INCDIR) $(MORPHEO_OPTIMIZE) -Wlong-long -DMorpheo $(FLAGS)
 # -DHAVE_LIBC
-OR32_AS_OPT			=
-OR32_LD_OPT			= -T$(DIR_LDSCRIPT)/or32.ld $(LIBDIR) $(LIBNAME) $(OR1K_LIBDIR) $(OR1K_LIBNAME) 
-OR32_OBJDUMP_OPT		= -D
-OR32_NM_OPT			= -n
+MORPHEO_AS_OPT			=
+MORPHEO_LD_OPT			= -T$(DIR_LDSCRIPT)/or32.ld $(LIBDIR) $(LIBNAME) $(OR1K_LIBDIR) $(OR1K_LIBNAME) 
+MORPHEO_OBJDUMP_OPT		= -D
+MORPHEO_NM_OPT			= -n
+
+#~~~~~[ TARGET : x86 ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+x86_OPTIMIZE			= -O3 -std=c99
+
+x86_CC				= gcc
+x86_AS				= as
+x86_LD				= gcc
+x86_OBJDUMP			= objdump
+x86_NM           		= nm
+
+x86_CC_OPT			= -Wall $(INCDIR) $(x86_OPTIMIZE) -Wlong-long -DUNIX $(FLAGS) -g3
+x86_AS_OPT			=
+x86_LD_OPT			= $(LIBDIR) $(LIBNAME) -g3
+x86_OBJDUMP_OPT			= -D
+x86_NM_OPT			= -n
 
 #-----[ Rules ]-------------------------------------------------------------------
@@ -77,9 +114,9 @@
 				$(MAKE) $(OBJECTS);                             \
 				$(ECHO) "Linkage            : $*.x";		\
-				$(OR32_LD) -o $@ $(OBJECTS) $(OR32_LD_OPT);	\
+				$($(TARGET)_LD) -o $@ $(OBJECTS) $($(TARGET)_LD_OPT);	\
 				$(ECHO) "List symbols       : $*.x.nm";		\
-				$(OR32_NM)      $(OR32_NM_OPT)      $@ > $@.nm;	\
+				$($(TARGET)_NM)      $($(TARGET)_NM_OPT)      $@ > $@.nm;	\
 				$(ECHO) "Display info       : $*.x.txt";	\
-				$(OR32_OBJDUMP) $(OR32_OBJDUMP_OPT) $@ > $@.txt;\
+				$($(TARGET)_OBJDUMP) $($(TARGET)_OBJDUMP_OPT) $@ > $@.txt;\
 				echo $($(GREP) "l.jal 0" $@.txt);
 
@@ -87,12 +124,12 @@
 				@\
                                 $(ECHO) "Compilation        : $*.s";		\
-				$(OR32_CC) $(OR32_CC_OPT)     -o $@   -c $^ ;
-#				$(OR32_CC) $(OR32_CC_OPT)  -S -o $@.s -c $^ ;
+				$($(TARGET)_CC) $($(TARGET)_CC_OPT)     -o $@   -c $^ ;
+#				$($(TARGET)_CC) $($(TARGET)_CC_OPT)  -S -o $@.s -c $^ ;
 
 $(DIR_OBJ)/%.o			: %.c
 				@\
                                 $(ECHO) "Compilation        : $*.c";		\
-				$(OR32_CC) $(OR32_CC_OPT)     -o $@   -c $^ ;
-#				$(OR32_CC) $(OR32_CC_OPT)  -S -o $@.s -c $^ ;
+				$($(TARGET)_CC) $($(TARGET)_CC_OPT)     -o $@   -c $^ ;
+#				$($(TARGET)_CC) $($(TARGET)_CC_OPT)  -S -o $@.s -c $^ ;
 
 $(DIR_BIN) $(DIR_OBJ)           :
