Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Core_Glue/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Core_Glue/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Core_Glue/Makefile.deps	(revision 142)
@@ -27,19 +27,21 @@
 					$(Behavioural_LIBRARY)	
 
-Core_Glue_DIR_LIBRARY		=	-L$(Core_Glue_DIR)/lib	\
-                                        $(Priority_DIR_LIBRARY) \
-					$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Core_Glue_library		:
+Core_Glue_library_only 		:
+				@\
+				$(MAKE) --directory=$(Core_Glue_DIR) --makefile=Makefile;
+
+Core_Glue_library_clean_only    :
+				@\
+				$(MAKE) --directory=$(Core_Glue_DIR) --makefile=Makefile clean;
+
+Core_Glue_library		: Core_Glue_library_only
 				@\
 				$(MAKE) Behavioural_library;		\
-				$(MAKE) Priority_library;		\
-				$(MAKE) --directory=$(Core_Glue_DIR) --makefile=Makefile;
+				$(MAKE) Priority_library;
 
-Core_Glue_library_clean	        :
+Core_Glue_library_clean	        : Core_Glue_library_clean_only
 				@\
 				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) Priority_library_clean;	        \
-				$(MAKE) --directory=$(Core_Glue_DIR) --makefile=Makefile clean;
+				$(MAKE) Priority_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Dcache_Access/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Dcache_Access/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Dcache_Access/Makefile.deps	(revision 142)
@@ -27,19 +27,21 @@
 					$(Behavioural_LIBRARY)	
 
-Dcache_Access_DIR_LIBRARY	=	-L$(Dcache_Access_DIR)/lib	\
-					$(Priority_DIR_LIBRARY)		\
-					$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Dcache_Access_library		:
+Dcache_Access_library_only	:
+				@\
+				$(MAKE) --directory=$(Dcache_Access_DIR) --makefile=Makefile;
+
+Dcache_Access_library_clean_only:
+				@\
+				$(MAKE) --directory=$(Dcache_Access_DIR) --makefile=Makefile clean;
+
+Dcache_Access_library		: Dcache_Access_library_only
 				@\
 				$(MAKE) Behavioural_library;		\
-				$(MAKE) Priority_library;		\
-				$(MAKE) --directory=$(Dcache_Access_DIR) --makefile=Makefile;
+				$(MAKE) Priority_library;
 
-Dcache_Access_library_clean	:
+Dcache_Access_library_clean	: Dcache_Access_library_clean_only
 				@\
 				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) Priority_library_clean;		\
-				$(MAKE) --directory=$(Dcache_Access_DIR) --makefile=Makefile clean;
+				$(MAKE) Priority_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Icache_Access/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Icache_Access/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Icache_Access/Makefile.deps	(revision 142)
@@ -27,19 +27,21 @@
 					$(Behavioural_LIBRARY)	
 
-Icache_Access_DIR_LIBRARY	=	-L$(Icache_Access_DIR)/lib	\
-					$(Priority_DIR_LIBRARY)		\
-					$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Icache_Access_library		:
+Icache_Access_library_only	:
+				@\
+				$(MAKE) --directory=$(Icache_Access_DIR) --makefile=Makefile;
+
+Icache_Access_library_clean_only:
+				@\
+				$(MAKE) --directory=$(Icache_Access_DIR) --makefile=Makefile clean;
+
+Icache_Access_library		: Icache_Access_library_only
 				@\
 				$(MAKE) Behavioural_library;		\
-				$(MAKE) Priority_library;		\
-				$(MAKE) --directory=$(Icache_Access_DIR) --makefile=Makefile;
+				$(MAKE) Priority_library;
 
-Icache_Access_library_clean	:
+Icache_Access_library_clean	: Icache_Access_library_clean_only
 				@\
 				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) Priority_library_clean;		\
-				$(MAKE) --directory=$(Icache_Access_DIR) --makefile=Makefile clean;
+				$(MAKE) Priority_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Makefile.deps	(revision 142)
@@ -8,5 +8,5 @@
 # DIR_MORPHEO must be defined
 
-Core			= yes
+Core				= yes
 
 ifndef Behavioural
@@ -19,11 +19,11 @@
 include 			$(DIR_MORPHEO)/Behavioural/Core/Dcache_Access/Makefile.deps
 endif
-ifndef Multi_Front_end
+ifndef Front_end
 include 			$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Makefile.deps
 endif
-ifndef Multi_OOO_Engine
+ifndef OOO_Engine
 include 			$(DIR_MORPHEO)/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Makefile.deps
 endif
-ifndef Multi_Execute_loop
+ifndef Execute_loop
 include 			$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Makefile.deps
 endif
@@ -47,16 +47,15 @@
 					$(Behavioural_LIBRARY)	
 
-Core_DIR_LIBRARY		=	-L$(Core_DIR)/lib               \
-					$(Icache_Access_DIR_LIBRARY)    \
-					$(Dcache_Access_DIR_LIBRARY)    \
-					$(Front_end_DIR_LIBRARY)        \
-					$(OOO_Engine_DIR_LIBRARY)       \
-					$(Execute_loop_DIR_LIBRARY)     \
-					$(Core_Glue_DIR_LIBRARY)        \
-					$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Core_library		:
+Core_library_only		:
+				@\
+				$(MAKE) --directory=$(Core_DIR) --makefile=Makefile;
+
+Core_library_clean_only		:
+				@\
+				$(MAKE) --directory=$(Core_DIR) --makefile=Makefile clean;
+
+Core_library			: Core_library_only
 				@\
 				$(MAKE) Behavioural_library;		\
@@ -66,8 +65,7 @@
 				$(MAKE) OOO_Engine_library;		\
 				$(MAKE) Execute_loop_library;		\
-				$(MAKE) Core_Glue_library;		\
-				$(MAKE) --directory=$(Core_DIR) --makefile=Makefile;
+				$(MAKE) Core_Glue_library;
 
-Core_library_clean	:
+Core_library_clean		: Core_library_clean_only
 				@\
 				$(MAKE) Behavioural_library_clean;	\
@@ -77,4 +75,3 @@
 				$(MAKE) OOO_Engine_library_clean;	\
 				$(MAKE) Execute_loop_library_clean;	\
-				$(MAKE) Core_Glue_library_clean;	\
-				$(MAKE) --directory=$(Core_DIR) --makefile=Makefile clean;
+				$(MAKE) Core_Glue_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Execute_loop_Glue/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Execute_loop_Glue/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Execute_loop_Glue/Makefile.deps	(revision 142)
@@ -11,5 +11,5 @@
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
@@ -21,18 +21,21 @@
 
 Execute_loop_Glue_LIBRARY		= 	-lExecute_loop_Glue	\
-					$(Behavioural_LIBRARY)	
-
-Execute_loop_Glue_DIR_LIBRARY		=	-L$(Execute_loop_Glue_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
+						$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Execute_loop_Glue_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Execute_loop_Glue_DIR) --makefile=Makefile;
+Execute_loop_Glue_library_only		:
+					@\
+					$(MAKE) --directory=$(Execute_loop_Glue_DIR) --makefile=Makefile;
 
-Execute_loop_Glue_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Execute_loop_Glue_DIR) --makefile=Makefile clean;
+Execute_loop_Glue_library_clean_only	:
+					@\
+					$(MAKE) --directory=$(Execute_loop_Glue_DIR) --makefile=Makefile clean;
+
+Execute_loop_Glue_library		: Execute_loop_Glue_library_only
+					@\
+					$(MAKE) Behavioural_library;
+
+Execute_loop_Glue_library_clean		: Execute_loop_Glue_library_clean_only
+					@\
+					$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Makefile.deps	(revision 142)
@@ -55,20 +55,15 @@
 					$(Execution_unit_to_Write_unit_LIBRARY)	
 
-
-Execute_loop_DIR_LIBRARY	=	-L$(Execute_loop_DIR)/lib			\
-					$(Behavioural_DIR_LIBRARY)			\
-					$(Execute_loop_Glue_DIR_LIBRARY)		\
-					$(Read_unit_DIR_LIBRARY)			\
-					$(Functionnal_unit_DIR_LIBRARY)			\
-					$(Load_store_unit_DIR_LIBRARY)			\
-					$(Write_unit_DIR_LIBRARY)			\
-					$(Register_unit_DIR_LIBRARY)			\
-					$(Read_unit_to_Execution_unit_DIR_LIBRARY)	\
-					$(Execution_unit_to_Write_unit_DIR_LIBRARY)	
-
-
 #-----[ Rules ]--------------------------------------------
 
-Execute_loop_library		:
+Execute_loop_library_only	:
+				@\
+				$(MAKE) --directory=$(Execute_loop_DIR) --makefile=Makefile;
+
+Execute_loop_library_clean_only	:
+				@\
+				$(MAKE) --directory=$(Execute_loop_DIR) --makefile=Makefile clean;
+
+Execute_loop_library		: Execute_loop_library_only
 				@\
 				$(MAKE) Behavioural_library;			\
@@ -80,8 +75,7 @@
 				$(MAKE) Register_unit_library;			\
 				$(MAKE) Read_unit_to_Execution_unit_library;	\
-				$(MAKE) Execution_unit_to_Write_unit_library;	\
-				$(MAKE) --directory=$(Execute_loop_DIR) --makefile=Makefile;
+				$(MAKE) Execution_unit_to_Write_unit_library;
 
-Execute_loop_library_clean	:
+Execute_loop_library_clean	: Execute_loop_library_clean_only
 				@\
 				$(MAKE) Behavioural_library_clean;			\
@@ -93,4 +87,3 @@
 				$(MAKE) Register_unit_library_clean;			\
 				$(MAKE) Read_unit_to_Execution_unit_library_clean;	\
-				$(MAKE) Execution_unit_to_Write_unit_library_clean;	\
-				$(MAKE) --directory=$(Execute_loop_DIR) --makefile=Makefile clean;
+				$(MAKE) Execution_unit_to_Write_unit_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/Makefile.deps	(revision 142)
@@ -11,43 +11,38 @@
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 ifndef Custom
-include 			$(DIR_MORPHEO)/Behavioural/Custom/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Custom/Makefile.deps
 endif
 ifndef Shifter
-include 			$(DIR_MORPHEO)/Behavioural/Generic/Shifter/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Generic/Shifter/Makefile.deps
 endif
 
 #-----[ Library ]------------------------------------------
-Functionnal_unit_LIBRARY	= 	-lFunctionnal_unit	\
-					$(Custom_LIBRARY)	\
-					-lFunctionnal_unit	\
-					$(Behavioural_LIBRARY)	\
-					-lFunctionnal_unit	\
-					$(Shifter_LIBRARY)	
-
-Functionnal_unit_DIR_LIBRARY	=	-L$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/lib	\
-					$(Custom_DIR_LIBRARY)	   \
-					$(Behavioural_DIR_LIBRARY) \
-					$(Shifter_DIR_LIBRARY)
-
-Functionnal_unit_DEPENDENCIES	=	Custom_library          \
-					Behavioural_library     \
-                                        Shifter_library
-
-Functionnal_unit_CLEAN        	=	Custom_library_clean      \
-					Behavioural_library_clean \
-                                        Shifter_library_clean
+Functionnal_unit_LIBRARY		= 	-lFunctionnal_unit	\
+						$(Custom_LIBRARY)	\
+						$(Behavioural_LIBRARY)	\
+						$(Shifter_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-#.NOTPARALLEL			: Functionnal_unit_library Functionnal_unit_library_clean
+Functionnal_unit_library_only		:
+					@\
+					$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit --makefile=Makefile;
 
-Functionnal_unit_library	: $(Functionnal_unit_DEPENDENCIES)
-				@\
-				$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit --makefile=Makefile;
+Functionnal_unit_library_clean_only	:
+					@\
+					$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit --makefile=Makefile clean;
 
-Functionnal_unit_library_clean	: $(Functionnal_unit_CLEAN)
-				@\
-				$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit --makefile=Makefile clean;
+Functionnal_unit_library		: Functionnal_unit_library_only
+					@\
+					$(MAKE) Custom_library;		\
+					$(MAKE) Behavioural_library;	\
+					$(MAKE) Shifter_library;
+
+Functionnal_unit_library_clean		: Functionnal_unit_library_clean_only
+					@\
+					$(MAKE) Custom_library_clean;		\
+					$(MAKE) Behavioural_library_clean;	\
+					$(MAKE) Shifter_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/Operation/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/Operation/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/Operation/Makefile.deps	(revision 142)
@@ -8,23 +8,34 @@
 # DIR_MORPHEO must be defined
 
-Operation		= yes
+Operation			= yes
+
+ifndef Behavioural
+include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+endif
 
 #-----[ Directory ]----------------------------------------
 
-Operation_DIR           =       $(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/Operation
+Operation_DIR           	=       $(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/Operation
 
 #-----[ Library ]------------------------------------------
 
-Operation_LIBRARY	= 	-lOperation
-
-Operation_DIR_LIBRARY	=	-L$(Operation_DIR)/lib
+Operation_LIBRARY		= 	-lOperation             \
+					$(Behavioural_LIBRARY)
 
 #-----[ Rules ]--------------------------------------------
 
-Operation_library	:
-			@\
-			$(MAKE) --directory=$(Operation_DIR) --makefile=Makefile;
+Operation_library_only		:
+				@\
+				$(MAKE) --directory=$(Operation_DIR) --makefile=Makefile;
 
-Operation_library_clean	:
-			@\
-			$(MAKE) --directory=$(Operation_DIR) --makefile=Makefile clean;
+Operation_library_clean_only	:
+				@\
+				$(MAKE) --directory=$(Operation_DIR) --makefile=Makefile clean;
+
+Operation_library		: Operation_library_only
+				@\
+				$(MAKE) Behavioural_library;
+
+Operation_library_clean		: Operation_library_clean_only
+				@\
+				$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/Makefile.deps	(revision 142)
@@ -8,33 +8,35 @@
 # DIR_MORPHEO must be defined
 
-Load_store_unit			= yes
+Load_store_unit				= yes
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 ifndef Queue_Control
-include 			$(DIR_MORPHEO)/Behavioural/Generic/Queue_Control/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Generic/Queue_Control/Makefile.deps
 endif
 
 #-----[ Library ]------------------------------------------
-Load_store_unit_LIBRARY		= 	-lLoad_store_unit	\
-					$(Queue_Control_LIBRARY)\
-					$(Behavioural_LIBRARY)	
-
-Load_store_unit_DIR_LIBRARY	=	-L$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/lib	\
-					$(Queue_Control_DIR_LIBRARY)\
-					$(Behavioural_DIR_LIBRARY)
+Load_store_unit_LIBRARY			= 	-lLoad_store_unit	\
+						$(Queue_Control_LIBRARY)\
+						$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Load_store_unit_library		: 
-				@\
-				$(MAKE) Queue_Control_library; \
-				$(MAKE) Behavioural_library; \
-				$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit --makefile=Makefile;
+Load_store_unit_library_only		: 
+					@\
+					$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit --makefile=Makefile;
 	
-Load_store_unit_library_clean	: 
-				@\
-				$(MAKE) Queue_Control_library_clean; \
-				$(MAKE) Behavioural_library_clean; \
-				$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit --makefile=Makefile clean;
+Load_store_unit_library_clean_only	: 
+					@\
+					$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit --makefile=Makefile clean;
+
+Load_store_unit_library			: Load_store_unit_library_only
+					@\
+					$(MAKE) Queue_Control_library; \
+					$(MAKE) Behavioural_library;
+
+Load_store_unit_library_clean		: Load_store_unit_library_clean_only
+					@\
+					$(MAKE) Queue_Control_library_clean; \
+					$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Makefile.deps	(revision 142)
@@ -25,4 +25,5 @@
 
 #-----[ Library ]------------------------------------------
+
 Read_unit_LIBRARY		= 	-lRead_unit			\
 					$(Behavioural_LIBRARY)		\
@@ -30,27 +31,23 @@
 					$(Reservation_station_LIBRARY)
 
-Read_unit_DIR_LIBRARY		=	-L$(Read_unit_DIR)/lib		\
-					$(Behavioural_DIR_LIBRARY)	\
-					$(Read_queue_DIR_LIBRARY)	\
-					$(Reservation_station_DIR_LIBRARY)
-
-Read_unit_DEPENDENCIES		=	Behavioural_library		\
-					Read_queue_library		\
-					Reservation_station_library
-
-Read_unit_CLEAN	        	=	Behavioural_library_clean	\
-					Read_queue_library_clean	\
-					Reservation_station_library_clean
-
 #-----[ Rules ]--------------------------------------------
 
-.NOTPARALLEL			: Read_unit_library
-.NOTPARALLEL			: Read_unit_library_clean
-
-Read_unit_library		: $(Read_unit_DEPENDENCIES)
+Read_unit_library_only		:
 				@\
 				$(MAKE) --directory=$(Read_unit_DIR) --makefile=Makefile;
 
-Read_unit_library_clean		: $(Read_unit_CLEAN)
+Read_unit_library_clean_only	:
 				@\
 				$(MAKE) --directory=$(Read_unit_DIR) --makefile=Makefile clean;
+
+Read_unit_library		: Read_unit_library_only
+				@\
+				$(MAKE) Behavioural_library;		\
+				$(MAKE) Read_queue_library;		\
+				$(MAKE) Reservation_station_library;
+
+Read_unit_library_clean		: Read_unit_library_clean_only
+				@\
+				$(MAKE) Behavioural_library_clean;		\
+				$(MAKE) Read_queue_library_clean;		\
+				$(MAKE) Reservation_station_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/Makefile.deps	(revision 142)
@@ -18,27 +18,26 @@
 
 #-----[ Library ]------------------------------------------
+
 Read_queue_LIBRARY		= 	-lRead_queue		\
 					$(Queue_LIBRARY)	\
 					$(Behavioural_LIBRARY)	
 
-Read_queue_DIR_LIBRARY		=	-L$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/lib	\
-					$(Queue_DIR_LIBRARY) \
-					$(Behavioural_DIR_LIBRARY)
-
-Read_queue_DEPENDENCIES		=	Queue_library	\
-					Behavioural_library
-
-Read_queue_CLEAN        	=	Queue_library_clean	\
-					Behavioural_library_clean
-
 #-----[ Rules ]--------------------------------------------
 
-#.NOTPARALLEL			: Read_queue_library Read_queue_library_clean
-
-Read_queue_library		: $(Read_queue_DEPENDENCIES)
+Read_queue_library_only		:
 				@\
 				$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue --makefile=Makefile;
 
-Read_queue_library_clean	: $(Read_queue_CLEAN)
+Read_queue_library_clean_only	:
 				@\
 				$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue --makefile=Makefile clean;
+
+Read_queue_library		: Read_queue_library_only
+				@\
+				$(MAKE) Queue_library;		\
+				$(MAKE) Behavioural_library;
+
+Read_queue_library_clean	: Read_queue_library_clean_only
+				@\
+				$(MAKE) Queue_library_clean;		\
+				$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/Makefile.deps	(revision 142)
@@ -2,5 +2,5 @@
 # $Id$
 # 
-# [ Description ]
+# [ Description ]
 # 
 # Makefile
@@ -8,33 +8,36 @@
 # DIR_MORPHEO must be defined
 
-Reservation_station		= yes
+Reservation_station			= yes
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 ifndef Queue_Control
-include 			$(DIR_MORPHEO)/Behavioural/Generic/Queue_Control/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Generic/Queue_Control/Makefile.deps
 endif
 
-#-----[ Library ]------------------------------------------
-Reservation_station_LIBRARY	= 	-lReservation_station	\
-					$(Queue_Control_LIBRARY)\
-					$(Behavioural_LIBRARY)	
+#-----[ Library ]------------------------------------------
 
-Reservation_station_DIR_LIBRARY	=	-L$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/lib	\
-					$(Queue_Control_DIR_LIBRARY)\
-					$(Behavioural_DIR_LIBRARY)
+Reservation_station_LIBRARY		= 	-lReservation_station	\
+						$(Queue_Control_LIBRARY)\
+						$(Behavioural_LIBRARY)	
 
-#-----[ Rules ]--------------------------------------------
+#-----[ Rules ]--------------------------------------------
 
-Reservation_station_library		: 
-				@\
-				$(MAKE) Queue_Control_library; \
-				$(MAKE) Behavioural_library; \
-				$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station --makefile=Makefile;
+Reservation_station_library_only	: 
+					@\
+					$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station --makefile=Makefile;
 	
-Reservation_station_library_clean	: 
-				@\
-				$(MAKE) Queue_Control_library_clean; \
-				$(MAKE) Behavioural_library_clean; \
-				$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station --makefile=Makefile clean;
+Reservation_station_library_clean_only	: 
+					@\
+					$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station --makefile=Makefile clean;
+
+Reservation_station_library		: Reservation_station_library_only
+					@\
+					$(MAKE) Queue_Control_library; \
+					$(MAKE) Behavioural_library;
+	
+Reservation_station_library_clean	: Reservation_station_library_clean_only
+					@\
+					$(MAKE) Queue_Control_library_clean; \
+					$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/Makefile.deps	(revision 142)
@@ -22,23 +22,26 @@
 
 #-----[ Library ]------------------------------------------
+
 Execute_queue_LIBRARY		= 	-lExecute_queue	\
 					$(Queue_LIBRARY)	\
 					$(Behavioural_LIBRARY)	
 
-Execute_queue_DIR_LIBRARY	=	-L$(Execute_queue_DIR)/lib	\
-					$(Queue_DIR_LIBRARY) \
-					$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Execute_queue_library		:
+Execute_queue_library_only	:
+				@\
+				$(MAKE) --directory=$(Execute_queue_DIR) --makefile=Makefile;
+
+Execute_queue_library_clean_only:
+				@\
+				$(MAKE) --directory=$(Execute_queue_DIR) --makefile=Makefile clean;
+
+Execute_queue_library		: Execute_queue_library_only
 				@\
 				$(MAKE) Behavioural_library; \
-				$(MAKE) Queue_library; \
-				$(MAKE) --directory=$(Execute_queue_DIR) --makefile=Makefile;
+				$(MAKE) Queue_library;
 
-Execute_queue_library_clean	:
+Execute_queue_library_clean	: Execute_queue_library_clean_only
 				@\
 				$(MAKE) Behavioural_library_clean; \
-				$(MAKE) Queue_library_clean; \
-				$(MAKE) --directory=$(Execute_queue_DIR) --makefile=Makefile clean;
+				$(MAKE) Queue_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Makefile.deps	(revision 142)
@@ -25,4 +25,5 @@
 
 #-----[ Library ]------------------------------------------
+
 Write_unit_LIBRARY		= 	-lWrite_unit		\
 					$(Behavioural_LIBRARY)	\
@@ -30,22 +31,23 @@
 					$(Execute_queue_LIBRARY)
 
-Write_unit_DIR_LIBRARY		=	-L$(Write_unit_DIR)/lib		\
-					$(Behavioural_DIR_LIBRARY)	\
-					$(Write_queue_DIR_LIBRARY)	\
-					$(Execute_queue_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Write_unit_library		:
+Write_unit_library_only		:
+				@\
+				$(MAKE) --directory=$(Write_unit_DIR) --makefile=Makefile;
+
+Write_unit_library_clean_only	:
+				@\
+				$(MAKE) --directory=$(Write_unit_DIR) --makefile=Makefile clean;
+
+Write_unit_library		: Write_unit_library_only
 				@\
 				$(MAKE) Behavioural_library;		\
 				$(MAKE) Write_queue_library;		\
-				$(MAKE) Execute_queue_library;		\
-				$(MAKE) --directory=$(Write_unit_DIR) --makefile=Makefile;
+				$(MAKE) Execute_queue_library;
 
-Write_unit_library_clean	:
+Write_unit_library_clean	: Write_unit_library_clean_only
 				@\
 				$(MAKE) Behavioural_library_clean;	\
 				$(MAKE) Write_queue_library_clean;	\
-				$(MAKE) Execute_queue_library_clean;	\
-				$(MAKE) --directory=$(Write_unit_DIR) --makefile=Makefile clean;
+				$(MAKE) Execute_queue_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/Makefile.deps	(revision 142)
@@ -27,19 +27,21 @@
 					$(Behavioural_LIBRARY)	
 
-Write_queue_DIR_LIBRARY		=	-L$(Write_queue_DIR)/lib	\
-					$(Queue_DIR_LIBRARY)            \
-					$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Write_queue_library		:
+Write_queue_library_only	:
+				@\
+				$(MAKE) --directory=$(Write_queue_DIR) --makefile=Makefile;
+
+Write_queue_library_clean_only	:
+				@\
+				$(MAKE) --directory=$(Write_queue_DIR) --makefile=Makefile clean;
+
+Write_queue_library		: Write_queue_library_only
 				@\
 				$(MAKE) Queue_library;	\
-				$(MAKE) Behavioural_library;	\
-				$(MAKE) --directory=$(Write_queue_DIR) --makefile=Makefile;
+				$(MAKE) Behavioural_library;
 
-Write_queue_library_clean	:
+Write_queue_library_clean	: Write_queue_library_clean_only
 				@\
 				$(MAKE) Queue_library_clean;	\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Write_queue_DIR) --makefile=Makefile clean;
+				$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Network/Execution_unit_to_Write_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Network/Execution_unit_to_Write_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Network/Execution_unit_to_Write_unit/Makefile.deps	(revision 142)
@@ -11,27 +11,31 @@
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 					$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
 #-----[ Directory ]----------------------------------------
 
-Execution_unit_to_Write_unit_DIR			=	$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Network/Execution_unit_to_Write_unit
+Execution_unit_to_Write_unit_DIR		=	$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Network/Execution_unit_to_Write_unit
 
 #-----[ Library ]------------------------------------------
+
 Execution_unit_to_Write_unit_LIBRARY		= 	-lExecution_unit_to_Write_unit	\
-					$(Behavioural_LIBRARY)	
-
-Execution_unit_to_Write_unit_DIR_LIBRARY		=	-L$(Execution_unit_to_Write_unit_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
+							$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Execution_unit_to_Write_unit_library		:
-				@\
-				$(MAKE) --directory=$(Behavioural_DIR) --makefile=Makefile;
-				$(MAKE) --directory=$(Execution_unit_to_Write_unit_DIR) --makefile=Makefile;
+Execution_unit_to_Write_unit_library_only	:
+						@\
+						$(MAKE) --directory=$(Execution_unit_to_Write_unit_DIR) --makefile=Makefile;
 
-Execution_unit_to_Write_unit_library_clean	:
-				@\
-				$(MAKE) --directory=$(Behavioural_DIR) --makefile=Makefile clean;
-				$(MAKE) --directory=$(Execution_unit_to_Write_unit_DIR) --makefile=Makefile clean;
+Execution_unit_to_Write_unit_library_clean_only	:
+						@\
+						$(MAKE) --directory=$(Execution_unit_to_Write_unit_DIR) --makefile=Makefile clean;
+
+Execution_unit_to_Write_unit_library		: Execution_unit_to_Write_unit_library_only
+						@\
+						$(MAKE) Behavioural_library;
+
+Execution_unit_to_Write_unit_library_clean	: Execution_unit_to_Write_unit_library_clean_only
+						@\
+						$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Network/Read_unit_to_Execution_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Network/Read_unit_to_Execution_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Network/Read_unit_to_Execution_unit/Makefile.deps	(revision 142)
@@ -19,19 +19,23 @@
 
 #-----[ Library ]------------------------------------------
+
 Read_unit_to_Execution_unit_LIBRARY		= 	-lRead_unit_to_Execution_unit	\
 							$(Behavioural_LIBRARY)	
 
-Read_unit_to_Execution_unit_DIR_LIBRARY		=	-L$(Read_unit_to_Execution_unit_DIR)/lib	\
-							$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Read_unit_to_Execution_unit_library		:
+Read_unit_to_Execution_unit_library_only	:
+						@\
+						$(MAKE) --directory=$(Read_unit_to_Execution_unit_DIR) 	--makefile=Makefile;
+
+Read_unit_to_Execution_unit_library_clean_only	:
+						@\
+						$(MAKE) --directory=$(Read_unit_to_Execution_unit_DIR) 	--makefile=Makefile clean;
+
+Read_unit_to_Execution_unit_library		: Read_unit_to_Execution_unit_library_only
 						@\
 						$(MAKE) Behavioural_library;
-						$(MAKE) --directory=$(Read_unit_to_Execution_unit_DIR) 	--makefile=Makefile;
 
-Read_unit_to_Execution_unit_library_clean	:
+Read_unit_to_Execution_unit_library_clean	: Read_unit_to_Execution_unit_library_clean_only
 						@\
 						$(MAKE) Behavioural_library_clean;
-						$(MAKE) --directory=$(Read_unit_to_Execution_unit_DIR) 	--makefile=Makefile clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Makefile.deps	(revision 142)
@@ -2,5 +2,5 @@
 # $Id$
 # 
-# [ Description ]
+# [ Description ]
 # 
 # Makefile
@@ -9,5 +9,4 @@
 
 Register_unit			= yes
-
 
 ifndef RegisterFile
@@ -21,5 +20,6 @@
 endif
 
-#-----[ Library ]------------------------------------------
+#-----[ Library ]------------------------------------------
+
 Register_unit_LIBRARY		= 	-lRegister_unit				\
 					$(RegisterFile_LIBRARY)			\
@@ -27,26 +27,23 @@
 					$(Behavioural_LIBRARY)	
 
-Register_unit_DIR_LIBRARY	=	-L$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/lib	\
-					$(RegisterFile_DIR_LIBRARY)		\
-					$(Register_unit_Glue_DIR_LIBRARY)	\
-					$(Behavioural_DIR_LIBRARY)
+#-----[ Rules ]--------------------------------------------
 
-Register_unit_DEPENDENCIES	=	RegisterFile_library			\
-					Register_unit_Glue_library 		\
-					Behavioural_library
-
-Register_unit_CLEAN        	=	RegisterFile_library_clean		\
-					Register_unit_Glue_library_clean 	\
-					Behavioural_library_clean
-
-#-----[ Rules ]--------------------------------------------
-
-.NOTPARALLEL			: Register_unit_library Register_unit_library_clean	
-
-Register_unit_library		: $(Register_unit_DEPENDENCIES)
+Register_unit_library_only	:
 				@\
 				$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit --makefile=Makefile;
 
-Register_unit_library_clean	: $(Register_unit_CLEAN)
+Register_unit_library_clean_only:
 				@\
 				$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit --makefile=Makefile clean;
+
+Register_unit_library		: Register_unit_library_only
+				@\
+				$(MAKE) RegisterFile_library;		\
+				$(MAKE) Register_unit_Glue_library; 	\
+				$(MAKE) Behavioural_library;
+
+Register_unit_library_clean	: Register_unit_library_clean_only
+				@\
+				$(MAKE) RegisterFile_library_clean;		\
+				$(MAKE) Register_unit_Glue_library_clean; 	\
+				$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/Makefile.deps	(revision 142)
@@ -11,23 +11,27 @@
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
 #-----[ Library ]------------------------------------------
+
 Register_unit_Glue_LIBRARY		= 	-lRegister_unit_Glue	\
-					$(Behavioural_LIBRARY)	
-
-Register_unit_Glue_DIR_LIBRARY		=	-L$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/lib	\
-					$(Behavioural_DIR_LIBRARY)
+						$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Register_unit_Glue_library		: 
-				@\
-				$(MAKE) Behavioural_library; \
-				$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue --makefile=Makefile;
+Register_unit_Glue_library_only		: 
+					@\
+					$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue --makefile=Makefile;
 	
-Register_unit_Glue_library_clean	: 
-				@\
-				$(MAKE) Behavioural_library_clean; \
-				$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue --makefile=Makefile clean;
+Register_unit_Glue_library_clean_only	: 
+					@\
+					$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue --makefile=Makefile clean;
+
+Register_unit_Glue_library		: Register_unit_Glue_library_only
+					@\
+					$(MAKE) Behavioural_library;
+	
+Register_unit_Glue_library_clean	: Register_unit_Glue_library_clean_only
+					@\
+					$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Context_State/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Context_State/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Context_State/Makefile.deps	(revision 142)
@@ -23,16 +23,19 @@
 					$(Behavioural_LIBRARY)	
 
-Context_State_DIR_LIBRARY	=	-L$(Context_State_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Context_State_library		:
+Context_State_library_only	:
 				@\
-				$(MAKE) Behavioural_library;		\
 				$(MAKE) --directory=$(Context_State_DIR) --makefile=Makefile;
 
-Context_State_library_clean	:
+Context_State_library_clean_only:
 				@\
-				$(MAKE) Behavioural_library_clean;	\
 				$(MAKE) --directory=$(Context_State_DIR) --makefile=Makefile clean;
+
+Context_State_library		: Context_State_library_only
+				@\
+				$(MAKE) Behavioural_library;
+
+Context_State_library_clean	: Context_State_library_clean_only
+				@\
+				$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/Instruction/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/Instruction/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/Instruction/Makefile.deps	(revision 142)
@@ -10,4 +10,8 @@
 Instruction			= yes
 
+ifndef Behavioural
+include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+endif
+
 #-----[ Directory ]----------------------------------------
 
@@ -16,16 +20,24 @@
 #-----[ Library ]------------------------------------------
 
-Instruction_LIBRARY		= 	-lInstruction
-
-Instruction_DIR_LIBRARY		=	-L$(Instruction_DIR)/lib
+Instruction_LIBRARY		= 	-lInstruction \
+					$(Behavioural_LIBRARY)
 
 #-----[ Rules ]--------------------------------------------
 
-Instruction_library		:
+Instruction_library_only	:
 				@\
 				$(MAKE) --directory=$(Instruction_DIR) --makefile=Makefile;
 
-Instruction_library_clean	:
+Instruction_library_clean_only	:
 				@\
 				$(MAKE) --directory=$(Instruction_DIR) --makefile=Makefile clean;
 
+Instruction_library		: Instruction_library_only
+				@\
+				$(MAKE) Behavioural_library;
+
+Instruction_library_clean	: Instruction_library_clean_only
+				@\
+				$(MAKE) Behavioural_library_clean;
+
+
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/Makefile.deps	(revision 142)
@@ -8,5 +8,5 @@
 # DIR_MORPHEO must be defined
 
-Decod			= yes
+Decod				= yes
 
 ifndef Behavioural
@@ -31,23 +31,23 @@
 					$(Behavioural_LIBRARY)	
 
-Decod_DIR_LIBRARY		=	-L$(Decod_DIR)/lib		\
-					$(Custom_DIR_LIBRARY)		\
-					$(Priority_DIR_LIBRARY)		\
-					$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Decod_library			:
+Decod_library_only		:
+				@\
+				$(MAKE) --directory=$(Decod_DIR) --makefile=Makefile;
+
+Decod_library_clean_only	:
+				@\
+				$(MAKE) --directory=$(Decod_DIR) --makefile=Makefile clean;
+
+Decod_library			: Decod_library_only
 				@\
 				$(MAKE) Behavioural_library;		\
 				$(MAKE) Priority_library;		\
-				$(MAKE) Custom_library;			\
-				$(MAKE) --directory=$(Decod_DIR) --makefile=Makefile;
+				$(MAKE) Custom_library;
 
-Decod_library_clean	:
+Decod_library_clean		: Decod_library_clean_only
 				@\
 				$(MAKE) Behavioural_library_clean;	\
 				$(MAKE) Priority_library_clean;		\
-				$(MAKE) Custom_library_clean;		\
-				$(MAKE) --directory=$(Decod_DIR) --makefile=Makefile clean;
-
+				$(MAKE) Custom_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/Makefile.deps	(revision 142)
@@ -27,19 +27,21 @@
 					$(Behavioural_LIBRARY)	
 
-Decod_queue_DIR_LIBRARY		=	-L$(Decod_queue_DIR)/lib	\
-					$(Queue_DIR_LIBRARY)		\
-					$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Decod_queue_library		:
+Decod_queue_library_only	:
+				@\
+				$(MAKE) --directory=$(Decod_queue_DIR) --makefile=Makefile;
+
+Decod_queue_library_clean_only	:
+				@\
+				$(MAKE) --directory=$(Decod_queue_DIR) --makefile=Makefile clean;
+
+Decod_queue_library		: Decod_queue_library_only
 				@\
 				$(MAKE) Behavioural_library;		\
-				$(MAKE) Queue_library;			\
-				$(MAKE) --directory=$(Decod_queue_DIR) --makefile=Makefile;
+				$(MAKE) Queue_library;
 
-Decod_queue_library_clean	:
+Decod_queue_library_clean	: Decod_queue_library_clean_only
 				@\
 				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) Queue_library_clean;		\
-				$(MAKE) --directory=$(Decod_queue_DIR) --makefile=Makefile clean;
+				$(MAKE) Queue_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Makefile.deps	(revision 142)
@@ -31,22 +31,23 @@
 					$(Behavioural_LIBRARY)
 
-Decod_unit_DIR_LIBRARY		=	-L$(Decod_unit_DIR)/lib		\
-					$(Decod_DIR_LIBRARY)		\
-					$(Decod_queue_DIR_LIBRARY)	\
-					$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Decod_unit_library		:
+Decod_unit_library_only		:
+				@\
+				$(MAKE) --directory=$(Decod_unit_DIR) --makefile=Makefile;
+
+Decod_unit_library_clean_only	:
+				@\
+				$(MAKE) --directory=$(Decod_unit_DIR) --makefile=Makefile clean;
+
+Decod_unit_library		: Decod_unit_library_only
 				@\
 				$(MAKE) Behavioural_library;		\
 				$(MAKE) Decod_library;			\
-				$(MAKE) Decod_queue_library;		\
-				$(MAKE) --directory=$(Decod_unit_DIR) --makefile=Makefile;
+				$(MAKE) Decod_queue_library;
 
-Decod_unit_library_clean	:
+Decod_unit_library_clean	: Decod_unit_library_clean_only
 				@\
 				$(MAKE) Behavioural_library_clean;	\
 				$(MAKE) Decod_library_clean;		\
-				$(MAKE) Decod_queue_library_clean;	\
-				$(MAKE) --directory=$(Decod_unit_DIR) --makefile=Makefile clean;
+				$(MAKE) Decod_queue_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Front_end_Glue/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Front_end_Glue/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Front_end_Glue/Makefile.deps	(revision 142)
@@ -8,8 +8,8 @@
 # DIR_MORPHEO must be defined
 
-Front_end_Glue			= yes
+Front_end_Glue				= yes
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
@@ -20,19 +20,22 @@
 #-----[ Library ]------------------------------------------
 
-Front_end_Glue_LIBRARY		= 	-lFront_end_Glue	\
-					$(Behavioural_LIBRARY)	
-
-Front_end_Glue_DIR_LIBRARY		=	-L$(Front_end_Glue_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
+Front_end_Glue_LIBRARY			= 	-lFront_end_Glue	\
+						$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Front_end_Glue_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Front_end_Glue_DIR) --makefile=Makefile;
+Front_end_Glue_library_only		:
+					@\
+					$(MAKE) --directory=$(Front_end_Glue_DIR) --makefile=Makefile;
 
-Front_end_Glue_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Front_end_Glue_DIR) --makefile=Makefile clean;
+Front_end_Glue_library_clean_only	:
+					@\
+					$(MAKE) --directory=$(Front_end_Glue_DIR) --makefile=Makefile clean;
+
+Front_end_Glue_library			: Front_end_Glue_library_only
+					@\
+					$(MAKE) Behavioural_library;
+
+Front_end_Glue_library_clean		: Front_end_Glue_library_clean_only
+					@\
+					$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Address_management/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Address_management/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Address_management/Makefile.deps	(revision 142)
@@ -11,5 +11,5 @@
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
@@ -21,18 +21,21 @@
 
 Address_management_LIBRARY		= 	-lAddress_management	\
-					$(Behavioural_LIBRARY)	
-
-Address_management_DIR_LIBRARY		=	-L$(Address_management_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
+						$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Address_management_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Address_management_DIR) --makefile=Makefile;
+Address_management_library_only		:
+					@\
+					$(MAKE) --directory=$(Address_management_DIR) --makefile=Makefile;
 
-Address_management_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Address_management_DIR) --makefile=Makefile clean;
+Address_management_library_clean_only	:
+					@\
+					$(MAKE) --directory=$(Address_management_DIR) --makefile=Makefile clean;
+
+Address_management_library		: Address_management_library_only
+					@\
+					$(MAKE) Behavioural_library;
+
+Address_management_library_clean	: Address_management_library_clean_only
+					@\
+					$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Ifetch_queue/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Ifetch_queue/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Ifetch_queue/Makefile.deps	(revision 142)
@@ -16,5 +16,5 @@
 #-----[ Directory ]----------------------------------------
 
-Ifetch_queue_DIR			=	$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Ifetch_queue
+Ifetch_queue_DIR		=	$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Ifetch_queue
 
 #-----[ Library ]------------------------------------------
@@ -23,16 +23,19 @@
 					$(Behavioural_LIBRARY)	
 
-Ifetch_queue_DIR_LIBRARY		=	-L$(Ifetch_queue_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Ifetch_queue_library		:
+Ifetch_queue_library_only	:
 				@\
-				$(MAKE) Behavioural_library;		\
 				$(MAKE) --directory=$(Ifetch_queue_DIR) --makefile=Makefile;
 
-Ifetch_queue_library_clean	:
+Ifetch_queue_library_clean_only	:
 				@\
-				$(MAKE) Behavioural_library_clean;	\
 				$(MAKE) --directory=$(Ifetch_queue_DIR) --makefile=Makefile clean;
+
+Ifetch_queue_library		: Ifetch_queue_library_only
+				@\
+				$(MAKE) Behavioural_library;
+
+Ifetch_queue_library_clean	: Ifetch_queue_library_clean_only
+				@\
+				$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Ifetch_unit_Glue/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Ifetch_unit_Glue/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Ifetch_unit_Glue/Makefile.deps	(revision 142)
@@ -11,5 +11,5 @@
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
@@ -21,18 +21,22 @@
 
 Ifetch_unit_Glue_LIBRARY		= 	-lIfetch_unit_Glue	\
-					$(Behavioural_LIBRARY)	
+						$(Behavioural_LIBRARY)	
 
-Ifetch_unit_Glue_DIR_LIBRARY		=	-L$(Ifetch_unit_Glue_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
 
 #-----[ Rules ]--------------------------------------------
 
-Ifetch_unit_Glue_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Ifetch_unit_Glue_DIR) --makefile=Makefile;
+Ifetch_unit_Glue_library_only		:
+					@\
+					$(MAKE) --directory=$(Ifetch_unit_Glue_DIR) --makefile=Makefile;
 
-Ifetch_unit_Glue_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Ifetch_unit_Glue_DIR) --makefile=Makefile clean;
+Ifetch_unit_Glue_library_clean_only	:
+					@\
+					$(MAKE) --directory=$(Ifetch_unit_Glue_DIR) --makefile=Makefile clean;
+
+Ifetch_unit_Glue_library		: Ifetch_unit_Glue_library_only
+					@\
+					$(MAKE) Behavioural_library;
+
+Ifetch_unit_Glue_library_clean		: Ifetch_unit_Glue_library_clean_only
+					@\
+					$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Makefile.deps	(revision 142)
@@ -35,25 +35,25 @@
 					$(Behavioural_LIBRARY)	
 
-Ifetch_unit_DIR_LIBRARY		=	-L$(Ifetch_unit_DIR)/lib		\
-					$(Address_management_DIR_LIBRARY)	\
-					$(Ifetch_queue_DIR_LIBRARY)		\
-					$(Ifetch_unit_Glue_DIR_LIBRARY)		\
-					$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Ifetch_unit_library		:
+Ifetch_unit_library_only	:
 				@\
-				$(MAKE) Behavioural_library;						\
-				$(MAKE) --directory=$(Address_management_DIR) 	--makefile=Makefile;	\
-				$(MAKE) --directory=$(Ifetch_queue_DIR) 	--makefile=Makefile;	\
-				$(MAKE) --directory=$(Ifetch_unit_Glue_DIR) 	--makefile=Makefile;	\
 				$(MAKE) --directory=$(Ifetch_unit_DIR) 		--makefile=Makefile;
 
-Ifetch_unit_library_clean	:
+Ifetch_unit_library_clean_only	:
 				@\
-				$(MAKE) Behavioural_library_clean;						\
-				$(MAKE) --directory=$(Address_management_DIR) 	--makefile=Makefile clean;	\
-				$(MAKE) --directory=$(Ifetch_queue_DIR) 	--makefile=Makefile clean;	\
-				$(MAKE) --directory=$(Ifetch_unit_Glue_DIR) 	--makefile=Makefile clean;	\
 				$(MAKE) --directory=$(Ifetch_unit_DIR) 		--makefile=Makefile clean;
+
+Ifetch_unit_library		: Ifetch_unit_library_only
+				@\
+				$(MAKE) Behavioural_library;		\
+				$(MAKE) Address_management_library;	\
+				$(MAKE) Ifetch_queue_library;		\
+				$(MAKE) Ifetch_unit_Glue_library;
+
+Ifetch_unit_library_clean	: Ifetch_unit_library_clean_only
+				@\
+				$(MAKE) Behavioural_library_clean;		\
+				$(MAKE) Address_management_library_clean;	\
+				$(MAKE) Ifetch_queue_library_clean;		\
+				$(MAKE) Ifetch_unit_Glue_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Makefile.deps	(revision 142)
@@ -43,15 +43,15 @@
 					$(Behavioural_LIBRARY)	
 
-Front_end_DIR_LIBRARY		=	-L$(Front_end_DIR)/lib          \
-					$(Ifetch_unit_DIR_LIBRARY)      \
-					$(Prediction_unit_DIR_LIBRARY)  \
-					$(Decod_unit_DIR_LIBRARY)       \
-					$(Context_State_DIR_LIBRARY)    \
-					$(Front_end_Glue_DIR_LIBRARY)   \
-					$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Front_end_library		:
+Front_end_library_only		:
+				@\
+				$(MAKE) --directory=$(Front_end_DIR) --makefile=Makefile;
+
+Front_end_library_clean_only	:
+				@\
+				$(MAKE) --directory=$(Front_end_DIR) --makefile=Makefile clean;
+
+Front_end_library		: Front_end_library_only
 				@\
 				$(MAKE) Behavioural_library;		\
@@ -60,8 +60,7 @@
 				$(MAKE) Decod_unit_library;		\
 				$(MAKE) Context_State_library;		\
-				$(MAKE) Front_end_Glue_library;		\
-				$(MAKE) --directory=$(Front_end_DIR) --makefile=Makefile;
+				$(MAKE) Front_end_Glue_library;
 
-Front_end_library_clean	:
+Front_end_library_clean		: Front_end_library_clean_only
 				@\
 				$(MAKE) Behavioural_library_clean;	\
@@ -70,4 +69,3 @@
 				$(MAKE) Decod_unit_library_clean;	\
 				$(MAKE) Context_State_library_clean;	\
-				$(MAKE) Front_end_Glue_library_clean;	\
-				$(MAKE) --directory=$(Front_end_DIR) --makefile=Makefile clean;
+				$(MAKE) Front_end_Glue_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/Branch_Target_Buffer_Glue/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/Branch_Target_Buffer_Glue/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/Branch_Target_Buffer_Glue/Makefile.deps	(revision 142)
@@ -11,5 +11,5 @@
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 					$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
@@ -21,18 +21,21 @@
 
 Branch_Target_Buffer_Glue_LIBRARY		= 	-lBranch_Target_Buffer_Glue	\
-					$(Behavioural_LIBRARY)	
-
-Branch_Target_Buffer_Glue_DIR_LIBRARY		=	-L$(Branch_Target_Buffer_Glue_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
+							$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Branch_Target_Buffer_Glue_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Branch_Target_Buffer_Glue_DIR) --makefile=Makefile;
+Branch_Target_Buffer_Glue_library_only		:
+						@\
+						$(MAKE) --directory=$(Branch_Target_Buffer_Glue_DIR) --makefile=Makefile;
 
-Branch_Target_Buffer_Glue_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Branch_Target_Buffer_Glue_DIR) --makefile=Makefile clean;
+Branch_Target_Buffer_Glue_library_clean_only	:
+						@\
+						$(MAKE) --directory=$(Branch_Target_Buffer_Glue_DIR) --makefile=Makefile clean;
+
+Branch_Target_Buffer_Glue_library		: Branch_Target_Buffer_Glue_library_only
+						@\
+						$(MAKE) Behavioural_library;
+
+Branch_Target_Buffer_Glue_library_clean		: Branch_Target_Buffer_Glue_library_clean_only
+						@\
+						$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/Branch_Target_Buffer_Register/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/Branch_Target_Buffer_Register/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/Branch_Target_Buffer_Register/Makefile.deps	(revision 142)
@@ -11,5 +11,5 @@
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 					$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
@@ -23,16 +23,19 @@
                                                 	$(Behavioural_LIBRARY)	
 
-Branch_Target_Buffer_Register_DIR_LIBRARY	=	-L$(Branch_Target_Buffer_Register_DIR)/lib	\
-                                                	$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Branch_Target_Buffer_Register_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Branch_Target_Buffer_Register_DIR) --makefile=Makefile;
+Branch_Target_Buffer_Register_library_only	:
+						@\
+						$(MAKE) --directory=$(Branch_Target_Buffer_Register_DIR) --makefile=Makefile;
 
-Branch_Target_Buffer_Register_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Branch_Target_Buffer_Register_DIR) --makefile=Makefile clean;
+Branch_Target_Buffer_Register_library_clean_only:
+						@\
+						$(MAKE) --directory=$(Branch_Target_Buffer_Register_DIR) --makefile=Makefile clean;
+
+Branch_Target_Buffer_Register_library		: Branch_Target_Buffer_Register_library_only
+						@\
+						$(MAKE) Behavioural_library;
+
+Branch_Target_Buffer_Register_library_clean	: Branch_Target_Buffer_Register_library_clean_only
+						@\
+						$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/Makefile.deps	(revision 142)
@@ -39,14 +39,15 @@
 						$(Behavioural_LIBRARY)	
 
-Branch_Target_Buffer_DIR_LIBRARY	=	-L$(Branch_Target_Buffer_DIR)/lib		\
-						$(Branch_Target_Buffer_Glue_DIR_LIBRARY)	\
-						$(Branch_Target_Buffer_Register_DIR_LIBRARY)	\
-						$(Sort_DIR_LIBRARY)				\
-						$(Victim_DIR_LIBRARY)				\
-						$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Branch_Target_Buffer_library		:
+Branch_Target_Buffer_library_only	:
+					@\
+					$(MAKE) --directory=$(Branch_Target_Buffer_DIR) --makefile=Makefile;
+
+Branch_Target_Buffer_library_clean_only	:
+					@\
+					$(MAKE) --directory=$(Branch_Target_Buffer_DIR) --makefile=Makefile clean;
+
+Branch_Target_Buffer_library		: Branch_Target_Buffer_library_only
 					@\
 					$(MAKE) Behavioural_library;				\
@@ -54,8 +55,7 @@
 					$(MAKE) Branch_Target_Buffer_Register_library;		\
 					$(MAKE) Sort_library;					\
-					$(MAKE) Victim_library;					\
-					$(MAKE) --directory=$(Branch_Target_Buffer_DIR) --makefile=Makefile;
+					$(MAKE) Victim_library;
 
-Branch_Target_Buffer_library_clean	:
+Branch_Target_Buffer_library_clean	: Branch_Target_Buffer_library_clean_only
 					@\
 					$(MAKE) Behavioural_library_clean;			\
@@ -63,4 +63,3 @@
 					$(MAKE) Branch_Target_Buffer_Register_library_clean;	\
 					$(MAKE) Sort_library_clean;				\
-					$(MAKE) Victim_library_clean;				\
-					$(MAKE) --directory=$(Branch_Target_Buffer_DIR) --makefile=Makefile clean;
+					$(MAKE) Victim_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/src/Parameters.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/src/Parameters.cpp	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/src/Parameters.cpp	(revision 142)
@@ -59,5 +59,5 @@
 	   1             , // nb_output
 	   true          , // ascending
-	   _size_victim  , // size_data
+	   size_address  , // size_data
 	   true          , // have_port_index_out
 	   false           // have_port_data_out 
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Direction_Glue/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Direction_Glue/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Direction_Glue/Makefile.deps	(revision 142)
@@ -8,8 +8,8 @@
 # DIR_MORPHEO must be defined
 
-Direction_Glue			= yes
+Direction_Glue				= yes
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
@@ -20,19 +20,22 @@
 #-----[ Library ]------------------------------------------
 
-Direction_Glue_LIBRARY		= 	-lDirection_Glue	\
-					$(Behavioural_LIBRARY)	
-
-Direction_Glue_DIR_LIBRARY		=	-L$(Direction_Glue_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
+Direction_Glue_LIBRARY			= 	-lDirection_Glue	\
+						$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Direction_Glue_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Direction_Glue_DIR) --makefile=Makefile;
+Direction_Glue_library_only		:
+					@\
+					$(MAKE) --directory=$(Direction_Glue_DIR) --makefile=Makefile;
 
-Direction_Glue_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Direction_Glue_DIR) --makefile=Makefile clean;
+Direction_Glue_library_clean_only	:
+					@\
+					$(MAKE) --directory=$(Direction_Glue_DIR) --makefile=Makefile clean;
+
+Direction_Glue_library			: Direction_Glue_library_only
+					@\
+					$(MAKE) Behavioural_library;
+
+Direction_Glue_library_clean		: Direction_Glue_library_clean_only
+					@\
+					$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Makefile.deps	(revision 142)
@@ -31,22 +31,21 @@
 					$(Meta_Predictor_LIBRARY)
 
-Direction_DIR_LIBRARY		=	-L$(Direction_DIR)/lib		\
-					$(Behavioural_DIR_LIBRARY)	\
-					$(Direction_Glue_DIR_LIBRARY)	\
-					$(Meta_Predictor_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Direction_library		:
+Direction_library_only		:
+				$(MAKE) --directory=$(Direction_DIR) --makefile=Makefile;
+
+Direction_library_clean_only	:
+				$(MAKE) --directory=$(Direction_DIR) --makefile=Makefile clean;
+
+Direction_library		: Direction_library_only
 				@\
 				$(MAKE) Behavioural_library;		\
 				$(MAKE) Direction_Glue_library;		\
-				$(MAKE) --directory=$(Direction_DIR) --makefile=Makefile;
 				$(MAKE) Meta_Predictor_library;		\
 
-Direction_library_clean	:
+Direction_library_clean		: Direction_library_clean_only
 				@\
 				$(MAKE) Behavioural_library_clean;	\
 				$(MAKE) Direction_Glue_library_clean;	\
-				$(MAKE) --directory=$(Direction_DIR) --makefile=Makefile clean;
 				$(MAKE) Meta_Predictor_library_clean;	\
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.deps	(revision 142)
@@ -8,14 +8,14 @@
 # DIR_MORPHEO must be defined
 
-Meta_Predictor			= yes
+Meta_Predictor				= yes
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 ifndef Meta_Predictor_Glue
-include				$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.deps
+include					$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.deps
 endif
 ifndef Two_Level_Branch_Predictor
-include				$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.deps
+include					$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.deps
 endif
 
@@ -26,27 +26,28 @@
 #-----[ Library ]------------------------------------------
 
-Meta_Predictor_LIBRARY		= 	-lMeta_Predictor				\
-					$(Meta_Predictor_Glue_LIBRARY)			\
-					$(Two_Level_Branch_Predictor_LIBRARY)		\
-					$(Behavioural_LIBRARY)	
-
-Meta_Predictor_DIR_LIBRARY	=	-L$(Meta_Predictor_DIR)/lib			\
-					$(Meta_Predictor_Glue_DIR_LIBRARY)		\
-					$(Two_Level_Branch_Predictor_DIR_LIBRARY)	\
-					$(Behavioural_DIR_LIBRARY)
+Meta_Predictor_LIBRARY			= 	-lMeta_Predictor				\
+						$(Meta_Predictor_Glue_LIBRARY)			\
+						$(Two_Level_Branch_Predictor_LIBRARY)		\
+						$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Meta_Predictor_library		:
-				@\
-				$(MAKE) Behavioural_library;				\
-				$(MAKE) Meta_Predictor_Glue_library;			\
-				$(MAKE) Two_Level_Branch_Predictor_library;		\
-				$(MAKE) --directory=$(Meta_Predictor_DIR) --makefile=Makefile;
+Meta_Predictor_library_only		:
+					@\
+					$(MAKE) --directory=$(Meta_Predictor_DIR) --makefile=Makefile;
 
-Meta_Predictor_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;			\
-				$(MAKE) Meta_Predictor_Glue_library_clean;		\
-				$(MAKE) Two_Level_Branch_Predictor_library_clean;	\
-				$(MAKE) --directory=$(Meta_Predictor_DIR) --makefile=Makefile clean;
+Meta_Predictor_library_clean_only	:
+					@\
+					$(MAKE) --directory=$(Meta_Predictor_DIR) --makefile=Makefile clean;
+
+Meta_Predictor_library			: Meta_Predictor_library_only
+					@\
+					$(MAKE) Behavioural_library;				\
+					$(MAKE) Meta_Predictor_Glue_library;			\
+					$(MAKE) Two_Level_Branch_Predictor_library;
+
+Meta_Predictor_library_clean		: Meta_Predictor_library_clean_only
+					@\
+					$(MAKE) Behavioural_library_clean;			\
+					$(MAKE) Meta_Predictor_Glue_library_clean;		\
+					$(MAKE) Two_Level_Branch_Predictor_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.deps	(revision 142)
@@ -11,5 +11,5 @@
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
@@ -21,18 +21,21 @@
 
 Meta_Predictor_Glue_LIBRARY		= 	-lMeta_Predictor_Glue	\
-					$(Behavioural_LIBRARY)	
-
-Meta_Predictor_Glue_DIR_LIBRARY		=	-L$(Meta_Predictor_Glue_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
+						$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Meta_Predictor_Glue_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Meta_Predictor_Glue_DIR) --makefile=Makefile;
+Meta_Predictor_Glue_library_only	:
+					@\
+					$(MAKE) --directory=$(Meta_Predictor_Glue_DIR) --makefile=Makefile;
 
-Meta_Predictor_Glue_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Meta_Predictor_Glue_DIR) --makefile=Makefile clean;
+Meta_Predictor_Glue_library_clean_only	:
+					@\
+					$(MAKE) --directory=$(Meta_Predictor_Glue_DIR) --makefile=Makefile clean;
+
+Meta_Predictor_Glue_library		: Meta_Predictor_Glue_library_only
+					@\
+					$(MAKE) Behavioural_library;
+
+Meta_Predictor_Glue_library_clean	: Meta_Predictor_Glue_library_clean_only
+					@\
+					$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.deps	(revision 142)
@@ -11,5 +11,5 @@
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 					$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
@@ -21,18 +21,21 @@
 
 Two_Level_Branch_Predictor_LIBRARY		= 	-lTwo_Level_Branch_Predictor	\
-					$(Behavioural_LIBRARY)	
-
-Two_Level_Branch_Predictor_DIR_LIBRARY		=	-L$(Two_Level_Branch_Predictor_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
+							$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Two_Level_Branch_Predictor_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Two_Level_Branch_Predictor_DIR) --makefile=Makefile;
+Two_Level_Branch_Predictor_library_only		:
+						@\
+						$(MAKE) --directory=$(Two_Level_Branch_Predictor_DIR) --makefile=Makefile;
 
-Two_Level_Branch_Predictor_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Two_Level_Branch_Predictor_DIR) --makefile=Makefile clean;
+Two_Level_Branch_Predictor_library_clean_only	:
+						@\
+						$(MAKE) --directory=$(Two_Level_Branch_Predictor_DIR) --makefile=Makefile clean;
+
+Two_Level_Branch_Predictor_library		: Two_Level_Branch_Predictor_library_only
+						@\
+						$(MAKE) Behavioural_library;
+
+Two_Level_Branch_Predictor_library_clean	: Two_Level_Branch_Predictor_library_clean_only
+						@\
+						$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Makefile.deps	(revision 142)
@@ -8,23 +8,23 @@
 # DIR_MORPHEO must be defined
 
-Prediction_unit			= yes
+Prediction_unit				= yes
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 ifndef Branch_Target_Buffer
-include 			$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/Makefile.deps
 endif
 ifndef Direction
-include 			$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Makefile.deps
 endif
 ifndef Return_Address_Stack
-include 			$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Return_Address_Stack/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Return_Address_Stack/Makefile.deps
 endif
 ifndef Update_Prediction_Table
-include 			$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/Makefile.deps
 endif
 ifndef Prediction_unit_Glue
-include 			$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/Makefile.deps
 endif
 
@@ -43,32 +43,29 @@
 						$(Prediction_unit_Glue_LIBRARY)
 
-Prediction_unit_DIR_LIBRARY		=	-L$(Prediction_unit_DIR)/lib		\
-						$(Behavioural_DIR_LIBRARY)		\
-						$(Branch_Target_Buffer_DIR_LIBRARY)	\
-						$(Direction_DIR_LIBRARY)		\
-						$(Return_Address_Stack_DIR_LIBRARY)	\
-						$(Update_Prediction_Table_DIR_LIBRARY)	\
-						$(Prediction_unit_Glue_DIR_LIBRARY)
-
-
 #-----[ Rules ]--------------------------------------------
 
-Prediction_unit_library		:
-				@\
-				$(MAKE) Behavioural_library;			\
-				$(MAKE) Branch_Target_Buffer_library;		\
-				$(MAKE) Direction_library;			\
-				$(MAKE) Return_Address_Stack_library;		\
-				$(MAKE) Update_Prediction_Table_library;	\
-				$(MAKE) Prediction_unit_Glue_library;		\
-				$(MAKE) --directory=$(Prediction_unit_DIR) --makefile=Makefile;
+Prediction_unit_library_only		:
+					@\
+					$(MAKE) --directory=$(Prediction_unit_DIR) --makefile=Makefile;
 
-Prediction_unit_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;		\
-				$(MAKE) Branch_Target_Buffer_library_clean;	\
-				$(MAKE) Direction_library_clean;		\
-				$(MAKE) Return_Address_Stack_library_clean;	\
-				$(MAKE) Update_Prediction_Table_library_clean;	\
-				$(MAKE) Prediction_unit_Glue_library_clean;	\
-				$(MAKE) --directory=$(Prediction_unit_DIR) --makefile=Makefile clean;
+Prediction_unit_library_clean_only	:
+					@\
+					$(MAKE) --directory=$(Prediction_unit_DIR) --makefile=Makefile clean;
+
+Prediction_unit_library			: Prediction_unit_library_only
+					@\
+					$(MAKE) Behavioural_library;			\
+					$(MAKE) Branch_Target_Buffer_library;		\
+					$(MAKE) Direction_library;			\
+					$(MAKE) Return_Address_Stack_library;		\
+					$(MAKE) Update_Prediction_Table_library;	\
+					$(MAKE) Prediction_unit_Glue_library;
+
+Prediction_unit_library_clean		: Prediction_unit_library_clean_only
+					@\
+					$(MAKE) Behavioural_library_clean;		\
+					$(MAKE) Branch_Target_Buffer_library_clean;	\
+					$(MAKE) Direction_library_clean;		\
+					$(MAKE) Return_Address_Stack_library_clean;	\
+					$(MAKE) Update_Prediction_Table_library_clean;	\
+					$(MAKE) Prediction_unit_Glue_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/Makefile.deps	(revision 142)
@@ -11,28 +11,31 @@
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
 #-----[ Directory ]----------------------------------------
 
-Prediction_unit_Glue_DIR			=	$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue
+Prediction_unit_Glue_DIR		=	$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue
 
 #-----[ Library ]------------------------------------------
 
 Prediction_unit_Glue_LIBRARY		= 	-lPrediction_unit_Glue	\
-					$(Behavioural_LIBRARY)	
-
-Prediction_unit_Glue_DIR_LIBRARY		=	-L$(Prediction_unit_Glue_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
+						$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Prediction_unit_Glue_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Prediction_unit_Glue_DIR) --makefile=Makefile;
+Prediction_unit_Glue_library_only       :
+					@\
+					$(MAKE) --directory=$(Prediction_unit_Glue_DIR) --makefile=Makefile;
 
-Prediction_unit_Glue_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Prediction_unit_Glue_DIR) --makefile=Makefile clean;
+Prediction_unit_Glue_library_clean_only	:
+					@\
+					$(MAKE) --directory=$(Prediction_unit_Glue_DIR) --makefile=Makefile clean;
+
+Prediction_unit_Glue_library		: Prediction_unit_Glue_library_only
+					@\
+					$(MAKE) Behavioural_library;
+
+Prediction_unit_Glue_library_clean	: Prediction_unit_Glue_library_clean_only
+					@\
+					$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Return_Address_Stack/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Return_Address_Stack/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Return_Address_Stack/Makefile.deps	(revision 142)
@@ -11,28 +11,31 @@
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
 #-----[ Directory ]----------------------------------------
 
-Return_Address_Stack_DIR			=	$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Return_Address_Stack
+Return_Address_Stack_DIR		=	$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Return_Address_Stack
 
 #-----[ Library ]------------------------------------------
 
 Return_Address_Stack_LIBRARY		= 	-lReturn_Address_Stack	\
-					$(Behavioural_LIBRARY)	
-
-Return_Address_Stack_DIR_LIBRARY		=	-L$(Return_Address_Stack_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
+						$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Return_Address_Stack_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Return_Address_Stack_DIR) --makefile=Makefile;
+Return_Address_Stack_library_only	:
+					@\
+					$(MAKE) --directory=$(Return_Address_Stack_DIR) --makefile=Makefile;
 
-Return_Address_Stack_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Return_Address_Stack_DIR) --makefile=Makefile clean;
+Return_Address_Stack_library_clean_only	:
+					@\
+					$(MAKE) --directory=$(Return_Address_Stack_DIR) --makefile=Makefile clean;
+
+Return_Address_Stack_library		: Return_Address_Stack_library_only
+					@\
+					$(MAKE) Behavioural_library;
+
+Return_Address_Stack_library_clean	: Return_Address_Stack_library_clean_only
+					@\
+					$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/Makefile.deps	(revision 142)
@@ -8,8 +8,8 @@
 # DIR_MORPHEO must be defined
 
-Update_Prediction_Table			= yes
+Update_Prediction_Table				= yes
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include						$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
@@ -20,19 +20,22 @@
 #-----[ Library ]------------------------------------------
 
-Update_Prediction_Table_LIBRARY		= 	-lUpdate_Prediction_Table	\
-					$(Behavioural_LIBRARY)
-
-Update_Prediction_Table_DIR_LIBRARY		=	-L$(Update_Prediction_Table_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
+Update_Prediction_Table_LIBRARY			= 	-lUpdate_Prediction_Table	\
+							$(Behavioural_LIBRARY)
 
 #-----[ Rules ]--------------------------------------------
 
-Update_Prediction_Table_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Update_Prediction_Table_DIR) --makefile=Makefile;
+Update_Prediction_Table_library_only		:
+						@\
+						$(MAKE) --directory=$(Update_Prediction_Table_DIR) --makefile=Makefile;
 
-Update_Prediction_Table_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Update_Prediction_Table_DIR) --makefile=Makefile clean;
+Update_Prediction_Table_library_clean_only	:
+						@\
+						$(MAKE) --directory=$(Update_Prediction_Table_DIR) --makefile=Makefile clean;
+
+Update_Prediction_Table_library			: Update_Prediction_Table_library_only
+						@\
+						$(MAKE) Behavioural_library;
+
+Update_Prediction_Table_library_clean		: Update_Prediction_Table_library_clean_only
+						@\
+						$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/Makefile.deps	(revision 142)
@@ -27,19 +27,21 @@
 					$(Behavioural_LIBRARY)	
 
-Commit_unit_DIR_LIBRARY		=	-L$(Commit_unit_DIR)/lib	\
-					$(Priority_DIR_LIBRARY)		\
-					$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Commit_unit_library		:
+Commit_unit_library_only	:
+				@\
+				$(MAKE) --directory=$(Commit_unit_DIR) --makefile=Makefile;
+
+Commit_unit_library_clean_only	:
+				@\
+				$(MAKE) --directory=$(Commit_unit_DIR) --makefile=Makefile clean;
+
+Commit_unit_library		: Commit_unit_library_only
 				@\
 				$(MAKE) Behavioural_library;		\
-				$(MAKE) Priority_library;		\
-				$(MAKE) --directory=$(Commit_unit_DIR) --makefile=Makefile;
+				$(MAKE) Priority_library;
 
-Commit_unit_library_clean	:
+Commit_unit_library_clean	: Commit_unit_library_clean_only
 				@\
 				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) Priority_library_clean;		\
-				$(MAKE) --directory=$(Commit_unit_DIR) --makefile=Makefile clean;
+				$(MAKE) Priority_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Commit_unit.h
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Commit_unit.h	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Commit_unit.h	(revision 142)
@@ -35,5 +35,4 @@
 namespace morpheo {
 namespace behavioural {
-
 namespace core {
 namespace multi_ooo_engine {
@@ -41,4 +40,7 @@
 namespace commit_unit {
 
+#ifdef STATISTICS
+  typedef std::map<uint32_t,uint32_t> stat_inst_fusion_t;
+#endif
 
   class Commit_unit 
@@ -71,4 +73,9 @@
   public    : counter_t                     ** _stat_nb_cycle_state_event         ;//[nb_thread]
   public    : counter_t                     ** _stat_nb_cycle_state_wait_end      ;//[nb_thread]
+
+// public    : uint32_t                       * _stat_last_inst                    ;//[nb_thread]
+  public    : uint32_t                       * _stat_last_inst_type               ;//[nb_thread]
+  public    : uint32_t                       * _stat_last_inst_operation          ;//[nb_thread]
+  public    : stat_inst_fusion_t             * _stat_inst_fusion                  ;//[nb_thread]
 #endif
 
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_statistics_allocation.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_statistics_allocation.cpp	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_statistics_allocation.cpp	(revision 142)
@@ -8,4 +8,5 @@
 
 #include "Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Commit_unit.h"
+#include "Behavioural/include/Allocation.h"
 
 namespace morpheo {
@@ -169,20 +170,20 @@
       {
         _stat_nb_inst_insert [i] = _stat->create_counters("nb_inst_insert_"+toString(i),_param->_nb_inst_insert[i],"",
-                                                             _("Cycle number with %d instruction(s) included ")+toString(_("(rename_unit %d)."),i),
-                                                             _("Percent of cycle number with %d instruction(s) included ")+toString(_("(rename_unit %d)."),i),
-                                                             _("Average of instruction(s) included ")+toString(_("(rename_unit %d)."),i)
-                                                             );
+                                                          _("Cycle number with %d instruction(s) included ")+toString(_("(rename_unit %d)."),i),
+                                                          _("Percent of cycle number with %d instruction(s) included ")+toString(_("(rename_unit %d)."),i),
+                                                          _("Average of instruction(s) included ")+toString(_("(rename_unit %d)."),i)
+                                                          );
         
         _stat_nb_inst_retire [i] = _stat->create_counters("nb_inst_retire_"+toString(i),_param->_nb_inst_retire[i],"",
-                                                             _("Cycle number with %d instruction(s) removed ")+toString(_("(rename_unit %d)."),i),
-                                                             _("Percent of cycle number with %d instruction(s) removed ")+toString(_("(rename_unit %d)."),i),
-                                                             _("Average of instruction(s) removed ")+toString(_("(rename_unit %d)."),i)
-                                                             );
+                                                          _("Cycle number with %d instruction(s) removed ")+toString(_("(rename_unit %d)."),i),
+                                                          _("Percent of cycle number with %d instruction(s) removed ")+toString(_("(rename_unit %d)."),i),
+                                                          _("Average of instruction(s) removed ")+toString(_("(rename_unit %d)."),i)
+                                                          );
         
         _stat_nb_inst_commit [i] = _stat->create_counters("nb_inst_commit_"+toString(i),_param->_nb_inst_commit,"",
-                                                             _("Cycle number with %d instruction(s) commited ")+toString(_("(rename_unit %d)."),i),
-                                                             _("Percent of cycle number with %d instruction(s) commited ")+toString(_("(rename_unit %d)."),i),
-                                                             _("Average of instruction(s) commited "+toString(_("(rename_unit %d)."),i))
-                                                             );
+                                                          _("Cycle number with %d instruction(s) commited ")+toString(_("(rename_unit %d)."),i),
+                                                          _("Percent of cycle number with %d instruction(s) commited ")+toString(_("(rename_unit %d)."),i),
+                                                          _("Average of instruction(s) commited ")+toString(_("(rename_unit %d)."),i)
+                                                          );
 
         average_nb_inst_commit = "+ average_nb_inst_commit_"+toString(i) + " " + average_nb_inst_commit;
@@ -192,4 +193,17 @@
     _stat->create_expr_average_by_cycle("average_use_interface_commit_conflit_access","nb_inst_commit_conflit_access", "", _("Average access conflit by cycle on commit interface"));
     _stat->create_expr_percent         ("percent_use_interface_commit_conflit_access","average_use_interface_commit_conflit_access", average_nb_inst_commit, _("Percent access conflit on commit interface"));
+
+
+//  ALLOC1(_stat_last_inst          ,uint32_t          ,_param->_nb_thread);
+    ALLOC1(_stat_last_inst_type     ,uint32_t          ,_param->_nb_thread);
+    ALLOC1(_stat_last_inst_operation,uint32_t          ,_param->_nb_thread);
+    ALLOC1(_stat_inst_fusion        ,stat_inst_fusion_t,_param->_nb_thread);
+
+    for (uint32_t i=0; i<_param->_nb_thread; ++i)
+      {
+      //_stat_last_inst           [i] = INSTRUCTION_L_NOP;
+        _stat_last_inst_type      [i] = instruction_information(INSTRUCTION_L_NOP)._type     ;
+        _stat_last_inst_operation [i] = instruction_information(INSTRUCTION_L_NOP)._operation;
+      }
 
     log_end(Commit_unit,FUNCTION);
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_statistics_deallocation.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_statistics_deallocation.cpp	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_statistics_deallocation.cpp	(revision 142)
@@ -8,4 +8,6 @@
 
 #include "Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Commit_unit.h"
+#include "Behavioural/include/Allocation.h"
+#include "Common/include/BitManipulation.h"
 
 namespace morpheo {
@@ -41,4 +43,44 @@
     delete [] _stat_nb_inst_retire;
     delete [] _stat_nb_inst_commit;
+
+//  uint32_t mask_inst      = gen_mask<uint32_t>(SIZE_INSTRUCTION);
+    uint32_t mask_type      = gen_mask<uint32_t>(SIZE_TYPE       );
+    uint32_t mask_operation = gen_mask<uint32_t>(SIZE_OPERATION  );
+
+    for (uint32_t i=0; i<_param->_nb_thread; ++i)
+      for(stat_inst_fusion_t::iterator it = _stat_inst_fusion [i].begin();
+          it != _stat_inst_fusion [i].end();
+          ++it)
+        {
+          uint32_t value = it->second;
+
+          if (value != 0)
+            {
+              uint32_t inst = it->first;
+
+              type_t   type_0      = static_cast<type_t>((inst>>(SIZE_TYPE+2*SIZE_OPERATION))&mask_type     );
+              uint32_t operation_0 =                     (inst>>(SIZE_TYPE+  SIZE_OPERATION))&mask_operation ;
+              type_t   type_1      = static_cast<type_t>((inst>>(            SIZE_OPERATION))&mask_type     );
+              uint32_t operation_1 =                      inst                               &mask_operation ;
+
+              // log_printf(STAT,Commit_unit,FUNCTION,
+              msgInformation(
+                           //"  * %s - %s : %d\n"
+                           //,toString_instruction((inst>>SIZE_INSTRUCTION)&mask_inst).c_str()
+                           //,toString_instruction( inst                   &mask_inst).c_str(),value
+                             "  * %s.%s - %s.%s : %d\n"
+                             ,toString          (type_0            ).c_str()
+                             ,toString_operation(type_0,operation_0).c_str()
+                             ,toString          (type_1            ).c_str()
+                             ,toString_operation(type_1,operation_1).c_str()
+                             ,value
+                             );
+            }
+        }
+
+ // DELETE1(_stat_last_inst          ,_param->_nb_thread);
+    DELETE1(_stat_last_inst_type     ,_param->_nb_thread);
+    DELETE1(_stat_last_inst_operation,_param->_nb_thread);
+    DELETE1(_stat_inst_fusion        ,_param->_nb_thread);
         
     log_end(Commit_unit,FUNCTION);
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp	(revision 142)
@@ -770,11 +770,12 @@
                     can_continue = true;
 
-	            Tcontext_t  front_end_id = entry->front_end_id;
-	            Tcontext_t  context_id   = entry->context_id  ;
-	            uint32_t    num_thread   = _param->_translate_num_context_to_num_thread [front_end_id][context_id];
-	            rob_state_t state        = entry->state_old;
-	            Ttype_t     type         = entry->type        ;
-	            bool        retire_ok    = false;
-	            uint32_t    packet_id    = ((entry->ptr << _param->_shift_num_slot) | num_bank);
+	            Tcontext_t   front_end_id = entry->front_end_id;
+	            Tcontext_t   context_id   = entry->context_id  ;
+	            uint32_t     num_thread   = _param->_translate_num_context_to_num_thread [front_end_id][context_id];
+	            rob_state_t  state        = entry->state_old;
+	            Ttype_t      type         = entry->type        ;
+	            Toperation_t operation    = entry->operation   ;
+	            bool         retire_ok    = false;
+	            uint32_t     packet_id    = ((entry->ptr << _param->_shift_num_slot) | num_bank);
 	            
 	            log_printf(TRACE,Commit_unit,FUNCTION,"    * front_end_id : %d",front_end_id );
@@ -875,4 +876,16 @@
 	            	    (*_stat_nb_inst_instruction [instruction]) ++;
 	            	    (*_stat_nb_inst_type        [type]       ) ++;
+
+                          //uint32_t index = (_stat_last_inst [num_thread] << SIZE_INSTRUCTION) | instruction;
+                            uint32_t index = ((_stat_last_inst_type      [num_thread] << (SIZE_TYPE+2*SIZE_OPERATION)) |
+                                              (_stat_last_inst_operation [num_thread] << (SIZE_TYPE+  SIZE_OPERATION)) |
+                                              (                type                   << (            SIZE_OPERATION)) |
+                                              (                operation                                             ));
+
+                            _stat_inst_fusion [num_thread][index] ++;
+                            
+                          //_stat_last_inst           [num_thread] = instruction;
+                            _stat_last_inst_type      [num_thread] = type       ;
+                            _stat_last_inst_operation [num_thread] = operation  ;
 	            	  }
 	            	else
@@ -893,5 +906,5 @@
 			  << "{" << ((retire_ok)?"OK":"KO") << "} ";
 			
-			if ((type == TYPE_MEMORY) and  is_operation_memory_load(entry->operation))
+			if ((type == TYPE_MEMORY) and  is_operation_memory_load(operation))
 			  instruction_log_file [num_thread] << std::hex << entry->load_data << std::dec;
 			
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/Makefile.deps	(revision 142)
@@ -27,19 +27,21 @@
 					$(Behavioural_LIBRARY)	
 
-Issue_queue_DIR_LIBRARY		=	-L$(Issue_queue_DIR)/lib	\
-					$(Priority_DIR_LIBRARY)		\
-					$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Issue_queue_library		:
+Issue_queue_library_only	:
+				@\
+				$(MAKE) --directory=$(Issue_queue_DIR) --makefile=Makefile;
+
+Issue_queue_library_clean_only	:
+				@\
+				$(MAKE) --directory=$(Issue_queue_DIR) --makefile=Makefile clean;
+
+Issue_queue_library		: Issue_queue_library_only
 				@\
 				$(MAKE) Behavioural_library;		\
-				$(MAKE) Priority_library;		\
-				$(MAKE) --directory=$(Issue_queue_DIR) --makefile=Makefile;
+				$(MAKE) Priority_library;
 
-Issue_queue_library_clean	:
+Issue_queue_library_clean	: Issue_queue_library_clean_only
 				@\
 				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) Priority_library_clean;		\
-				$(MAKE) --directory=$(Issue_queue_DIR) --makefile=Makefile clean;
+				$(MAKE) Priority_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Makefile.deps	(revision 142)
@@ -47,16 +47,15 @@
 					$(Behavioural_LIBRARY)
 
-OOO_Engine_DIR_LIBRARY		=	-L$(OOO_Engine_DIR)/lib			\
-					$(Commit_unit_DIR_LIBRARY)		\
-					$(Issue_queue_DIR_LIBRARY)		\
-					$(Reexecute_unit_DIR_LIBRARY)		\
-					$(Rename_unit_DIR_LIBRARY)		\
-					$(Special_Register_unit_DIR_LIBRARY)	\
-					$(OOO_Engine_Glue_DIR_LIBRARY)		\
-					$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-OOO_Engine_library		:
+OOO_Engine_library_only		:
+				@\
+				$(MAKE) --directory=$(OOO_Engine_DIR) --makefile=Makefile;
+
+OOO_Engine_library_clean_only	:
+				@\
+				$(MAKE) --directory=$(OOO_Engine_DIR) --makefile=Makefile clean;
+
+OOO_Engine_library		: OOO_Engine_library_only
 				@\
 				$(MAKE) Behavioural_library;			\
@@ -66,8 +65,7 @@
 				$(MAKE) Rename_unit_library;			\
 				$(MAKE) Special_Register_unit_library;		\
-				$(MAKE) OOO_Engine_Glue_library;		\
-				$(MAKE) --directory=$(OOO_Engine_DIR) --makefile=Makefile;
+				$(MAKE) OOO_Engine_Glue_library;
 
-OOO_Engine_library_clean	:
+OOO_Engine_library_clean	: OOO_Engine_library_clean_only
 				@\
 				$(MAKE) Behavioural_library_clean;		\
@@ -77,4 +75,3 @@
 				$(MAKE) Rename_unit_library_clean;		\
 				$(MAKE) Special_Register_unit_library_clean;	\
-				$(MAKE) OOO_Engine_Glue_library_clean;		\
-				$(MAKE) --directory=$(OOO_Engine_DIR) --makefile=Makefile clean;
+				$(MAKE) OOO_Engine_Glue_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/Makefile.deps	(revision 142)
@@ -8,8 +8,8 @@
 # DIR_MORPHEO must be defined
 
-OOO_Engine_Glue			= yes
+OOO_Engine_Glue				= yes
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
@@ -20,19 +20,22 @@
 #-----[ Library ]------------------------------------------
 
-OOO_Engine_Glue_LIBRARY		= 	-lOOO_Engine_Glue	\
-					$(Behavioural_LIBRARY)	
-
-OOO_Engine_Glue_DIR_LIBRARY		=	-L$(OOO_Engine_Glue_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
+OOO_Engine_Glue_LIBRARY			= 	-lOOO_Engine_Glue	\
+						$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-OOO_Engine_Glue_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(OOO_Engine_Glue_DIR) --makefile=Makefile;
+OOO_Engine_Glue_library_only		:
+					@\
+					$(MAKE) --directory=$(OOO_Engine_Glue_DIR) --makefile=Makefile;
+                                	
+OOO_Engine_Glue_library_clean_only	:
+					@\
+					$(MAKE) --directory=$(OOO_Engine_Glue_DIR) --makefile=Makefile clean;
 
-OOO_Engine_Glue_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(OOO_Engine_Glue_DIR) --makefile=Makefile clean;
+OOO_Engine_Glue_library			: OOO_Engine_Glue_library_only
+					@\
+					$(MAKE) Behavioural_library;
+                                	
+OOO_Engine_Glue_library_clean		: OOO_Engine_Glue_library_clean_only
+					@\
+					$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Reexecute_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Reexecute_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Reexecute_unit/Makefile.deps	(revision 142)
@@ -8,38 +8,40 @@
 # DIR_MORPHEO must be defined
 
-Reexecute_unit			= yes
+Reexecute_unit				= yes
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 ifndef Priority
-include 			$(DIR_MORPHEO)/Behavioural/Generic/Priority/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Generic/Priority/Makefile.deps
 endif
 
 #-----[ Directory ]----------------------------------------
 
-Reexecute_unit_DIR		=	$(DIR_MORPHEO)/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Reexecute_unit
+Reexecute_unit_DIR			=	$(DIR_MORPHEO)/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Reexecute_unit
 
 #-----[ Library ]------------------------------------------
 
-Reexecute_unit_LIBRARY		= 	-lReexecute_unit		\
-					$(Priority_LIBRARY)		\
-					$(Behavioural_LIBRARY)	
-
-Reexecute_unit_DIR_LIBRARY	=	-L$(Reexecute_unit_DIR)/lib	\
-					$(Priority_DIR_LIBRARY)		\
-					$(Behavioural_DIR_LIBRARY)
+Reexecute_unit_LIBRARY			= 	-lReexecute_unit		\
+						$(Priority_LIBRARY)		\
+						$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Reexecute_unit_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) Priority_library;		\
-				$(MAKE) --directory=$(Reexecute_unit_DIR) --makefile=Makefile;
+Reexecute_unit_library_only		:
+					@\
+					$(MAKE) --directory=$(Reexecute_unit_DIR) --makefile=Makefile;
 
-Reexecute_unit_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) Priority_library_clean;		\
-				$(MAKE) --directory=$(Reexecute_unit_DIR) --makefile=Makefile clean;
+Reexecute_unit_library_clean_only	:
+					@\
+					$(MAKE) --directory=$(Reexecute_unit_DIR) --makefile=Makefile clean;
+
+Reexecute_unit_library			: Reexecute_unit_library_only
+					@\
+					$(MAKE) Behavioural_library;		\
+					$(MAKE) Priority_library;
+
+Reexecute_unit_library_clean		: Reexecute_unit_library_clean_only
+					@\
+					$(MAKE) Behavioural_library_clean;	\
+					$(MAKE) Priority_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/Makefile.deps	(revision 142)
@@ -8,8 +8,8 @@
 # DIR_MORPHEO must be defined
 
-Load_Store_pointer_unit			= yes
+Load_Store_pointer_unit				= yes
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 					$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
@@ -20,19 +20,22 @@
 #-----[ Library ]------------------------------------------
 
-Load_Store_pointer_unit_LIBRARY		= 	-lLoad_Store_pointer_unit	\
-					$(Behavioural_LIBRARY)	
-
-Load_Store_pointer_unit_DIR_LIBRARY		=	-L$(Load_Store_pointer_unit_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
+Load_Store_pointer_unit_LIBRARY			= 	-lLoad_Store_pointer_unit	\
+							$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Load_Store_pointer_unit_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Load_Store_pointer_unit_DIR) --makefile=Makefile;
+Load_Store_pointer_unit_library_only		:
+						@\
+						$(MAKE) --directory=$(Load_Store_pointer_unit_DIR) --makefile=Makefile;
 
-Load_Store_pointer_unit_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Load_Store_pointer_unit_DIR) --makefile=Makefile clean;
+Load_Store_pointer_unit_library_clean_only	:
+						@\
+						$(MAKE) --directory=$(Load_Store_pointer_unit_DIR) --makefile=Makefile clean;
+
+Load_Store_pointer_unit_library			: Load_Store_pointer_unit_library_only
+						@\
+						$(MAKE) Behavioural_library;
+
+Load_Store_pointer_unit_library_clean		: Load_Store_pointer_unit_library_clean_only
+						@\
+						$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Makefile.deps	(revision 142)
@@ -26,5 +26,4 @@
 endif
 
-
 #-----[ Directory ]----------------------------------------
 
@@ -32,6 +31,4 @@
 
 #-----[ Library ]------------------------------------------
-
-
 
 Rename_unit_LIBRARY		= 	-lRename_unit					\
@@ -42,14 +39,15 @@
 					$(Behavioural_LIBRARY)	
 
-Rename_unit_DIR_LIBRARY		=	-L$(Rename_unit_DIR)/lib			\
-					$(Load_Store_pointer_unit_DIR_LIBRARY)		\
-					$(Register_translation_unit_DIR_LIBRARY)	\
-					$(Rename_select_DIR_LIBRARY)			\
-					$(Rename_unit_Glue_DIR_LIBRARY)			\
-					$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Rename_unit_library		:
+Rename_unit_library_only	:
+				@\
+				$(MAKE) --directory=$(Rename_unit_DIR) --makefile=Makefile;
+
+Rename_unit_library_clean_only	:
+				@\
+				$(MAKE) --directory=$(Rename_unit_DIR) --makefile=Makefile clean;
+
+Rename_unit_library		: Rename_unit_library_only
 				@\
 				$(MAKE) Behavioural_library;			\
@@ -57,8 +55,7 @@
 				$(MAKE) Register_translation_unit_library;	\
 				$(MAKE) Rename_select_library;			\
-				$(MAKE) Rename_unit_Glue_library;		\
-				$(MAKE) --directory=$(Rename_unit_DIR) --makefile=Makefile;
+				$(MAKE) Rename_unit_Glue_library;
 
-Rename_unit_library_clean	:
+Rename_unit_library_clean	: Rename_unit_library_clean_only
 				@\
 				$(MAKE) Behavioural_library_clean;		\
@@ -66,4 +63,3 @@
 				$(MAKE) Register_translation_unit_library_clean;\
 				$(MAKE) Rename_select_library_clean;		\
-				$(MAKE) Rename_unit_Glue_library_clean;		\
-				$(MAKE) --directory=$(Rename_unit_DIR) --makefile=Makefile clean;
+				$(MAKE) Rename_unit_Glue_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/Makefile.deps	(revision 142)
@@ -11,5 +11,5 @@
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 					$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
@@ -21,18 +21,21 @@
 
 Dependency_checking_unit_LIBRARY		= 	-lDependency_checking_unit	\
-					$(Behavioural_LIBRARY)	
-
-Dependency_checking_unit_DIR_LIBRARY		=	-L$(Dependency_checking_unit_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
+							$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Dependency_checking_unit_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Dependency_checking_unit_DIR) --makefile=Makefile;
+Dependency_checking_unit_library_only		:
+						@\
+						$(MAKE) --directory=$(Dependency_checking_unit_DIR) --makefile=Makefile;
 
-Dependency_checking_unit_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Dependency_checking_unit_DIR) --makefile=Makefile clean;
+Dependency_checking_unit_library_clean_only	:
+						@\
+						$(MAKE) --directory=$(Dependency_checking_unit_DIR) --makefile=Makefile clean;
+
+Dependency_checking_unit_library		: Dependency_checking_unit_library_only
+						@\
+						$(MAKE) Behavioural_library;
+
+Dependency_checking_unit_library_clean		: Dependency_checking_unit_library_clean_only
+						@\
+						$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/Makefile.deps	(revision 142)
@@ -8,39 +8,41 @@
 # DIR_MORPHEO must be defined
 
-Free_List_unit			= yes
+Free_List_unit				= yes
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
 ifndef Priority
-include 			$(DIR_MORPHEO)/Behavioural/Generic/Priority/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Generic/Priority/Makefile.deps
 endif
 
 #-----[ Directory ]----------------------------------------
 
-Free_List_unit_DIR		=	$(DIR_MORPHEO)/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit
+Free_List_unit_DIR			=	$(DIR_MORPHEO)/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit
 
 #-----[ Library ]------------------------------------------
 
-Free_List_unit_LIBRARY		= 	-lFree_List_unit		\
-					$(Priority_LIBRARY)		\
-					$(Behavioural_LIBRARY)	
-
-Free_List_unit_DIR_LIBRARY	=	-L$(Free_List_unit_DIR)/lib	\
-					$(Priority_DIR_LIBRARY)		\
-					$(Behavioural_DIR_LIBRARY)
+Free_List_unit_LIBRARY			= 	-lFree_List_unit		\
+						$(Priority_LIBRARY)		\
+						$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Free_List_unit_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) Priority_library;		\
-				$(MAKE) --directory=$(Free_List_unit_DIR) --makefile=Makefile;
-
-Free_List_unit_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) Priority_library_clean;		\
-				$(MAKE) --directory=$(Free_List_unit_DIR) --makefile=Makefile clean;
+Free_List_unit_library_only		:
+					@\
+					$(MAKE) --directory=$(Free_List_unit_DIR) --makefile=Makefile;
+                                	
+Free_List_unit_library_clean_only	:
+					@\
+					$(MAKE) --directory=$(Free_List_unit_DIR) --makefile=Makefile clean;
+                                	
+Free_List_unit_library			: Free_List_unit_library_only
+					@\
+					$(MAKE) Behavioural_library;		\
+					$(MAKE) Priority_library;
+                                	
+Free_List_unit_library_clean		: Free_List_unit_library_clean_only
+					@\
+					$(MAKE) Behavioural_library_clean;	\
+					$(MAKE) Priority_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Makefile.deps	(revision 142)
@@ -29,6 +29,4 @@
 endif
 
-
-
 #-----[ Directory ]----------------------------------------
 
@@ -45,15 +43,15 @@
 							$(Register_translation_unit_Glue_LIBRARY)
 
-Register_translation_unit_DIR_LIBRARY		=	-L$(Register_translation_unit_DIR)/lib		\
-							$(Behavioural_DIR_LIBRARY)			\
-							$(Register_Address_Translation_unit_DIR_LIBRARY)\
-							$(Free_List_unit_DIR_LIBRARY)			\
-							$(Stat_List_unit_DIR_LIBRARY)			\
-							$(Dependency_checking_unit_DIR_LIBRARY)		\
-							$(Register_translation_unit_Glue_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Register_translation_unit_library		:
+Register_translation_unit_library_only		:
+						@\
+						$(MAKE) --directory=$(Register_translation_unit_DIR) --makefile=Makefile;
+
+Register_translation_unit_library_clean_only	:
+						@\
+						$(MAKE) --directory=$(Register_translation_unit_DIR) --makefile=Makefile clean;
+
+Register_translation_unit_library		: Register_translation_unit_library_only
 						@\
 						$(MAKE) Behavioural_library;				\
@@ -62,8 +60,7 @@
 						$(MAKE) Stat_List_unit_library;				\
 						$(MAKE) Dependency_checking_unit_library;		\
-						$(MAKE) Register_translation_unit_Glue_library;		\
-						$(MAKE) --directory=$(Register_translation_unit_DIR) --makefile=Makefile;
+						$(MAKE) Register_translation_unit_Glue_library;
 
-Register_translation_unit_library_clean	:
+Register_translation_unit_library_clean		: Register_translation_unit_library_clean_only
 						@\
 						$(MAKE) Behavioural_library_clean;			\
@@ -72,4 +69,3 @@
 						$(MAKE) Stat_List_unit_library_clean;			\
 						$(MAKE) Dependency_checking_unit_library_clean;		\
-						$(MAKE) Register_translation_unit_Glue_library_clean;	\
-						$(MAKE) --directory=$(Register_translation_unit_DIR) --makefile=Makefile clean;
+						$(MAKE) Register_translation_unit_Glue_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_Address_Translation_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_Address_Translation_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_Address_Translation_unit/Makefile.deps	(revision 142)
@@ -11,5 +11,5 @@
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 						$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
@@ -21,18 +21,21 @@
 
 Register_Address_Translation_unit_LIBRARY		= 	-lRegister_Address_Translation_unit	\
-					$(Behavioural_LIBRARY)	
-
-Register_Address_Translation_unit_DIR_LIBRARY		=	-L$(Register_Address_Translation_unit_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
+								$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Register_Address_Translation_unit_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Register_Address_Translation_unit_DIR) --makefile=Makefile;
+Register_Address_Translation_unit_library_only		:
+							@\
+							$(MAKE) --directory=$(Register_Address_Translation_unit_DIR) --makefile=Makefile;
 
-Register_Address_Translation_unit_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Register_Address_Translation_unit_DIR) --makefile=Makefile clean;
+Register_Address_Translation_unit_library_clean_only	:
+							@\
+							$(MAKE) --directory=$(Register_Address_Translation_unit_DIR) --makefile=Makefile clean;
+
+Register_Address_Translation_unit_library		: Register_Address_Translation_unit_library_only
+							@\
+							$(MAKE) Behavioural_library;
+
+Register_Address_Translation_unit_library_clean		: Register_Address_Translation_unit_library_clean_only
+							@\
+							$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/Makefile.deps	(revision 142)
@@ -8,8 +8,8 @@
 # DIR_MORPHEO must be defined
 
-Register_translation_unit_Glue			= yes
+Register_translation_unit_Glue				= yes
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 						$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
@@ -20,19 +20,22 @@
 #-----[ Library ]------------------------------------------
 
-Register_translation_unit_Glue_LIBRARY		= 	-lRegister_translation_unit_Glue	\
-					$(Behavioural_LIBRARY)	
-
-Register_translation_unit_Glue_DIR_LIBRARY		=	-L$(Register_translation_unit_Glue_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
+Register_translation_unit_Glue_LIBRARY			= 	-lRegister_translation_unit_Glue	\
+								$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Register_translation_unit_Glue_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Register_translation_unit_Glue_DIR) --makefile=Makefile;
+Register_translation_unit_Glue_library_only		:
+							@\
+							$(MAKE) --directory=$(Register_translation_unit_Glue_DIR) --makefile=Makefile;
 
-Register_translation_unit_Glue_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Register_translation_unit_Glue_DIR) --makefile=Makefile clean;
+Register_translation_unit_Glue_library_clean_only	:
+							@\
+							$(MAKE) --directory=$(Register_translation_unit_Glue_DIR) --makefile=Makefile clean;
+
+Register_translation_unit_Glue_library			: Register_translation_unit_Glue_library_only
+							@\
+							$(MAKE) Behavioural_library;
+
+Register_translation_unit_Glue_library_clean		: Register_translation_unit_Glue_library_clean_only
+							@\
+							$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Stat_List_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Stat_List_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Stat_List_unit/Makefile.deps	(revision 142)
@@ -8,8 +8,8 @@
 # DIR_MORPHEO must be defined
 
-Stat_List_unit			= yes
+Stat_List_unit				= yes
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
@@ -20,19 +20,22 @@
 #-----[ Library ]------------------------------------------
 
-Stat_List_unit_LIBRARY		= 	-lStat_List_unit	\
-					$(Behavioural_LIBRARY)	
-
-Stat_List_unit_DIR_LIBRARY		=	-L$(Stat_List_unit_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
+Stat_List_unit_LIBRARY			= 	-lStat_List_unit	\
+						$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Stat_List_unit_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Stat_List_unit_DIR) --makefile=Makefile;
+Stat_List_unit_library_only		:
+					@\
+					$(MAKE) --directory=$(Stat_List_unit_DIR) --makefile=Makefile;
 
-Stat_List_unit_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Stat_List_unit_DIR) --makefile=Makefile clean;
+Stat_List_unit_library_clean_only	:
+					@\
+					$(MAKE) --directory=$(Stat_List_unit_DIR) --makefile=Makefile clean;
+
+Stat_List_unit_library			: Stat_List_unit_library_only
+					@\
+					$(MAKE) Behavioural_library;
+
+Stat_List_unit_library_clean		: Stat_List_unit_library_clean_only
+					@\
+					$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Rename_select/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Rename_select/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Rename_select/Makefile.deps	(revision 142)
@@ -27,19 +27,21 @@
 					$(Behavioural_LIBRARY)	
 
-Rename_select_DIR_LIBRARY	=	-L$(Rename_select_DIR)/lib	\
-					$(Priority_DIR_LIBRARY)		\
-					$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Rename_select_library		:
+Rename_select_library_only	:
+				@\
+				$(MAKE) --directory=$(Rename_select_DIR) --makefile=Makefile;
+
+Rename_select_library_clean_only:
+				@\
+				$(MAKE) --directory=$(Rename_select_DIR) --makefile=Makefile clean;
+
+Rename_select_library		: Rename_select_library_only
 				@\
 				$(MAKE) Behavioural_library;		\
-				$(MAKE) Priority_library;		\
-				$(MAKE) --directory=$(Rename_select_DIR) --makefile=Makefile;
+				$(MAKE) Priority_library;
 
-Rename_select_library_clean	:
+Rename_select_library_clean	: Rename_select_library_clean_only
 				@\
 				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) Priority_library_clean;		\
-				$(MAKE) --directory=$(Rename_select_DIR) --makefile=Makefile clean;
+				$(MAKE) Priority_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Rename_unit_Glue/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Rename_unit_Glue/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Rename_unit_Glue/Makefile.deps	(revision 142)
@@ -11,5 +11,5 @@
 
 ifndef Behavioural
-include 			$(DIR_MORPHEO)/Behavioural/Makefile.deps
+include 				$(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
@@ -21,18 +21,21 @@
 
 Rename_unit_Glue_LIBRARY		= 	-lRename_unit_Glue	\
-					$(Behavioural_LIBRARY)	
-
-Rename_unit_Glue_DIR_LIBRARY		=	-L$(Rename_unit_Glue_DIR)/lib	\
-					$(Behavioural_DIR_LIBRARY)
+						$(Behavioural_LIBRARY)	
 
 #-----[ Rules ]--------------------------------------------
 
-Rename_unit_Glue_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Rename_unit_Glue_DIR) --makefile=Makefile;
+Rename_unit_Glue_library_only		:
+					@\
+					$(MAKE) --directory=$(Rename_unit_Glue_DIR) --makefile=Makefile;
 
-Rename_unit_Glue_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Rename_unit_Glue_DIR) --makefile=Makefile clean;
+Rename_unit_Glue_library_clean_only	:
+					@\
+					$(MAKE) --directory=$(Rename_unit_Glue_DIR) --makefile=Makefile clean;
+
+Rename_unit_Glue_library		: Rename_unit_Glue_library_only
+					@\
+					$(MAKE) Behavioural_library;
+
+Rename_unit_Glue_library_clean		: Rename_unit_Glue_library_clean_only
+					@\
+					$(MAKE) Behavioural_library_clean;
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Special_Register_unit/Makefile.deps
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Special_Register_unit/Makefile.deps	(revision 141)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Special_Register_unit/Makefile.deps	(revision 142)
@@ -23,16 +23,19 @@
 						$(Behavioural_LIBRARY)	
 
-Special_Register_unit_DIR_LIBRARY	=	-L$(Special_Register_unit_DIR)/lib	\
-						$(Behavioural_DIR_LIBRARY)
-
 #-----[ Rules ]--------------------------------------------
 
-Special_Register_unit_library		:
-				@\
-				$(MAKE) Behavioural_library;		\
-				$(MAKE) --directory=$(Special_Register_unit_DIR) --makefile=Makefile;
+Special_Register_unit_library_only	:
+					@\
+					$(MAKE) --directory=$(Special_Register_unit_DIR) --makefile=Makefile;
 
-Special_Register_unit_library_clean	:
-				@\
-				$(MAKE) Behavioural_library_clean;	\
-				$(MAKE) --directory=$(Special_Register_unit_DIR) --makefile=Makefile clean;
+Special_Register_unit_library_clean_only:
+					@\
+					$(MAKE) --directory=$(Special_Register_unit_DIR) --makefile=Makefile clean;
+
+Special_Register_unit_library		: Special_Register_unit_library_only
+					@\
+					$(MAKE) Behavioural_library;
+
+Special_Register_unit_library_clean	: Special_Register_unit_library_clean_only
+					@\
+					$(MAKE) Behavioural_library_clean;
