Index: trunk/IPs/systemC/Environment/Cache/Makefile
===================================================================
--- trunk/IPs/systemC/Environment/Cache/Makefile	(revision 112)
+++ trunk/IPs/systemC/Environment/Cache/Makefile	(revision 113)
@@ -1,12 +1,2 @@
-#-----[ Directory ]----------------------------------------
-
-DIR_QUEUE			= ../Queue
-
-#-----[ Variable ]-----------------------------------------
-
-ENTITY                         ?= Cache
-
-OBJECTS_DEPS			= $(patsubst $(DIR_QUEUE)/$(DIR_SRC)/%.cpp,$(DIR_QUEUE)/$(DIR_OBJ)/%.o,$(wildcard $(DIR_QUEUE)/$(DIR_SRC)/*.cpp))
-
 #-----[ Rules ]--------------------------------------------
 
@@ -26,3 +16,4 @@
 				@$(MAKE) environment_help
 
-include                         ../Makefile.Environment
+include                         Makefile.defs
+include                         $(DIR_ENVIRONMENT)/Makefile.Environment
Index: trunk/IPs/systemC/Environment/Cache/Makefile.defs
===================================================================
--- trunk/IPs/systemC/Environment/Cache/Makefile.defs	(revision 113)
+++ trunk/IPs/systemC/Environment/Cache/Makefile.defs	(revision 113)
@@ -0,0 +1,14 @@
+#-----[ Directory ]----------------------------------------
+
+DIR_ENVIRONMENT                ?= ..
+DIR_QUEUE                      := $(DIR_ENVIRONMENT)/Queue
+
+include                         $(DIR_QUEUE)/Makefile.defs
+
+#-----[ Variable ]-----------------------------------------
+
+ENTITY                         := Cache
+
+include                         $(DIR_ENVIRONMENT)/Makefile.defs
+
+Cache_OBJECTS_DEPS             := $(OBJECTS) $(Queue_OBJECTS_DEPS)
Index: trunk/IPs/systemC/Environment/Data/Makefile
===================================================================
--- trunk/IPs/systemC/Environment/Data/Makefile	(revision 112)
+++ trunk/IPs/systemC/Environment/Data/Makefile	(revision 113)
@@ -1,25 +1,9 @@
-#-----[ Directory ]----------------------------------------
-
-# DIR_ENDIANNESS			= ../Endianness
-
-#-----[ Variable ]-----------------------------------------
-
-ENTITY                         ?= Data
-
-# OBJECTS_DEPS			= $(patsubst $(DIR_ENDIANNESS)/$(DIR_SRC)/%.cpp,$(DIR_ENDIANNESS)/$(DIR_OBJ)/%.o,$(wildcard $(DIR_ENDIANNESS)/$(DIR_SRC)/*.cpp))
-
 #-----[ Rules ]--------------------------------------------
 
 all				:
-				@\
-				$(MAKE) all_environment
-
-# 				$(MAKE) --directory=$(DIR_ENDIANNESS) all; \
+				@$(MAKE) all_environment
 
 clean				:
-				@\
-				$(MAKE) environment_clean
-
-# 				$(MAKE) --directory=$(DIR_ENDIANNESS) clean; \
+				@$(MAKE) environment_clean
 
 clean_all			: clean
@@ -28,3 +12,4 @@
 				@$(MAKE) environment_help
 
-include                         ../Makefile.Environment
+include				Makefile.defs
+include                         $(DIR_ENVIRONMENT)/Makefile.Environment
Index: trunk/IPs/systemC/Environment/Data/Makefile.defs
===================================================================
--- trunk/IPs/systemC/Environment/Data/Makefile.defs	(revision 113)
+++ trunk/IPs/systemC/Environment/Data/Makefile.defs	(revision 113)
@@ -0,0 +1,10 @@
+#-----[ Directory ]----------------------------------------
+DIR_ENVIRONMENT                 ?= ..
+
+#-----[ Variable ]-----------------------------------------
+
+ENTITY                          := Data
+
+include                         $(DIR_ENVIRONMENT)/Makefile.defs
+
+Data_OBJECTS_DEPS		:= $(OBJECTS)
Index: trunk/IPs/systemC/Environment/Endianness/Makefile
===================================================================
--- trunk/IPs/systemC/Environment/Endianness/Makefile	(revision 112)
+++ trunk/IPs/systemC/Environment/Endianness/Makefile	(revision 113)
@@ -1,10 +1,2 @@
-#-----[ Directory ]----------------------------------------
-
-#-----[ Variable ]-----------------------------------------
-
-ENTITY                         ?= Endianness
-
-#OBJECTS_DEPS			=
-
 #-----[ Rules ]--------------------------------------------
 
@@ -22,3 +14,4 @@
 				@$(MAKE) environment_help
 
-include                         ../Makefile.Environment
+include                         Makefile.defs
+include                         $(DIR_ENVIRONMENT)/Makefile.Environment
Index: trunk/IPs/systemC/Environment/Endianness/Makefile.defs
===================================================================
--- trunk/IPs/systemC/Environment/Endianness/Makefile.defs	(revision 113)
+++ trunk/IPs/systemC/Environment/Endianness/Makefile.defs	(revision 113)
@@ -0,0 +1,11 @@
+#-----[ Directory ]----------------------------------------
+
+DIR_ENVIRONMENT                   ?= ..
+
+#-----[ Variable ]-----------------------------------------
+
+ENTITY                            := Endianness
+
+include                           $(DIR_ENVIRONMENT)/Makefile.defs
+
+Endianness_OBJECTS_DEPS		  := $(OBJECTS)
Index: trunk/IPs/systemC/Environment/Makefile
===================================================================
--- trunk/IPs/systemC/Environment/Makefile	(revision 112)
+++ trunk/IPs/systemC/Environment/Makefile	(revision 113)
@@ -1,69 +1,65 @@
+ifeq ($(origin MORPHEO_TMP), undefined)
+	$(error "variable MORPHEO_TMP      is undefined");
+endif
+
 #-----[ Directory ]----------------------------------------
+DIR_LIB				= $(DIR_TMP)/lib
+DIR_ENVIRONMENT			= .
+DIR_CACHE			= Cache
+DIR_DATA			= Data
+DIR_ENDIANNESS			= Endianness
+DIR_QUEUE			= Queue
+DIR_RAMLOCK			= RamLock
+DIR_SIM2OS			= Sim2OS
+DIR_TTY   			= TTY
 
-DIR_LIB				= ./lib
-DIR_CACHE			= ./Cache
-DIR_DATA			= ./Data
-DIR_ENDIANNESS			= ./Endianness
-DIR_QUEUE			= ./Queue
-DIR_RAMLOCK			= ./RamLock
-DIR_SIM2OS			= ./Sim2OS
-DIR_TTY   			= ./TTY
+include $(DIR_CACHE)/Makefile.defs
+include $(DIR_DATA)/Makefile.defs
+include $(DIR_ENDIANNESS)/Makefile.defs
+include $(DIR_QUEUE)/Makefile.defs
+include $(DIR_RAMLOCK)/Makefile.defs
+include $(DIR_SIM2OS)/Makefile.defs
+include $(DIR_TTY)/Makefile.defs
 
 #-----[ Variable ]-----------------------------------------
-ENTITY                         ?=	Environment
 
-LIBRARY_NAME			= Environment
-LIBRARY_FILE			= $(DIR_LIB)/lib$(LIBRARY_NAME).a
+ENTITY                          := Environment
+DIR_SRC				 = $(DIR_ENVIRONMENT)/src
 
-OBJECTS_DEPS			= 	$(patsubst $(DIR_CACHE)/$(DIR_SRC)/%.cpp,$(DIR_CACHE)/$(DIR_OBJ)/%.o,$(wildcard $(DIR_CACHE)/$(DIR_SRC)/*.cpp))			\
-					$(patsubst $(DIR_DATA)/$(DIR_SRC)/%.cpp,$(DIR_DATA)/$(DIR_OBJ)/%.o,$(wildcard $(DIR_DATA)/$(DIR_SRC)/*.cpp))			\
-					$(patsubst $(DIR_DATA)/$(DIR_SRC)/%.c,$(DIR_DATA)/$(DIR_OBJ)/%.o,$(wildcard $(DIR_DATA)/$(DIR_SRC)/*.c))			\
-					$(patsubst $(DIR_ENDIANNESS)/$(DIR_SRC)/%.cpp,$(DIR_ENDIANNESS)/$(DIR_OBJ)/%.o,$(wildcard $(DIR_ENDIANNESS)/$(DIR_SRC)/*.cpp))	\
-					$(patsubst $(DIR_QUEUE)/$(DIR_SRC)/%.cpp,$(DIR_QUEUE)/$(DIR_OBJ)/%.o,$(wildcard $(DIR_QUEUE)/$(DIR_SRC)/*.cpp))			\
-					$(patsubst $(DIR_RAMLOCK)/$(DIR_SRC)/%.cpp,$(DIR_RAMLOCK)/$(DIR_OBJ)/%.o,$(wildcard $(DIR_RAMLOCK)/$(DIR_SRC)/*.cpp))		\
-					$(patsubst $(DIR_SIM2OS)/$(DIR_SRC)/%.cpp,$(DIR_SIM2OS)/$(DIR_OBJ)/%.o,$(wildcard $(DIR_SIM2OS)/$(DIR_SRC)/*.cpp)) 		\
-					$(patsubst $(DIR_TTY)/$(DIR_SRC)/%.cpp,$(DIR_TTY)/$(DIR_OBJ)/%.o,$(wildcard $(DIR_TTY)/$(DIR_SRC)/*.cpp))			
+include                          $(DIR_ENVIRONMENT)/Makefile.defs
 
+LIBRARY_NAME			:= $(ENTITY)
+LIBRARY_FILE			:= $(DIR_LIB)/lib$(LIBRARY_NAME).a
+
+Environment_OBJECTS_DEPS	:= 	$(OBJECTS) \
+					$(Cache_OBJECTS_DEPS) \
+					$(Data_OBJECTS_DEPS) \
+					$(Endianness_OBJECTS_DEPS) \
+					$(Queue_OBJECTS_DEPS) \
+					$(RamLock_OBJECTS_DEPS) \
+					$(Sim2OS_OBJECTS_DEPS) \
+					$(TTY_OBJECTS_DEPS)
 
 #-----[ Rules ]--------------------------------------------
 
-all				: a b c d e f g
+all				:
 				@\
 				$(MAKE) all_environment; \
+				$(MAKE) --directory=$(DIR_CACHE)      all; \
+				$(MAKE) --directory=$(DIR_DATA)       all; \
+				$(MAKE) --directory=$(DIR_ENDIANNESS) all; \
+				$(MAKE) --directory=$(DIR_QUEUE)      all; \
+				$(MAKE) --directory=$(DIR_RAMLOCK)    all; \
+				$(MAKE) --directory=$(DIR_SIM2OS)     all; \
+				$(MAKE) --directory=$(DIR_TTY)        all; \
 				$(MAKE) $(LIBRARY_FILE);
 
-a				:
-				@\
-				$(MAKE) --directory=$(DIR_CACHE)      all;
 
-b				:
-				@\
-				$(MAKE) --directory=$(DIR_DATA)       all;
-
-c				:
-				@\
-				$(MAKE) --directory=$(DIR_ENDIANNESS) all;
-
-d				:
-				@\
-				$(MAKE) --directory=$(DIR_QUEUE)      all;
-
-e				:
-				@\
-				$(MAKE) --directory=$(DIR_RAMLOCK)    all;
-
-f				:
-				@\
-				$(MAKE) --directory=$(DIR_SIM2OS)     all;
-
-g				:
-				@\
-				$(MAKE) --directory=$(DIR_TTY)        all;
-
-
-$(LIBRARY_FILE)			: $(OBJECTS_DEPS) $(OBJECTS) $(DIR_LIB)
+$(LIBRARY_FILE)			: $(Environment_OBJECTS_DEPS)
 				@\
 				$(ECHO) "Archive            : $@";\
-				$(AR)  -r $@ $(OBJECTS_DEPS) $(OBJECTS);\
+				$(ECHO) "Archive            : $@";\
+				$(MKDIR) $(DIR_LIB);\
+				$(AR)  -r $@ $(Environment_OBJECTS_DEPS);\
 				$(RANLIB) $@;
 
@@ -71,16 +67,24 @@
 				@\
 				$(ECHO) "Create directory   : $@";\
-				$(MKDIR) $@;
+				$(MKDIR) $@
 
 exe_all				:
 				@\
+				$(MAKE) --directory=$(DIR_CACHE)      clean; \
 				$(MAKE) --directory=$(DIR_CACHE)      exe; \
+				$(MAKE) --directory=$(DIR_DATA)       clean; \
 				$(MAKE) --directory=$(DIR_DATA)       exe; \
+				$(MAKE) --directory=$(DIR_ENDIANNESS) clean; \
 				$(MAKE) --directory=$(DIR_ENDIANNESS) exe; \
+				$(MAKE) --directory=$(DIR_QUEUE)      clean; \
 				$(MAKE) --directory=$(DIR_QUEUE)      exe; \
+				$(MAKE) --directory=$(DIR_RAMLOCK)    clean; \
 				$(MAKE) --directory=$(DIR_RAMLOCK)    exe; \
+				$(MAKE) --directory=$(DIR_SIM2OS)     clean; \
 				$(MAKE) --directory=$(DIR_SIM2OS)     exe; \
+				$(MAKE) --directory=$(DIR_TTY)        clean; \
 				$(MAKE) --directory=$(DIR_TTY)        exe; \
-				$(MAKE) exe; \
+				$(MAKE) clean; \
+				$(MAKE) exe;
 
 clean				:
Index: trunk/IPs/systemC/Environment/Makefile.Environment
===================================================================
--- trunk/IPs/systemC/Environment/Makefile.Environment	(revision 112)
+++ trunk/IPs/systemC/Environment/Makefile.Environment	(revision 113)
@@ -1,48 +1,3 @@
-ifeq ($(origin MORPHEO_TOPLEVEL), undefined)
-	$(error "variable MORPHEO_TOPLEVEL is undefined");
-else
-	include $(MORPHEO_TOPLEVEL)/Makefile.tools
-	include $(MORPHEO_TOPLEVEL)/Makefile.flags
-endif
-
-#-----[ Directory ]----------------------------------------
-ENTITY                         ?=	Environment
-
-DIR_TMP				=	$(MORPHEO_TMP)/$(ENTITY)
-DIR_TST                         = 	./selftest
-DIR_INC				= 	./include
-DIR_SRC				= 	./src
-DIR_OBJ				= 	./obj
-DIR_BIN				= 	$(DIR_TMP)/bin
-
-#-----[ Compilation ]--------------------------------------
-INCDIR 				= $(SYSTEMC_INCDIR_$(SIMULATOR)) 	\
-				  -I$(DIR_INC)				\
-				  -I../processor/Morpheo
-
-LIBDIR 				= $(SYSTEMC_LIBDIR_$(SIMULATOR))
-
-LIBNAME  			= -lbfd                                 \
-                                  -liberty                              \
-                                  $(SYSTEMC_LIBNAME_$(SIMULATOR)) 
-
-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 ]-----------------------------------------
-
-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))
-
-HEADERS  			= $(wildcard $(DIR_INC)/*.h)
-
-EXE				= $(DIR_BIN)/soft.x
-
-EXEC_PREFIX			= 
-#$(VALGRIND) 
+include Makefile.defs
 
 #-----[ Rules ]--------------------------------------------
@@ -53,5 +8,5 @@
 vpath	%.o	$(DIR_OBJ)
 
-.PRECIOUS			: $(DIR_OBJ)/%.o $(DIR_BIN)/%.x
+.PRECIOUS			: $(DIR_OBJ)/$(ENTITY)_%.o $(DIR_BIN)/%.x
 
 test_env			:
@@ -59,16 +14,16 @@
 				$(ECHO) "-------------------| $(ENTITY)"
 
-$(DIR_OBJ)/%.o			: %.cpp $(HEADERS)
+$(DIR_OBJ)/$(ENTITY)_%.o	: %.cpp $(HEADERS)
 				@\
 				$(ECHO) "Compilation        : $*";\
 				$(CXX) $(MORPHEO_CXX_FLAGS) -c -o $@ $<;
 
-$(DIR_OBJ)/%.o			: %.c $(HEADERS)
+$(DIR_OBJ)/$(ENTITY)_%.o        : %.c $(HEADERS)
 				@\
 				$(ECHO) "Compilation        : $*";\
 				$(CC)  $(MORPHEO_CC_FLAGS)  -c -o $@ $<;
 
-$(DIR_BIN)/%.x			: $(OBJECTS_DEPS) $(OBJECTS) $(OBJECTS_BIN)
-				\
+$(DIR_BIN)/%.x			: $($(ENTITY)_OBJECTS_DEPS) $(OBJECTS_BIN)
+				@\
 				$(ECHO) "Compilation        : $*";\
 				$(CXX) $(MORPHEO_L_FLAGS)      -o $@ $^ $(LIBNAME);
@@ -93,5 +48,5 @@
 all_environment			: test_env $(DIR_OBJ)
 				@\
-				$(MAKE) $(OBJECTS_DEPS) $(OBJECTS) $(OBJECTS_BIN)
+				$(MAKE) $($(ENTITY)_OBJECTS_DEPS) $(OBJECTS_BIN)
 
 environment_clean		:
Index: trunk/IPs/systemC/Environment/Makefile.defs
===================================================================
--- trunk/IPs/systemC/Environment/Makefile.defs	(revision 113)
+++ trunk/IPs/systemC/Environment/Makefile.defs	(revision 113)
@@ -0,0 +1,44 @@
+ifeq ($(origin MORPHEO_TOPLEVEL), undefined)
+	$(error "variable MORPHEO_TOPLEVEL is undefined");
+else
+	include $(MORPHEO_TOPLEVEL)/Makefile.tools
+	include $(MORPHEO_TOPLEVEL)/Makefile.flags
+endif
+
+#-----[ Directory ]----------------------------------------
+DIR_TMP				=	$(MORPHEO_TMP)
+DIR_TST                         = 	selftest
+DIR_INC				= 	include
+DIR_SRC				?= 	$(DIR_ENVIRONMENT)/$(ENTITY)/src
+DIR_OBJ				= 	$(MORPHEO_TMP)/obj
+DIR_BIN				= 	$(MORPHEO_TMP)/bin
+
+#-----[ Compilation ]--------------------------------------
+INCDIR 				= $(SYSTEMC_INCDIR_$(SIMULATOR)) 	\
+				  -I$(DIR_INC)				\
+				  -I../processor/Morpheo
+
+LIBDIR 				= $(SYSTEMC_LIBDIR_$(SIMULATOR))
+
+LIBNAME  			= -lbfd                                 \
+                                  -liberty                              \
+                                  $(SYSTEMC_LIBNAME_$(SIMULATOR)) 
+
+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 ]-----------------------------------------
+
+OBJECTS				= $(addprefix $(DIR_OBJ)/$(ENTITY)_, $(addsuffix .o, $(basename $(notdir $(wildcard $(DIR_SRC)/*.cpp))))) \
+				  $(addprefix $(DIR_OBJ)/$(ENTITY)_, $(addsuffix .o, $(basename $(notdir $(wildcard $(DIR_SRC)/*.c)))))
+OBJECTS_BIN			= $(addprefix $(DIR_OBJ)/$(ENTITY)_, $(addsuffix .o, $(basename $(notdir $(wildcard $(DIR_TST)/*.cpp)))))
+
+HEADERS  			= $(wildcard $(DIR_INC)/*.h)
+
+EXE				= $(DIR_BIN)/soft.x
+
+EXEC_PREFIX			= 
+#$(VALGRIND) 
Index: trunk/IPs/systemC/Environment/Makefile.deps
===================================================================
--- trunk/IPs/systemC/Environment/Makefile.deps	(revision 112)
+++ trunk/IPs/systemC/Environment/Makefile.deps	(revision 113)
@@ -17,3 +17,3 @@
 ENVIRONMENT_INCDIR		=	-I$(ENVIRONMENT_DIR)/include
 ENVIRONMENT_LIBDIR		=	-L$(ENVIRONMENT_DIR)/lib
-ENVIRONMENT_LIBNAME		=	-lEnvironment -lbfd -liberty 
+ENVIRONMENT_LIBNAME		=	-lEnvironment -lbfd -liberty
Index: trunk/IPs/systemC/Environment/Queue/Makefile
===================================================================
--- trunk/IPs/systemC/Environment/Queue/Makefile	(revision 112)
+++ trunk/IPs/systemC/Environment/Queue/Makefile	(revision 113)
@@ -1,6 +1,2 @@
-#-----[ Variables ]----------------------------------------
-
-ENTITY                         ?= Queue
-
 #-----[ Rules ]--------------------------------------------
 
@@ -16,3 +12,4 @@
 				@$(MAKE) environment_help
 
-include                         ../Makefile.Environment
+include                         Makefile.defs
+include                         $(DIR_ENVIRONMENT)/Makefile.Environment
Index: trunk/IPs/systemC/Environment/Queue/Makefile.defs
===================================================================
--- trunk/IPs/systemC/Environment/Queue/Makefile.defs	(revision 113)
+++ trunk/IPs/systemC/Environment/Queue/Makefile.defs	(revision 113)
@@ -0,0 +1,10 @@
+#-----[ Directory ]----------------------------------------
+DIR_ENVIRONMENT                 ?= ..
+
+#-----[ Variable ]-----------------------------------------
+
+ENTITY                          := Queue
+
+include                         $(DIR_ENVIRONMENT)/Makefile.defs
+
+Queue_OBJECTS_DEPS		:= $(OBJECTS)
Index: trunk/IPs/systemC/Environment/RamLock/Makefile
===================================================================
--- trunk/IPs/systemC/Environment/RamLock/Makefile	(revision 112)
+++ trunk/IPs/systemC/Environment/RamLock/Makefile	(revision 113)
@@ -1,6 +1,2 @@
-#-----[ Variables ]----------------------------------------
-
-ENTITY                         ?= RamLock
-
 #-----[ Rules ]--------------------------------------------
 
@@ -16,3 +12,4 @@
 				@$(MAKE) environment_help
 
-include                         ../Makefile.Environment
+include				Makefile.defs
+include                         $(DIR_ENVIRONMENT)/Makefile.Environment
Index: trunk/IPs/systemC/Environment/RamLock/Makefile.defs
===================================================================
--- trunk/IPs/systemC/Environment/RamLock/Makefile.defs	(revision 113)
+++ trunk/IPs/systemC/Environment/RamLock/Makefile.defs	(revision 113)
@@ -0,0 +1,9 @@
+#-----[ Directory ]----------------------------------------
+DIR_ENVIRONMENT                 ?= ..
+
+#-----[ Variable ]-----------------------------------------
+ENTITY                          := RamLock
+
+include                         $(DIR_ENVIRONMENT)/Makefile.defs
+
+RamLock_OBJECTS_DEPS		:= $(OBJECTS)
Index: trunk/IPs/systemC/Environment/Sim2OS/Makefile
===================================================================
--- trunk/IPs/systemC/Environment/Sim2OS/Makefile	(revision 112)
+++ trunk/IPs/systemC/Environment/Sim2OS/Makefile	(revision 113)
@@ -1,12 +1,2 @@
-#-----[ Directory ]----------------------------------------
-
-DIR_ENDIANNESS			= ../Endianness
-
-#-----[ Variable ]-----------------------------------------
-
-ENTITY                         ?= Sim2OS
-
-OBJECTS_DEPS			= $(patsubst $(DIR_ENDIANNESS)/$(DIR_SRC)/%.cpp,$(DIR_ENDIANNESS)/$(DIR_OBJ)/%.o,$(wildcard $(DIR_ENDIANNESS)/$(DIR_SRC)/*.cpp))
-
 #-----[ Rules ]--------------------------------------------
 
@@ -26,3 +16,5 @@
 				@$(MAKE) environment_help
 
-include                         ../Makefile.Environment
+include                         Makefile.defs
+include                         $(DIR_ENVIRONMENT)/Makefile.Environment
+
Index: trunk/IPs/systemC/Environment/Sim2OS/Makefile.defs
===================================================================
--- trunk/IPs/systemC/Environment/Sim2OS/Makefile.defs	(revision 113)
+++ trunk/IPs/systemC/Environment/Sim2OS/Makefile.defs	(revision 113)
@@ -0,0 +1,15 @@
+#-----[ Directory ]----------------------------------------
+
+DIR_ENVIRONMENT                  ?= ..
+DIR_ENDIANNESS			 := $(DIR_ENVIRONMENT)/Endianness
+
+include                          $(DIR_ENDIANNESS)/Makefile.defs
+
+#-----[ Variable ]-----------------------------------------
+
+ENTITY                           := Sim2OS
+
+include                          $(DIR_ENVIRONMENT)/Makefile.defs
+
+Sim2OS_OBJECTS_DEPS	         :=  $(Endianness_OBJECTS_DEPS) $(OBJECTS)
+
Index: trunk/IPs/systemC/Environment/TTY/Makefile
===================================================================
--- trunk/IPs/systemC/Environment/TTY/Makefile	(revision 112)
+++ trunk/IPs/systemC/Environment/TTY/Makefile	(revision 113)
@@ -1,20 +1,9 @@
-#-----[ Directory ]----------------------------------------
-
-#-----[ Variable ]-----------------------------------------
-
-ENTITY                         ?= TTY
-
-#OBJECTS_DEPS			=
-
 #-----[ Rules ]--------------------------------------------
 
 all				:
-				@\
-				$(MAKE) all_environment;
+				@$(MAKE) all_environment
 
 clean				:
-				@\
-				$(MAKE)  environment_clean;\
-				$(RM) tty_*;
+				@$(MAKE) environment_clean; $(RM) tty_*
 
 clean_all			: clean
Index: trunk/IPs/systemC/Environment/TTY/Makefile.defs
===================================================================
--- trunk/IPs/systemC/Environment/TTY/Makefile.defs	(revision 113)
+++ trunk/IPs/systemC/Environment/TTY/Makefile.defs	(revision 113)
@@ -0,0 +1,9 @@
+#-----[ Directory ]----------------------------------------
+DIR_ENVIRONMENT                 ?= ..
+
+#-----[ Variable ]-----------------------------------------
+ENTITY                          := TTY
+
+include                         $(DIR_ENVIRONMENT)/Makefile.defs
+
+TTY_OBJECTS_DEPS		:= $(OBJECTS)