Index: trunk/IPs/systemC/Environment/Makefile.Environment
===================================================================
--- trunk/IPs/systemC/Environment/Makefile.Environnement	(revision 80)
+++ trunk/IPs/systemC/Environment/Makefile.Environment	(revision 81)
@@ -1,3 +1,4 @@
 include                         $(MORPHEO_TOPLEVEL)/Makefile.tools
+include                         $(MORPHEO_IPS)/processor/Morpheo/Behavioural/Makefile.flags 
 
 #-----[ Directory ]----------------------------------------
@@ -10,13 +11,17 @@
 #-----[ Compilation ]--------------------------------------
 INCDIR 				= $(SYSTEMC_INCDIR_$(SIMULATOR)) 	\
-				  -I$(DIR_INC) 
+				  -I$(DIR_INC)				\
+				  -I../processor/Morpheo
 
-LIBDIR 				= 
+LIBDIR 				= $(SYSTEMC_LIBDIR_$(SIMULATOR))
 
-FLAGS				= $(SYSTEMC_CFLAGS_$(SIMULATOR))	\
-				  $(CXX_FLAGS)
+LIBNAME  			= $(SYSTEMC_LIBNAME_$(SIMULATOR)) 	\
+				  -lbfd
 
-CFLAGS				= $(MORPHEO_FLAGS) $(FLAGS) $(INCDIR)
-LFLAGS				= $(MORPHEO_FLAGS) $(FLAGS) $(LIBDIR)
+FLAGS				= $(SYSTEMC_CFLAGS_$(SIMULATOR))
+
+MORPHEO_CC_FLAGS		= $(MORPHEO_FLAGS) $(CC_FLAGS)           $(INCDIR)
+MORPHEO_CXX_FLAGS		= $(MORPHEO_FLAGS) $(CXX_FLAGS) $(FLAGS) $(INCDIR) 
+MORPHEO_L_FLAGS			= $(MORPHEO_FLAGS) $(CXX_FLAGS) $(FLAGS) $(LIBDIR)
 
 #-----[ Variable ]-----------------------------------------
@@ -24,5 +29,6 @@
 ENTITY				= `$(BASENAME) $$PWD`
 
-OBJECTS				= $(patsubst $(DIR_SRC)/%.cpp,$(DIR_OBJ)/%.o,$(wildcard $(DIR_SRC)/*.cpp))
+OBJECTS				= $(patsubst $(DIR_SRC)/%.cpp,$(DIR_OBJ)/%.o,$(wildcard $(DIR_SRC)/*.cpp)) \
+				  $(patsubst $(DIR_SRC)/%.c,$(DIR_OBJ)/%.o,$(wildcard $(DIR_SRC)/*.c))
 OBJECTS_BIN			= $(patsubst $(DIR_TST)/%.cpp,$(DIR_OBJ)/%.o,$(wildcard $(DIR_TST)/*.cpp))
 
@@ -31,4 +37,7 @@
 EXE				= $(DIR_BIN)/soft.x
 
+EXEC_PREFIX			= 
+#$(VALGRIND) 
+
 #-----[ Rules ]--------------------------------------------
 
@@ -36,20 +45,26 @@
 
 test_env			:
-				@$(ECHO) "-------------------[ $(ENTITY) ]"
+				@\
+				$(ECHO) "-------------------| $(ENTITY)"
 
 $(DIR_OBJ)/%.o			: $(DIR_SRC)/%.cpp $(HEADERS)
 				@\
 				$(ECHO) "Compilation        : $*";\
-				$(CXX) $(CFLAGS) -c -o $@ $<;
+				$(DISTCXX) $(MORPHEO_CXX_FLAGS) -c -o $@ $<;
+
+$(DIR_OBJ)/%.o			: $(DIR_SRC)/%.c $(HEADERS)
+				@\
+				$(ECHO) "Compilation        : $*";\
+				$(DISTCC)  $(MORPHEO_CC_FLAGS)  -c -o $@ $<;
 
 $(DIR_OBJ)/%.o			: $(DIR_TST)/%.cpp $(HEADERS)
 				@\
 				$(ECHO) "Compilation        : $*";\
-				$(CXX) $(CFLAGS) -c -o $@ $<;
+				$(DISTCXX) $(MORPHEO_CXX_FLAGS) -c -o $@ $<;
 
 $(DIR_BIN)/%.x			: $(OBJECTS_DEPS) $(OBJECTS) $(OBJECTS_BIN)
 				\
 				$(ECHO) "Compilation        : $*";\
-				$(CXX) $(LFLAGS)    -o $@ $^;
+				$(CXX) $(MORPHEO_L_FLAGS)      -o $@ $^ $(LIBNAME);
 
 $(DIR_OBJ)			:
@@ -64,9 +79,10 @@
 
 
-exe				: all_environment
+exe				: all
 				@\
-				$(VALGRIND) ./$(EXE)
+				export SYSTEMC=$(SYSTEMC_$(SIMULATOR)) ; $(EXEC_PREFIX) ./$(EXE) $(SYSTEMC_EXEC_PARAMS_$(SIMULATOR))
 
-all_environment		: test_env $(DIR_OBJ) $(DIR_BIN)
+
+all_environment			: test_env $(DIR_OBJ) $(DIR_BIN)
 				@\
 				$(MAKE) $(EXE)
@@ -80,5 +96,7 @@
 					$(DIR_TST)/*~	\
 					$(DIR_SRC)/*~	\
-					$(DIR_INC)/*~;
+					$(DIR_INC)/*~	\
+					*.dot		\
+					*.txt;
 
 environment_help		:
