Index: sources/test_regression/17022006/Makefile
===================================================================
--- sources/test_regression/17022006/Makefile	(revision 15)
+++ sources/test_regression/17022006/Makefile	(revision 55)
@@ -1,87 +1,14 @@
+
 include ../env.mk
+include ../Makefile.common
 
-SOCVIEW_INC    = ${SOCVIEW}/include
-SOCVIEW_LIB    = ${SOCVIEW}/lib-linux/libsystemc.a
-CFLAGS_SOCVIEW = ${CFLAGS} -DSOCVIEW -I${SOCVIEW_INC}
-LFLAGS_SOCVIEW = ${LFLAGS} -ltermcap -lreadline ${SOCVIEW_LIB}
+test : all
+	@echo -ne "| Testing $$(basename $$(pwd)): " ;
+	@./$(EXE_SCASS) > $(LOG_SCASS) 2> /dev/null
+	@./$(EXE_SC) > $(LOG_SC) 2> /dev/null
+	@if diff $(LOG_SC) $(LOG_SCASS) > /dev/null ; then \
+    echo "OK" ; \
+    else echo "KO" ; \
+    fi ;
 
-SYSTEM    = system.cpp
-EXE_SCASS = $(SYSTEM:.cpp=_systemcass.x)
-EXE_SC    = $(SYSTEM:.cpp=_systemc.x)
-EXE_SVIEW = $(SYSTEM:.cpp=_socview.x)
-EXE       = ${EXE_SCASS} ${EXE_SVIEW} ${EXE_SC}
-OBJECTS   = $(EXE:.x=.o)
-LINKS     = $(OBJECTS:.o=.cpp)
 
-TEST1_DAT = \
-           test_socview_1.dat test_socview_1_reloaded.dat   \
-           test_socview_2.dat test_socview_2_reloaded.dat   \
-           test_socview_3.dat test_socview_3_reloaded.dat   \
-           test_socview_3b.dat test_socview_3_reloaded_bis.dat   \
-           test_socview_4.dat test_socview_4_reloaded.dat   \
-           test_socview_5.dat test_socview_5_reloaded.dat   \
-           test_socview_6.dat test_socview_6_reloaded.dat   \
-           test_socview_7.dat test_socview_7_reloaded.dat   \
-           test_socview_8.dat test_socview_8_reloaded.dat   \
-           test_socview_9.dat test_socview_9_reloaded.dat   \
-           test_socview_10.dat test_socview_10_reloaded.dat \
-           test_socview_10b.dat \
-
-TEST2_DAT = test2_socview_10.dat \
-            test2_socview_24a.dat test2_socview_24b.dat test2_socview_24c.dat \
-            test2_socview_20a.dat test2_socview_20b.dat test2_systemcass_20.dat
-
-.SECONDARY:
-
-main : $(EXE)
-
-test : system_systemc.x system_systemcass.x system_socview.x
-	./system_systemc.x ; ./system_systemcass.x ;	./system_socview.x
-	
-%.gif : %.dot
-	dot -Tgif -o $*.gif $*.dot
-
-%_systemc.x : %_systemc.o $(SYSTEMC_LIB)
-	$(CXX) -o $@ $*_systemc.o $(LFLAGS_SYSTEMC)
-
-%_systemcass.x : %_systemcass.o  $(SYSTEMCASS_LIB)
-	$(CXX) -o $@ $*_systemcass.o $(LFLAGS_SYSTEMCASS)
-
-%_socview.x : %_socview.o  $(SOCVIEW_LIB)
-	$(CXX) -o $@ $*_socview.o $(LFLAGS_SOCVIEW)
-
--include Makefile.deps
-
-%_systemc.cpp : %.cpp 
-	ln -s $*.cpp $*_systemc.cpp
-
-%_systemcass.cpp : %.cpp 
-	ln -s $*.cpp $*_systemcass.cpp
-
-%_socview.cpp : %.cpp 
-	ln -s $*.cpp $*_socview.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
-
-%_socview.o : %_socview.cpp
-	$(CXX) $(CFLAGS_SOCVIEW) -MM $*_socview.cpp >> Makefile.deps
-	$(CXX) $(CFLAGS_SOCVIEW) -c $*_socview.cpp -o $*_socview.o
-
-clean :
-	rm -f Makefile.deps
-	-rm -f *.o gmon.out *~
-	-rm -f results
-	-rm -f signal_order.txt module_order.dot signal_graph.dot
-	-rm -f module_order.gif signal_graph.gif
-	-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 system_systemcass.x.vcd system_systemc.x.vcd
-