Index: sources/test_regression/11062007/Makefile
===================================================================
--- sources/test_regression/11062007/Makefile	(revision 15)
+++ sources/test_regression/11062007/Makefile	(revision 55)
@@ -1,69 +1,30 @@
+
 include ../env.mk
+RES1 = systemcass_a_nodynamiclink_10.txt
+RES2 = systemcass_p_nodynamiclink_10.txt
+RES3 = systemcass_m_nodynamiclink_10.txt
+RES4 = systemcass_dynamiclink_10.txt
+ERASE = $(RES1) $(RES2) $(RES3) $(RES4)
+include ../Makefile.common
 
-EXE_SCASS = system_systemcass.x
-EXE_SC    = system_systemc.x
-EXE       = ${EXE_SCASS}
-OBJECTS   = $(EXE:.x=.o)
-LINKS     = $(OBJECTS:.o=.cpp)
+test: $(SC_CASS)
+	@echo -ne "| Testing $$(basename $$(pwd)): " ;
+	@(./$(EXE_SCASS) --a --nodynamiclink 10 2> /dev/null ) | tail -n 5 > $(RES1)
+	@(./$(EXE_SCASS) --p --nodynamiclink 10 2> /dev/null ) | tail -n 5 > $(RES2)
+	@(./$(EXE_SCASS) --m --nodynamiclink 10 2> /dev/null ) | tail -n 5 > $(RES3)
+	@(./$(EXE_SCASS) 10 2> /dev/null ) | tail -n 5 > $(RES4)
+	@if diff $(RES1) $(RES2) > /dev/null ; then \
+		if diff $(RES1) $(RES3) > /dev/null ; then \
+			if diff $(RES1) $(RES4) > /dev/null ; then \
+				echo "OK" ; \
+			else \
+				echo "KO" ; \
+			fi ; \
+		else \
+			echo "KO" ; \
+		fi ; \
+	else \
+		echo "KO" ; \
+	fi ;
 
-RESULTS   = systemcass_dynamiclink_10.txt systemcass_m_nodynamiclink_10.txt systemcass_a_nodynamiclink_10.txt systemcass_p_nodynamiclink_10.txt
 
-.SECONDARY:
-
-main : $(EXE) 
-
-test : ${RESULTS}
-	diff systemcass_dynamiclink_10.txt systemcass_m_nodynamiclink_10.txt || eval ${failcom}
-	diff systemcass_a_nodynamiclink_10.txt systemcass_p_nodynamiclink_10.txt || eval ${failcom}
-	diff systemcass_dynamiclink_10.txt systemcass_a_nodynamiclink_10.txt || eval ${failcom}
-	@echo Test OK.
-
-systemcass_a_nodynamiclink_10.txt : system_systemcass.x
-	((./system_systemcass.x --nobanner --a --nodynamiclink 10 ) | tail -n 5  > systemcass_a_nodynamiclink_10.txt) || eval ${failcom}
-
-systemcass_p_nodynamiclink_10.txt : system_systemcass.x
-	((./system_systemcass.x --nobanner --p --nodynamiclink 10 ) | tail -n 5 > systemcass_p_nodynamiclink_10.txt) || eval ${failcom}
-
-systemcass_m_nodynamiclink_10.txt : system_systemcass.x
-	((./system_systemcass.x --nobanner --m --nodynamiclink 10 ) | tail -n 5  > systemcass_m_nodynamiclink_10.txt) || eval ${failcom}
-
-systemcass_dynamiclink_10.txt : system_systemcass.x
-	((./system_systemcass.x --nobanner 10 ) | tail -n 5 > systemcass_dynamiclink_10.txt) || eval ${failcom}
-
-%.png : %.dot
-	dot -Tpng -o $*.png $*.dot
-
-%_systemc.x : %_systemc.o $(SYSTEMC_LIB)
-	$(CXX) -o $@ $*_systemc.o $(LFLAGS_SYSTEMC) 2>&1 | $(CPPFILT)
-
-%_systemcass.x : %_systemcass.o  $(SYSTEMCASS_LIB)
-	$(CXX) -o $@ $*_systemcass.o $(LFLAGS_SYSTEMCASS) 2>&1 | $(CPPFILT)
-
--include Makefile.deps
-
-%_systemc.cpp : %.cpp 
-	ln -s $*.cpp $*_systemc.cpp
-
-%_systemcass.cpp : %.cpp 
-	ln -s $*.cpp $*_systemcass.cpp
-
-%_systemc.o : %_systemc.cpp 
-	$(CXX) $(CFLAGS_SYSTEMC) -MM $*_systemc.cpp >> Makefile.deps
-	$(CXX) $(CFLAGS_SYSTEMC) -c $*_systemc.cpp -o $*_systemc.o
-
-%_systemcass.o : %_systemcass.cpp
-	$(CXX) $(CFLAGS_SYSTEMCASS) -MM $*_systemcass.cpp >> Makefile.deps
-	$(CXX) $(CFLAGS_SYSTEMCASS) -c $*_systemcass.cpp -o $*_systemcass.o
-
-clean :
-	rm -f Makefile.deps
-	-rm -f *.o gmon.out
-	-rm -f signal_order.txt module_order.dot signal_graph.dot port_graph.dot
-	-rm -f module_graph.dot process_order.dot
-	-rm -f $(EXE) $(OBJECTS) 
-	-for i in $(LINKS) ; do unlink $$i ; done 2> /dev/null
-	-rm -f core*
-	-rm -rf generated_by_systemcass
-	-rm -rf tracesystem_systemcass.x.vcd tracesystem_systemc.x.vcd
-	-rm -rf ${RESULTS}
-