Index: src/consumers/Makefile
===================================================================
--- src/consumers/Makefile	(révision 4)
+++ src/consumers/Makefile	(révision 205)
@@ -1,84 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.2
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /usr/bin/ccmake
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/noularde/TSP/tsp_all/tsp
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/noularde/TSP/tsp_all/tsp
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Default target executed when no arguments are given to make.
-default_target: all
-
-# Special rule to run installation script.
-install: all
-	$(CMAKE_COMMAND) -P cmake_install.cmake
-
-# Special rule to re-run CMake using make.
-rebuild_cache:
-	@echo "Running CMake to regenerate build system..."
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Special rule to re-run CMake cache editor using make.
-edit_cache:
-	@echo "Running CMake cache editor..."
-	$(CMAKE_EDIT_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# The main all target
-all:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/clean
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-
-# Help Target
-help::
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... install"
-	@echo "... rebuild_cache"
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-
Index: src/consumers/tspfs/Makefile
===================================================================
--- src/consumers/tspfs/Makefile	(révision 4)
+++ src/consumers/tspfs/Makefile	(révision 205)
@@ -1,96 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.2
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /usr/bin/ccmake
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/noularde/TSP/tsp_all/tsp
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/noularde/TSP/tsp_all/tsp
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Default target executed when no arguments are given to make.
-default_target: all
-
-# Special rule to run installation script.
-install: all
-	$(CMAKE_COMMAND) -P cmake_install.cmake
-
-# Special rule to re-run CMake using make.
-rebuild_cache:
-	@echo "Running CMake to regenerate build system..."
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Special rule to re-run CMake cache editor using make.
-edit_cache:
-	@echo "Running CMake cache editor..."
-	$(CMAKE_EDIT_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# The main all target
-all:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/tspfs/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/tspfs/clean
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-
-# Convenience name for target.
-src/consumers/tspfs/CMakeFiles/tspfs.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/tspfs/CMakeFiles/tspfs.dir/rule
-
-# Convenience name for target.
-tspfs: src/consumers/tspfs/CMakeFiles/tspfs.dir/rule
-
-# target for object file
-tspfs.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/tspfs/CMakeFiles/tspfs.dir/build.make src/consumers/tspfs/CMakeFiles/tspfs.dir/tspfs.o
-
-# Help Target
-help::
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... install"
-	@echo "... rebuild_cache"
-	@echo "... tspfs"
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-
Index: src/consumers/tspfs/CMakeLists.txt
===================================================================
--- src/consumers/tspfs/CMakeLists.txt	(révision 4)
+++ src/consumers/tspfs/CMakeLists.txt	(révision 205)
@@ -2,4 +2,5 @@
 
 INCLUDE_DIRECTORIES( ${FUSE_INCLUDE_DIR} )
 ADD_EXECUTABLE(tspfs tspfs.c)
+TSP_PROGRAM_INSTALL(tspfs)
 TARGET_LINK_LIBRARIES(tspfs ${FUSE_LIBRARY} tsp_consumer tsp_common tsp_services)
Index: src/consumers/gdisp+/Makefile
===================================================================
--- src/consumers/gdisp+/Makefile	(révision 4)
+++ src/consumers/gdisp+/Makefile	(révision 205)
@@ -1,216 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.2
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /usr/bin/ccmake
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/noularde/TSP/tsp_all/tsp
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/noularde/TSP/tsp_all/tsp
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Default target executed when no arguments are given to make.
-default_target: all
-
-# Special rule to run installation script.
-install: all
-	$(CMAKE_COMMAND) -P cmake_install.cmake
-
-# Special rule to re-run CMake using make.
-rebuild_cache:
-	@echo "Running CMake to regenerate build system..."
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Special rule to re-run CMake cache editor using make.
-edit_cache:
-	@echo "Running CMake cache editor..."
-	$(CMAKE_EDIT_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# The main all target
-all:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/gdisp+/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/gdisp+/clean
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-
-# Convenience name for target.
-src/consumers/gdisp+/CMakeFiles/targa.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/gdisp+/CMakeFiles/targa.dir/rule
-
-# Convenience name for target.
-targa: src/consumers/gdisp+/CMakeFiles/targa.dir/rule
-
-# target for object file
-gdisp_animatedLogo.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_animatedLogo.o
-
-# target for object file
-gdisp_colormap.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_colormap.o
-
-# target for object file
-gdisp_configuration.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_configuration.o
-
-# target for object file
-gdisp_consumers.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_consumers.o
-
-# target for object file
-gdisp_dataBook.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_dataBook.o
-
-# target for object file
-gdisp_dataBox.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_dataBox.o
-
-# target for object file
-gdisp_defaultPlot.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_defaultPlot.o
-
-# target for object file
-gdisp_format.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_format.o
-
-# target for object file
-gdisp_graphics.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_graphics.o
-
-# target for object file
-gdisp_hosts.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_hosts.o
-
-# target for object file
-gdisp_kernel.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_kernel.o
-
-# target for object file
-gdisp_main.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_main.o
-
-# target for object file
-gdisp_mainBoard.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_mainBoard.o
-
-# target for object file
-gdisp_openglUtils.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_openglUtils.o
-
-# target for object file
-gdisp_pages.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_pages.o
-
-# target for object file
-gdisp_pilotBoard.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_pilotBoard.o
-
-# target for object file
-gdisp_pixmaps.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_pixmaps.o
-
-# target for object file
-gdisp_plot2D.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_plot2D.o
-
-# target for object file
-gdisp_plotOrbital.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_plotOrbital.o
-
-# target for object file
-gdisp_plotText.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_plotText.o
-
-# target for object file
-gdisp_pointArray.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_pointArray.o
-
-# target for object file
-gdisp_popupMenu.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_popupMenu.o
-
-# target for object file
-gdisp_preferences.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_preferences.o
-
-# target for object file
-gdisp_providers.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_providers.o
-
-# target for object file
-gdisp_sampledSymbols.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_sampledSymbols.o
-
-# target for object file
-gdisp_sampling.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_sampling.o
-
-# target for object file
-gdisp_splashScreen.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_splashScreen.o
-
-# target for object file
-gdisp_symbols.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_symbols.o
-
-# target for object file
-gdisp_toString.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_toString.o
-
-# target for object file
-gdisp_utils.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_utils.o
-
-# target for object file
-gdisp_xml.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp+/CMakeFiles/targa.dir/build.make src/consumers/gdisp+/CMakeFiles/targa.dir/gdisp_xml.o
-
-# Help Target
-help::
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... install"
-	@echo "... rebuild_cache"
-	@echo "... targa"
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-
Index: src/consumers/gdisp+/CMakeLists.txt
===================================================================
--- src/consumers/gdisp+/CMakeLists.txt	(révision 4)
+++ src/consumers/gdisp+/CMakeLists.txt	(révision 205)
@@ -50,10 +50,18 @@
 
 IF(SHAREDLIB_ENABLED)
   ADD_LIBRARY(tsp_gdispUtils gdisp_utils gdisp_toString gdisp_xml gdisp_format)
+  TSP_LIBRARY_INSTALL(tsp_gdispUtils)
   ADD_LIBRARY(tsp_gdispPlot2D gdisp_plot2D)
+  TSP_LIBRARY_INSTALL(tsp_gdispPlot2D)
   ADD_LIBRARY(tsp_gdispPlotText gdisp_plotText)
+  TSP_LIBRARY_INSTALL(tsp_gdispPlotText)
   IF(OPENGL_FOUND AND OPENL_GLU_FOUND)
     ADD_LIBRARY(tsp_gdispPlotOrbital gdisp_plotOrbital gdisp_openglUtils)
+    TSP_LIBRARY_INSTALL(tsp_gdispPlotOrbital)
     TARGET_LINK_LIBRARIES(tsp_gdispPlotOrbital GL GLU)
   ENDIF(OPENGL_FOUND AND OPENL_GLU_FOUND)
+
 ENDIF(SHAREDLIB_ENABLED)
+
+TSP_PROGRAM_INSTALL(targa)
+
Index: src/consumers/jsynoptic/impl/Makefile
===================================================================
--- src/consumers/jsynoptic/impl/Makefile	(révision 4)
+++ src/consumers/jsynoptic/impl/Makefile	(révision 205)
@@ -1,28 +0,0 @@
-# -*- Makefile -*-
-
-include $(DEVBASE)/make/Makeparams.java
-
-JPACKAGEDIR=tsp/consumer/jsynoptic
-JARBASE=$(JARDIR)/jSynoptic/jsynoptic.jar:$(JARDIR)/jSynoptic/jfreechart.jar:$(JARDIR)/jSynoptic/simtools.jar:$(JARDIR)/jSynoptic/jcommon.jar
-
-SOURCES = \
-	TspSampleSymbolInfo.java \
-	TspSymbolListModel.java \
-	TspHandler.java
-
-OBJECTS=$(SOURCES:%.java=$(CLASSBASE)/$(JPACKAGEDIR)/%.class)
-
-all::
-	$(MAKE) build
-
-build:: $(OBJECTS)
-	@echo $(JPACKAGEDIR)
-debug::
-	@echo "No debug for yet"
-#	$(MAKE) D=.debug common
-
-destroy::
-	$(MAKE) clean
-
-include $(DEVBASE)/make/Makerules.java
-
Index: src/consumers/jsynoptic/ui/Makefile
===================================================================
--- src/consumers/jsynoptic/ui/Makefile	(révision 4)
+++ src/consumers/jsynoptic/ui/Makefile	(révision 205)
@@ -1,32 +0,0 @@
-# -*- Makefile -*-
-
-include $(DEVBASE)/make/Makeparams.java
-
-JPACKAGEDIR=tsp/consumer/jsynoptic/ui
-JARBASE=$(JARDIR)/jSynoptic/jsynoptic.jar:$(JARDIR)/jSynoptic/jfreechart.jar:$(JARDIR)/jSynoptic/simtools.jar:$(JARDIR)/jSynoptic/jcommon.jar
-
-SUBDIRS = \
-	ressources
-
-SOURCES = \
-	TspDialogAddSource.java \
-	TspDialogOpenProvider.java
-
-OBJECTS=$(SOURCES:%.java=$(CLASSBASE)/$(JPACKAGEDIR)/%.class)
-
-include $(DEVBASE)/make/Makesubdirs
-
-all::
-	$(MAKE) build
-
-build:: $(OBJECTS)
-	@echo $(JPACKAGEDIR)
-debug::
-	@echo "No debug for yet"
-#	$(MAKE) D=.debug common
-
-destroy::
-	$(MAKE) clean
-
-include $(DEVBASE)/make/Makerules.java
-
Index: src/consumers/jsynoptic/ui/ressources/Makefile
===================================================================
--- src/consumers/jsynoptic/ui/ressources/Makefile	(révision 4)
+++ src/consumers/jsynoptic/ui/ressources/Makefile	(révision 205)
@@ -1,29 +0,0 @@
-# -*- Makefile -*-
-
-include $(DEVBASE)/make/Makeparams.java
-
-JPACKAGEDIR=tsp/consumer/jsynoptic/ui/ressources
-
-SOURCES = \
-	tsp_pieuvre3.png
-
-OBJECTS=$(SOURCES:%.png=$(CLASSBASE)/$(JPACKAGEDIR)/%.png)
-
-all::
-	$(MAKE) build
-
-build:: $(OBJECTS)
-	@echo "DONE ===" $(JPACKAGEDIR) " ==="
-
-destroy::
-	$(MAKE) clean
-
-$(CLASSBASE)/$(JPACKAGEDIR)/%.png : %.png
-	@echo "@@@ Copying $< (target $@)..."
-	mkdir -p $(CLASSBASE)/$(JPACKAGEDIR)/
-	cp $< $@
-
-clean::
-	@echo "@@@ removing ressource files ..."
-	$(RM) *~
-	$(RM) -rf $(CLASSBASE)/$(JPACKAGEDIR)
Index: src/consumers/stdout/Makefile
===================================================================
--- src/consumers/stdout/Makefile	(révision 4)
+++ src/consumers/stdout/Makefile	(révision 205)
@@ -1,96 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.2
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /usr/bin/ccmake
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/noularde/TSP/tsp_all/tsp
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/noularde/TSP/tsp_all/tsp
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Default target executed when no arguments are given to make.
-default_target: all
-
-# Special rule to run installation script.
-install: all
-	$(CMAKE_COMMAND) -P cmake_install.cmake
-
-# Special rule to re-run CMake using make.
-rebuild_cache:
-	@echo "Running CMake to regenerate build system..."
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Special rule to re-run CMake cache editor using make.
-edit_cache:
-	@echo "Running CMake cache editor..."
-	$(CMAKE_EDIT_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# The main all target
-all:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/stdout/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/stdout/clean
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-
-# Convenience name for target.
-src/consumers/stdout/CMakeFiles/tsp_stdout_client.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/stdout/CMakeFiles/tsp_stdout_client.dir/rule
-
-# Convenience name for target.
-tsp_stdout_client: src/consumers/stdout/CMakeFiles/tsp_stdout_client.dir/rule
-
-# target for object file
-client_stdout.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/stdout/CMakeFiles/tsp_stdout_client.dir/build.make src/consumers/stdout/CMakeFiles/tsp_stdout_client.dir/client_stdout.o
-
-# Help Target
-help::
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... install"
-	@echo "... rebuild_cache"
-	@echo "... tsp_stdout_client"
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-
Index: src/consumers/stdout/client_stdout.c
===================================================================
--- src/consumers/stdout/client_stdout.c	(révision 4)
+++ src/consumers/stdout/client_stdout.c	(révision 205)
@@ -30,199 +30,268 @@
 
 -----------------------------------------------------------------------
 
-Purpose   : Simple consummer test that print samples received to stdout
+Purpose   : Simple consumer test that print samples received to stdout
 
 -----------------------------------------------------------------------
 */
 
+#ifdef WIN32
+    #define assert(exp)     ((void)0)
+    #include  "getopt.h"
+#else
+    #include <unistd.h>
+    #include <assert.h>
+#endif
+
 #include "tsp_sys_headers.h"
 #include "tsp_prjcfg.h"
 #include "tsp_consumer.h"
-
-/*#include "fortify.h"*/
-
+#include "tsp_time.h"
 
 /* Number of samples  that will be counted before the data check test pass */
-#define TSP_TEST_COUNT_SAMPLES 100  
+#define TSP_TEST_COUNT_SAMPLES 10  
 #define TSP_NANOSLEEP_PERIOD_US (100*1000) /* 10Hz */
 
-int main(int argc, char *argv[]){
+
+void 
+stdout_usage(const char* me) {
+  printf("%s is a (very) simple TSP consumer which may send simple TSP Request Sample.\n",me);
+  printf("With no args %s will connect to the first provider on 'localhost'",me); 
+  printf("and print out the first 5 values of the first symbols.\n");
+ 
+  printf("Usage: %s [-u TSP_URL] [-p period] [-n number_sample] [-s number_symbols] [-t]\n",me);
+  printf("   -u TSP_URL    (optional) the TSP provider URL, default=localhost\n");
+  printf("   -p period     (optional) the period used for the request sample, default=1\n");
+  printf("   -n nb_sample  (optional) the number of sample to received, default=5, 0=infinite loop\n");
+  printf("   -s nb_symbols (optional) the number of sample symbols to request for, default=1\n");
+  printf("   -t            (optional) test mode to be used with StubbedServer (TSP developer only)\n");
+  printf("   -h            (optional) print this help\n");
+  printf("%s",TSP_URL_FORMAT_USAGE);  
+}
+
+
+int 
+main(int argc, char *argv[]){
 
   const TSP_answer_sample_t*  information;
   TSP_sample_symbol_info_list_t symbols;
 
-  int i, j;
-  int period=0;
-  char* name;
-  int count_samples = 0;
-  int nb_samples = -1;
-  char symbol_buf[50];
-  int test_ok = TRUE;
-  int test_mode = 0;
-  int all_data_ok = TRUE;
+  int   i, j;
+  int   retcode=0;
+  int   period=1;
+  char* provider_url;
+  int   count_samples;
+  int   nb_samples;
+  int   nb_symbols;
+  char  symbol_buf[50];
+  int   test_ok = TRUE;
+  int   test_mode = 0;
+  int   all_data_ok = TRUE;
   TSP_provider_t provider;
+  int           opt_ok=1;
+  char          c_opt;
 
+  /* Setup default values for non-existent option */
+  provider_url = strdup("localhost");
+  period       = 1;
+  nb_samples   = 5;
+  nb_symbols   = 1;
+  test_mode    = 0;
 
-  /*Fortify_EnterScope();*/
   printf ("#=========================================================#\n");
   printf ("# Launching <stdout_client> for printing symbols received #\n");
   printf ("#=========================================================#\n");
- 
-  if(TSP_STATUS_OK!=TSP_consumer_init(&argc, &argv)) {
-    STRACE_ERROR(("TSP init failed"));
-    return -1;
-  }
 
-  switch (argc-1) { /* No Breaks please */
-  case 5: 
-    nb_samples = atoi(argv[5]);  /* nb-sample */
-  case 4:
-    test_mode = atoi(argv[4]);  /* 0 = no, 1=infinite loop */
-  case 3:       /* Anything after name and perdio --> test mode */
-  case 2:
-    period = atoi (argv[2]);
-  case 1:      
-    name = argv[1];
-    break;
-  default : 
-      STRACE_ERROR(("USAGE %s : serverURL period <test mode nb_sample> \n", argv[0]));
-      printf(TSP_URL_FORMAT_USAGE);
-      return -1;
+  /* Analyse command line parameters */
+  c_opt = getopt(argc,argv,"u:p:n:s:ht");
+
+  if(opt_ok && EOF != c_opt) {
+    opt_ok  = 1;
+    do { 
+      switch (c_opt) {
+      case 'u':
+	free(provider_url);
+	provider_url = strdup(optarg);
+	break;
+      case 'p':
+	period = atoi(optarg);
+	/* period should be > 0 */
+	if (period <=0) {
+	  period = 1;
+	}
+	break;
+      case 'n':
+	nb_samples = atoi(optarg);
+	/* nb_samples should be >= 0, 0 meaning infinite loop */
+	if (nb_samples <0) {
+	  nb_samples = 5;
+	}
+	break;
+      case 's':	
+	nb_symbols = atoi(optarg);
+	/* nb_symbols should be >= 0, 0 meaning infinite loop */
+	if (nb_symbols <=0) {
+	  nb_symbols = 1;
+	}
+	break;
+      case 't':
+	test_mode = 1;
+	break;
+      case 'h':
+	opt_ok = 0;
+	break;
+      case '?':
+	fprintf(stderr,"Invalid command line option(s), correct it and rerun\n");
+	opt_ok = 0;
+	break;
+      default:
+	opt_ok = 0;
+	break;
+      } /* end of switch */  
+      c_opt = getopt(argc,argv,"u:p:n:s:ht");  
+    }
+    while (opt_ok && (EOF != c_opt));
   }
 
- once_again:
+  if (!opt_ok) {
+    retcode=-1;
+    stdout_usage(argv[0]);
+    exit(retcode);
+  } else {
+    fprintf(stdout,"%s: Using provider URL <%s>\n",argv[0],provider_url);
+    fprintf(stdout,"%s: Asking for:\n",argv[0]);
+    fprintf(stdout,"         <%d> samples (0 => INFINITE loop)\n",nb_samples);
+    fprintf(stdout,"      of <%d> TSP symbols\n",nb_symbols);
+    fprintf(stdout,"      at period <%d>.\n",period);
+    if (0==nb_samples) {
+      fprintf(stdout,"%s: INFINITE LOOP mode (Ctrl-C for stopping sample)\n",argv[0]);
+    }
+    if (test_mode) {
+      fprintf(stdout,"%s: TEST MODE (should only be used with Stubbed Server)\n",argv[0]);
+    }
+  }
   
+  if(TSP_STATUS_OK!=TSP_consumer_init(&argc, &argv)) {
+    retcode=1;
+    STRACE_ERROR(("TSP init failed"));
+    return retcode;
+  }
+
   /*-------------------------------------------------------------------------------------------------------*/ 
   /* TEST : STAGE 001 | STEP 001 */
   /*-------------------------------------------------------------------------------------------------------*/ 
-  provider = TSP_consumer_connect_url(name);
-  if(provider)
-    {
-      const char* info = TSP_consumer_get_connected_name(provider) ;
-      STRACE_INFO(("Server %s, info = '%s'", name, info));
-	  
-      /* Check name */
-      if(!strstr(info, "StubbedServer"))
-	{
-	  STRACE_ERROR(("Serveur name corrupted"));
-	  STRACE_TEST(("STAGE 001 | STEP 001 : FAILED"));
-	  return -1;
-	}
-	  
-    }
-  else
-    {
-      STRACE_ERROR(("Unable to find any provider for host"));
-      return -1;
-    }
-
+  provider = TSP_consumer_connect_url(provider_url);
+  if (provider) {
+    const char* info = TSP_consumer_get_connected_name(provider) ;
+    STRACE_INFO(("Server %s, info = '%s'", provider_url, info));
+    
+    /* Check name */
+    if(test_mode && !strstr(info, "StubbedServer")) {
+      STRACE_ERROR(("Serveur name corrupted"));
+      retcode=2;
+      STRACE_TEST(("STAGE 001 | STEP 001 : FAILED"));
+      return retcode;
+    }	  
+  }
+  else {
+    retcode = 3;
+    STRACE_ERROR(("Unable to find any provider for host"));
+    return retcode;
+  }
+  
   STRACE_TEST(("STAGE 001 | STEP 001 : PASSED"));
 
-
   /*-------------------------------------------------------------------------------------------------------*/ 
   /* TEST : STAGE 001 | STEP 002 */
   /*-------------------------------------------------------------------------------------------------------*/ 
-  /* Le 1er provider existe puisqu'il y en a au moins 1 */
+  /* Request Open on the [found] provider */
 
-  if(TSP_STATUS_OK!=TSP_consumer_request_open(provider, 0, 0))
-    {
-      STRACE_ERROR(("TSP_request_provider_open failed"));
-      STRACE_TEST(("STAGE 001 | STEP 002 : FAILED"));
-      return -1;
-    }
+  if(TSP_STATUS_OK!=TSP_consumer_request_open(provider, 0, NULL)) {
+    STRACE_ERROR(("TSP_request_provider_open failed"));
+    STRACE_TEST(("STAGE 001 | STEP 002 : FAILED"));
+    return -1;
+  }
   
   STRACE_TEST(("STAGE 001 | STEP 002 : PASSED"));
 
   /*-------------------------------------------------------------------------------------------------------*/ 
   /* TEST : STAGE 001 | STEP 003 */
   /*-------------------------------------------------------------------------------------------------------*/ 
-  if(TSP_STATUS_OK!=TSP_consumer_request_information(provider))
-    {
-      STRACE_ERROR(("TSP_request_provider_information failed"));
-      STRACE_TEST(("STAGE 001 | STEP 003 : FAILED"));
-      return -1;
-    }
+  if(TSP_STATUS_OK!=TSP_consumer_request_information(provider)) {
+    STRACE_ERROR(("TSP_request_provider_information failed"));
+    STRACE_TEST(("STAGE 001 | STEP 003 : FAILED"));
+    return -1;
+  }
   
   /* be wild, ask twice to try to trigger mem leak  */
-  if(TSP_STATUS_OK!=TSP_consumer_request_information(provider))
-    {
-      STRACE_ERROR(("TSP_request_provider_information failed"));
-      STRACE_TEST(("STAGE 001 | STEP 003 : FAILED"));
-      return -1;
-    }
-
+  if(TSP_STATUS_OK!=TSP_consumer_request_information(provider)) {
+    STRACE_ERROR(("TSP_request_provider_information failed"));
+    STRACE_TEST(("STAGE 001 | STEP 003 : FAILED"));
+    return -1;
+  }
 
   information = TSP_consumer_get_information(provider);
-
   /* Check total symbol number */
-  if(information->symbols.TSP_sample_symbol_info_list_t_len < 1 || information->symbols.TSP_sample_symbol_info_list_t_len > 999999)
-    {
-      STRACE_ERROR(("The total number of symbols should be fair, and not %d",information->symbols.TSP_sample_symbol_info_list_t_len));
-      STRACE_TEST(("STAGE 001 | STEP 003 : FAILED"));
-      return -1;      
-    }
+  if ((TSP_SSIList_getSize(information->symbols) < 1 ) ||
+      (TSP_SSIList_getSize(information->symbols) > 999999)
+      ) {
+    STRACE_ERROR(("The total number of symbols should be fair, and not %d",TSP_SSIList_getSize(information->symbols)));
+    STRACE_TEST(("STAGE 001 | STEP 003 : FAILED"));
+    return -1;      
+  }
 
-  /* Compare symbols names */
-  for( i = 1 ; i<  information->symbols.TSP_sample_symbol_info_list_t_len ; i++)
-    {
+  if (test_mode) {
+    /* Compare (first 1000) symbols names */
+    for (i = 1 ; i <1000 ; ++i) {
       sprintf(symbol_buf, "Symbol%d",i);
-      if(strcmp(symbol_buf,  information->symbols.TSP_sample_symbol_info_list_t_val[i].name))
-	{
-printf("%s != %s\n", symbol_buf,  information->symbols.TSP_sample_symbol_info_list_t_val[i].name);
-	  STRACE_ERROR(("Symbol name corrupted"));
-	  STRACE_TEST(("STAGE 001 | STEP 003 : FAILED"));
-	  return -1;
-	}
-      
+      if(strcmp(symbol_buf, TSP_SSIList_getSSI(information->symbols,i)->name)) {
+	printf("%s != %s\n", symbol_buf, TSP_SSIList_getSSI(information->symbols,i)->name);
+	STRACE_ERROR(("Symbol name corrupted"));
+	STRACE_TEST(("STAGE 001 | STEP 003 : FAILED"));
+	return -1;
+      }
     }
+  }
       
   STRACE_TEST(("STAGE 001 | STEP 003 : PASSED"));
+  
+  /* Initialize symbols list */
+  TSP_SSIList_initialize(&symbols,nb_symbols);
 
-  if (nb_samples>0)
-    symbols.TSP_sample_symbol_info_list_t_len = nb_samples;
-  else
-    symbols.TSP_sample_symbol_info_list_t_len = information->symbols.TSP_sample_symbol_info_list_t_len;
-  symbols.TSP_sample_symbol_info_list_t_val = (TSP_sample_symbol_info_t*)calloc(symbols.TSP_sample_symbol_info_list_t_len, sizeof(TSP_sample_symbol_info_t));
-  TSP_CHECK_ALLOC(symbols.TSP_sample_symbol_info_list_t_val, -1);
-
-  /* Change period of sampling for each client */
-  for(i = 0 ; i < symbols.TSP_sample_symbol_info_list_t_len ; i++)
-    {
-      symbols.TSP_sample_symbol_info_list_t_val[i].name = information->symbols.TSP_sample_symbol_info_list_t_val[i].name;
-      symbols.TSP_sample_symbol_info_list_t_val[i].period = period;
-      symbols.TSP_sample_symbol_info_list_t_val[i].phase = 0;
-    }
+  /* Update requested sample period */
+  printf("%s: Asking for %d symbols\n", argv[0],nb_symbols);
+  for (i = 0 ; i < TSP_SSIList_getSize(symbols) ; ++i) {
+    TSP_SSI_initialize_request_minimal(TSP_SSIList_getSSI(symbols,i),
+				       TSP_SSIList_getSSI(information->symbols,i)->name,
+				       period);
+    printf("   symbol <%d> is <%s>\n",i,TSP_SSIList_getSSI(symbols,i)->name);
+  }
 
-  STRACE_INFO(("Asking for %d symboles", symbols.TSP_sample_symbol_info_list_t_len));
   /*-------------------------------------------------------------------------------------------------------*/ 
   /* TEST : STAGE 001 | STEP 004 */
   /*-------------------------------------------------------------------------------------------------------*/ 
-  if(TSP_STATUS_OK!=TSP_consumer_request_sample(provider, &symbols))
-    {
-      STRACE_ERROR(("TSP_request_provider_sample failed"));
-      STRACE_TEST(("STAGE 001 | STEP 004 : FAILED"));
-      return -1;
-    }
+  if(TSP_STATUS_OK!=TSP_consumer_request_sample(provider, &symbols)) {
+    STRACE_ERROR(("TSP_request_provider_sample failed"));
+    STRACE_TEST(("STAGE 001 | STEP 004 : FAILED"));
+    return -1;
+  }
+  
   /* be wild, ask twice to try to trigger mem leak  */
-  if(TSP_STATUS_OK!=TSP_consumer_request_sample(provider, &symbols))
-    {
-      STRACE_ERROR(("TSP_request_provider_sample failed"));
-      STRACE_TEST(("STAGE 001 | STEP 004 : FAILED"));
-      return -1;
-    }
-
-  free(symbols.TSP_sample_symbol_info_list_t_val);
+  if(TSP_STATUS_OK!=TSP_consumer_request_sample(provider, &symbols)) {
+    STRACE_ERROR(("TSP_request_provider_sample failed"));
+    STRACE_TEST(("STAGE 001 | STEP 004 : FAILED"));
+    return -1;
+  }
 
   STRACE_TEST(("STAGE 001 | STEP 004 : PASSED"));
   /*-------------------------------------------------------------------------------------------------------*/ 
   /* TEST : STAGE 001 | STEP 005 */
   /*-------------------------------------------------------------------------------------------------------*/ 
-  if(TSP_STATUS_OK!=TSP_consumer_request_sample_init(provider, 0, 0))
-    {
-      STRACE_ERROR(("TSP_request_provider_sample_init failed"));
-      STRACE_TEST(("STAGE 001 | STEP 005 : FAILED"));
-      return -1;
-    }
+  if(TSP_STATUS_OK!=TSP_consumer_request_sample_init(provider, 0, 0)) {
+    STRACE_ERROR(("TSP_request_provider_sample_init failed"));
+    STRACE_TEST(("STAGE 001 | STEP 005 : FAILED"));
+    return -1;
+  }
   STRACE_TEST(("STAGE 001 | STEP 005 : PASSED"));
 
   /*-------------------------------------------------------------------------------------------------------*/ 
@@ -230,104 +299,94 @@
   /*-------------------------------------------------------------------------------------------------------*/ 
   /* Loop on data read */
   count_samples = 0;
-  while(1)
-    {
-      int new_sample;
-      TSP_sample_t sample;
-      int i;int j;
-      int t = -1000;
+  while(1) {
+    int new_sample;
+    TSP_sample_t sample;
+    int pgi;
+    int j;
+    int t;
       
-      new_sample = FALSE;
-      do{
-	if(TSP_STATUS_OK==TSP_consumer_read_sample(provider,&sample, &new_sample))
-	  {
-	    if(new_sample)
-	      {
-		    
-		double calc;
-		    
-		i = sample.provider_global_index;
-		if(t == -1000) 
-		  {
-		    t = sample.time - 1; 
-		  }
-
-		if(i == 1 )
-		  {
-		    count_samples++;
-		    printf ("TSP : Sample nb[%d] time=%d val=%f\n", count_samples, sample.time, sample.uvalue.double_value);
-		  }
-
-		calc = calc_func(i,sample.time);
-		
-		/* i = 0 is t */
-		if(i != 0)
-		  {
-		    if( (ABS(sample.uvalue.double_value - calc) > 1e-7) && (t == (sample.time - 1)) )
-		      {
-			STRACE_ERROR(("!!!!ERROR : T=%u, I=%d, V1=%f, V2=%f", sample.time,i,sample.uvalue.double_value,calc ));			
-			all_data_ok = FALSE;
-		      }
-		  }
-
-		t = sample.time;
-
-		/* Test */
-		if(count_samples >= TSP_TEST_COUNT_SAMPLES && test_mode!=1)
-		  {
-		    if(all_data_ok)
-		      {
-
-			STRACE_TEST(("STAGE 001 | STEP 006 : PASSED" ));			
-			
-			/* --------------- */
-			/* Close providers */
-			/* --------------- */
-			if(TSP_STATUS_OK!=TSP_consumer_request_sample_destroy(provider))
-			  {
-			    STRACE_ERROR(("Function TSP_consumer_request_sample_destroy failed" ));	 
-			  }
-			
-			if(TSP_STATUS_OK!=TSP_consumer_request_close(provider))
-			  {
-			    STRACE_ERROR(("Function TSP_consumer_request_close failed" ));			    
-			  }
-			
-			TSP_consumer_disconnect_one(provider);
-			
-
-			/* Fortify calls */
-			/*Fortify_LeaveScope();
-			  Fortify_OutputStatistics();*/
-			
-			/* goto once_again; */
-			TSP_consumer_end();
-
-			printf ("#=========================================================#\n");
-			printf ("# End of Test OK \n");
-			printf ("#=========================================================#\n");
-			return 1;
-		      }
-		    else
-		      {
-			printf ("#=========================================================#\n");
-			printf ("# End of Test KO \n");
-			printf ("#=========================================================#\n");
-			return -1;
-		      }
-		  }
-	      }
+    new_sample = FALSE;
+    /* Loop on read sample */
+    do {
+      if (TSP_STATUS_OK==TSP_consumer_read_sample(provider,&sample, &new_sample)) {
+	
+	if(new_sample) {	    
+
+	  /* If we get first PGI then it must be a new sample set (provided first sample is not an array) */
+	  if ((TSP_SSIList_getSSI(symbols,0)->provider_global_index==sample.provider_global_index) && 
+	      (0==sample.array_index)
+	      ) {
+	    count_samples++;
+	    if ((count_samples <= nb_samples) || (0==nb_samples)) {
+	      printf("\nNew Sample Set nb[%d] time=%d %s=%f", count_samples, sample.time, 
+		     TSP_SSIList_getSSI(symbols,sample.provider_global_index)->name,
+		     sample.uvalue.double_value);
+	    }
+	  } else {
+	    printf(" %s=%f",TSP_SSIList_getSSI(symbols,sample.provider_global_index)->name,sample.uvalue.double_value);
 	  }
-	else
-	  {
-	    STRACE_ERROR(("TSP_read_sample failed"));
+	  	    
+	  /* We know how stubbed server symbols values are computed so verify the values */
+	  if (test_mode) {
+	    double calc = calc_func(sample.provider_global_index,sample.time);
+	    
+	    /* pgi == 0 is t so don't check for t*/
+	    if(sample.provider_global_index != 0) {
+	      if( (ABS(sample.uvalue.double_value - calc) > 1e-7) && (t == (sample.time - 1)) ) {
+		STRACE_ERROR(("!!!!ERROR : T=%u, I=%d, V1=%f, V2=%f", sample.time,i,sample.uvalue.double_value,calc ));
+		all_data_ok = FALSE;
+	      }
+	    }	  
+	    t = sample.time;
+	  } /* end if (test_mode) */
+	  
+	  /* End up sampling properly */
+	  if( (0!=nb_samples) && 
+	      (count_samples > nb_samples)
+	      ) {
+	    if(all_data_ok) {
+	      
+	      printf("\n");
+	      STRACE_TEST(("STAGE 001 | STEP 006 : PASSED" ));			
+	      
+	      /* --------------- */
+	      /* Close providers */
+	      /* --------------- */
+	      if(TSP_STATUS_OK!=TSP_consumer_request_sample_destroy(provider)) {
+		STRACE_ERROR(("Function TSP_consumer_request_sample_destroy failed" ));	 
+	      }
+	      TSP_SSIList_finalize(&symbols);
+		  
+	      if(TSP_STATUS_OK!=TSP_consumer_request_close(provider)) {
+		STRACE_ERROR(("Function TSP_consumer_request_close failed" ));			    
+	      }
+		  
+	      TSP_consumer_disconnect_one(provider);	      
+	      TSP_consumer_end();
+	      
+	      printf ("#=========================================================#\n");
+	      printf ("# End of Test OK \n");
+	      printf ("#=========================================================#\n");
+	      return 0;
+	    }
+	    else {
+	      printf ("#=========================================================#\n");
+	      printf ("# End of Test KO \n");
+	      printf ("#=========================================================#\n");
+	      return -1;
+	    }
 	  }
-      } while(new_sample);
-
-      /* Used to give time to other thread for filling fifo of received samples */
-      tsp_usleep(TSP_NANOSLEEP_PERIOD_US); 
-
-    }
-
+	}
+      }
+      else {
+	STRACE_ERROR(("TSP_read_sample failed"));
+      }
+    } while(new_sample);
+    
+    /* Used to give time to other thread for filling fifo of received samples */
+    tsp_usleep(TSP_NANOSLEEP_PERIOD_US);     
+  }
+  
   return 0;
 }
Index: src/consumers/stdout/CMakeLists.txt
===================================================================
--- src/consumers/stdout/CMakeLists.txt	(révision 4)
+++ src/consumers/stdout/CMakeLists.txt	(révision 205)
@@ -1,9 +1,21 @@
 SET(EXE_NAME tsp_stdout_client)
+
 SET(STDOUT_SRC client_stdout)
 
+IF (WIN32)
+    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/external/TspWin32)
+ENDIF (WIN32)
+
 ADD_EXECUTABLE(${EXE_NAME} ${STDOUT_SRC})
 
-TARGET_LINK_LIBRARIES(${EXE_NAME} tsp_consumer tsp_common tsp_services
-tsp_calc m pthread)
+IF (WIN32)
+	TARGET_LINK_LIBRARIES(${EXE_NAME} tsp_consumer tsp_common tsp_services
+	tsp_calc ${PTHREAD_LIBRARY_NAME} ${TSP_WIN32_LIB})
+ELSE (WIN32)
+	TARGET_LINK_LIBRARIES(${EXE_NAME} tsp_consumer tsp_common tsp_services
+	tsp_calc m ${PTHREAD_LIBRARY_NAME})
+ENDIF (WIN32)
 
 ADD_DEPENDENCIES(${EXE_NAME} tsp_calc tsp_common tsp_consumer tsp_services)
+
+TSP_PROGRAM_INSTALL(${EXE_NAME})
Index: src/consumers/tutorial/Makefile
===================================================================
--- src/consumers/tutorial/Makefile	(révision 4)
+++ src/consumers/tutorial/Makefile	(révision 205)
@@ -1,96 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.2
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /usr/bin/ccmake
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/noularde/TSP/tsp_all/tsp
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/noularde/TSP/tsp_all/tsp
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Default target executed when no arguments are given to make.
-default_target: all
-
-# Special rule to run installation script.
-install: all
-	$(CMAKE_COMMAND) -P cmake_install.cmake
-
-# Special rule to re-run CMake using make.
-rebuild_cache:
-	@echo "Running CMake to regenerate build system..."
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Special rule to re-run CMake cache editor using make.
-edit_cache:
-	@echo "Running CMake cache editor..."
-	$(CMAKE_EDIT_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# The main all target
-all:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/tutorial/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/tutorial/clean
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-
-# Convenience name for target.
-src/consumers/tutorial/CMakeFiles/tsp_tutorial_client.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/tutorial/CMakeFiles/tsp_tutorial_client.dir/rule
-
-# Convenience name for target.
-tsp_tutorial_client: src/consumers/tutorial/CMakeFiles/tsp_tutorial_client.dir/rule
-
-# target for object file
-simple_client.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/tutorial/CMakeFiles/tsp_tutorial_client.dir/build.make src/consumers/tutorial/CMakeFiles/tsp_tutorial_client.dir/simple_client.o
-
-# Help Target
-help::
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... install"
-	@echo "... rebuild_cache"
-	@echo "... tsp_tutorial_client"
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-
Index: src/consumers/tutorial/CMakeLists.txt
===================================================================
--- src/consumers/tutorial/CMakeLists.txt	(révision 4)
+++ src/consumers/tutorial/CMakeLists.txt	(révision 205)
@@ -1,2 +1,3 @@
 ADD_EXECUTABLE(tsp_tutorial_client simple_client.c)
+TSP_PROGRAM_INSTALL(tsp_tutorial_client)
 TARGET_LINK_LIBRARIES(tsp_tutorial_client pthread tsp_consumer tsp_common tsp_services)
Index: src/consumers/ascii_writer/Makefile
===================================================================
--- src/consumers/ascii_writer/Makefile	(révision 4)
+++ src/consumers/ascii_writer/Makefile	(révision 205)
@@ -1,108 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.2
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /usr/bin/ccmake
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/noularde/TSP/tsp_all/tsp
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/noularde/TSP/tsp_all/tsp
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Default target executed when no arguments are given to make.
-default_target: all
-
-# Special rule to run installation script.
-install: all
-	$(CMAKE_COMMAND) -P cmake_install.cmake
-
-# Special rule to re-run CMake using make.
-rebuild_cache:
-	@echo "Running CMake to regenerate build system..."
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Special rule to re-run CMake cache editor using make.
-edit_cache:
-	@echo "Running CMake cache editor..."
-	$(CMAKE_EDIT_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# The main all target
-all:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/ascii_writer/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/ascii_writer/clean
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-
-# Convenience name for target.
-src/consumers/ascii_writer/CMakeFiles/tsp_ascii_writer.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/ascii_writer/CMakeFiles/tsp_ascii_writer.dir/rule
-
-# Convenience name for target.
-tsp_ascii_writer: src/consumers/ascii_writer/CMakeFiles/tsp_ascii_writer.dir/rule
-
-# target for object file
-tsp_ascii_writer.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/ascii_writer/CMakeFiles/tsp_ascii_writer.dir/build.make src/consumers/ascii_writer/CMakeFiles/tsp_ascii_writer.dir/tsp_ascii_writer.o
-
-# target for object file
-tsp_ascii_writer_config_yy.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/ascii_writer/CMakeFiles/tsp_ascii_writer.dir/build.make src/consumers/ascii_writer/CMakeFiles/tsp_ascii_writer.dir/tsp_ascii_writer_config_yy.o
-
-# target for object file
-tsp_ascii_writer_main.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/ascii_writer/CMakeFiles/tsp_ascii_writer.dir/build.make src/consumers/ascii_writer/CMakeFiles/tsp_ascii_writer.dir/tsp_ascii_writer_main.o
-
-# target for object file
-y.tab.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/ascii_writer/CMakeFiles/tsp_ascii_writer.dir/build.make src/consumers/ascii_writer/CMakeFiles/tsp_ascii_writer.dir/y.tab.o
-
-# Help Target
-help::
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... install"
-	@echo "... rebuild_cache"
-	@echo "... tsp_ascii_writer"
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-
Index: src/consumers/ascii_writer/CMakeLists.txt
===================================================================
--- src/consumers/ascii_writer/CMakeLists.txt	(révision 4)
+++ src/consumers/ascii_writer/CMakeLists.txt	(révision 205)
@@ -1,18 +1,20 @@
 ADD_DEFINITIONS(-DYY_NO_UNPUT ${XML2_CFLAGS})
+SET(ASCII_WRITER_SRC
+  tsp_ascii_writer_main.c
+  )
 SET(ASCII_SRC
-tsp_ascii_writer.c
-tsp_ascii_writer_main.c
-)
-
-SET(ASCII_YACC_SRC tsp_ascii_writer_config.y)
-SET(ASCII_YACC_OUTPUT y.tab.c)
-SET(ASCII_LEX_SRC tsp_ascii_writer_config.lex)
-SET(ASCII_LEX_OUTPUT tsp_ascii_writer_config_yy.c)
+  tsp_ascii_writer.c
+  )
+
+SET(ASCII_YACC_SRC ${CMAKE_CURRENT_SOURCE_DIR}/tsp_ascii_writer_config.y)
+SET(ASCII_YACC_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/y.tab.c)
+SET(ASCII_LEX_SRC ${CMAKE_CURRENT_SOURCE_DIR}/tsp_ascii_writer_config.lex)
+SET(ASCII_LEX_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tsp_ascii_writer_config_yy.c)
 
 #Exec Lex
 ADD_CUSTOM_COMMAND(
    OUTPUT ${ASCII_LEX_OUTPUT}
-   COMMAND lex
+   COMMAND ${LEX_PROGRAM}
    ARGS -o${ASCII_LEX_OUTPUT} ${ASCII_LEX_SRC}
    DEPENDS ${ASCII_LEX_SRC}
    )
@@ -22,8 +24,8 @@
 #Exec Yacc
 ADD_CUSTOM_COMMAND(
    OUTPUT ${ASCII_YACC_OUTPUT}
-   COMMAND yacc
-   ARGS -d ${ASCII_YACC_SRC}
+   COMMAND ${YACC_PROGRAM}
+   ARGS ${YACC_COMPAT_ARG} -d ${ASCII_YACC_SRC}
    DEPENDS ${ASCII_YACC_SRC}
    )
 SET(ASCII_SRC ${ASCII_SRC}
@@ -31,9 +33,15 @@
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/consumers/ascii_writer/)
 
-ADD_EXECUTABLE(tsp_ascii_writer ${ASCII_SRC})
+ADD_EXECUTABLE(tsp_ascii_writer-bin ${ASCII_WRITER_SRC})
+SET_TARGET_PROPERTIES(tsp_ascii_writer-bin
+  PROPERTIES OUTPUT_NAME tsp_ascii_writer)
 ADD_LIBRARY(tsp_ascii_writer ${ASCII_SRC})
+ADD_DEPENDENCIES(tsp_ascii_writer-bin tsp_ascii_writer)
+
 	
-TARGET_LINK_LIBRARIES(tsp_ascii_writer tsp_consumer tsp_common tsp_services
-pthread tspcfg ${XML2_LIBRARY})
+TARGET_LINK_LIBRARIES(tsp_ascii_writer-bin tsp_ascii_writer tsp_consumer tsp_common tsp_services
+  ${PTHREAD_LIBRARY_NAME} tspcfg ${XML2_LIBRARY})
 
+TSP_LIBRARY_INSTALL(tsp_ascii_writer)
+TSP_PROGRAM_INSTALL(tsp_ascii_writer-bin)
Index: src/consumers/res_writer/Makefile
===================================================================
--- src/consumers/res_writer/Makefile	(révision 4)
+++ src/consumers/res_writer/Makefile	(révision 205)
@@ -1,96 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.2
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /usr/bin/ccmake
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/noularde/TSP/tsp_all/tsp
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/noularde/TSP/tsp_all/tsp
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Default target executed when no arguments are given to make.
-default_target: all
-
-# Special rule to run installation script.
-install: all
-	$(CMAKE_COMMAND) -P cmake_install.cmake
-
-# Special rule to re-run CMake using make.
-rebuild_cache:
-	@echo "Running CMake to regenerate build system..."
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Special rule to re-run CMake cache editor using make.
-edit_cache:
-	@echo "Running CMake cache editor..."
-	$(CMAKE_EDIT_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# The main all target
-all:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/res_writer/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/res_writer/clean
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-
-# Convenience name for target.
-src/consumers/res_writer/CMakeFiles/tsp_res_writer.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/res_writer/CMakeFiles/tsp_res_writer.dir/rule
-
-# Convenience name for target.
-tsp_res_writer: src/consumers/res_writer/CMakeFiles/tsp_res_writer.dir/rule
-
-# target for object file
-client_res.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/res_writer/CMakeFiles/tsp_res_writer.dir/build.make src/consumers/res_writer/CMakeFiles/tsp_res_writer.dir/client_res.o
-
-# Help Target
-help::
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... install"
-	@echo "... rebuild_cache"
-	@echo "... tsp_res_writer"
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-
Index: src/consumers/res_writer/client_res.c
===================================================================
--- src/consumers/res_writer/client_res.c	(révision 4)
+++ src/consumers/res_writer/client_res.c	(révision 205)
@@ -58,7 +58,7 @@
 static int stop = FALSE;
 static int stop_end = FALSE;
 
-static Sigfunc* _signal(int signo, Sigfunc* func)
+static Sigfunc* MySignal(int signo, Sigfunc* func)
 {
   struct sigaction act, oact;
   
@@ -136,7 +136,7 @@
 
 
   /* catch ctrl-c */
-  _signal(SIGINT, catch_ctrl_c);
+  MySignal(SIGINT, catch_ctrl_c);
 
 
   STRACE_INFO(("Autodetect CPU : %d bits", sizeof(long)*8));
Index: src/consumers/res_writer/CMakeLists.txt
===================================================================
--- src/consumers/res_writer/CMakeLists.txt	(révision 4)
+++ src/consumers/res_writer/CMakeLists.txt	(révision 205)
@@ -1,10 +1,11 @@
 SET(RESW_SRC client_res)
 
 ADD_EXECUTABLE(tsp_res_writer ${RESW_SRC})
+TSP_PROGRAM_INSTALL(tsp_res_writer)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/util/libres)
 
 TARGET_LINK_LIBRARIES(tsp_res_writer tsp_consumer tsp_common tsp_services
 tsp_res pthread)
 
-ADD_DEPENDENCIES(tsp_res_writer libtsp_res 
-libtsp_common libtsp_consumer libtsp_services)
+ADD_DEPENDENCIES(tsp_res_writer tsp_res 
+tsp_common tsp_consumer tsp_services)
Index: src/consumers/gdisp/Makefile
===================================================================
--- src/consumers/gdisp/Makefile	(révision 4)
+++ src/consumers/gdisp/Makefile	(révision 205)
@@ -1,116 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.2
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /usr/bin/ccmake
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/noularde/TSP/tsp_all/tsp
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/noularde/TSP/tsp_all/tsp
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Default target executed when no arguments are given to make.
-default_target: all
-
-# Special rule to run installation script.
-install: all
-	$(CMAKE_COMMAND) -P cmake_install.cmake
-
-# Special rule to re-run CMake using make.
-rebuild_cache:
-	@echo "Running CMake to regenerate build system..."
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Special rule to re-run CMake cache editor using make.
-edit_cache:
-	@echo "Running CMake cache editor..."
-	$(CMAKE_EDIT_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# The main all target
-all:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/gdisp/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/gdisp/clean
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-
-# Convenience name for target.
-src/consumers/gdisp/CMakeFiles/gdisp.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/gdisp/CMakeFiles/gdisp.dir/rule
-
-# Convenience name for target.
-gdisp: src/consumers/gdisp/CMakeFiles/gdisp.dir/rule
-
-# target for object file
-animation.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp/CMakeFiles/gdisp.dir/build.make src/consumers/gdisp/CMakeFiles/gdisp.dir/animation.o
-
-# target for object file
-config.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp/CMakeFiles/gdisp.dir/build.make src/consumers/gdisp/CMakeFiles/gdisp.dir/config.o
-
-# target for object file
-gdispmain.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp/CMakeFiles/gdisp.dir/build.make src/consumers/gdisp/CMakeFiles/gdisp.dir/gdispmain.o
-
-# target for object file
-interface.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp/CMakeFiles/gdisp.dir/build.make src/consumers/gdisp/CMakeFiles/gdisp.dir/interface.o
-
-# target for object file
-plotwindow.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp/CMakeFiles/gdisp.dir/build.make src/consumers/gdisp/CMakeFiles/gdisp.dir/plotwindow.o
-
-# target for object file
-support.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/gdisp/CMakeFiles/gdisp.dir/build.make src/consumers/gdisp/CMakeFiles/gdisp.dir/support.o
-
-# Help Target
-help::
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... install"
-	@echo "... rebuild_cache"
-	@echo "... gdisp"
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-
Index: src/consumers/gdisp/CMakeLists.txt
===================================================================
--- src/consumers/gdisp/CMakeLists.txt	(révision 4)
+++ src/consumers/gdisp/CMakeLists.txt	(révision 205)
@@ -3,10 +3,12 @@
 config plotwindow
 animation)
 
-ADD_EXECUTABLE(gdisp ${GDISP_SRC})
+ADD_EXECUTABLE(tsp_gdisp ${GDISP_SRC})
+TSP_PROGRAM_INSTALL(tsp_gdisp)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/consumers/gdisp/)
 ADD_DEFINITIONS(${GTK_CFLAGS})
-TARGET_LINK_LIBRARIES(gdisp ${XML2_LIBRARY} ${GTK_LIBRARY} tsp_consumer tsp_common tsp_services
+TARGET_LINK_LIBRARIES(tsp_gdisp ${XML2_LIBRARY} ${GTK_LIBRARY} tsp_consumer tsp_common tsp_services
 pthread tsp_page_config)
 
+
Index: src/consumers/test_group/Makefile
===================================================================
--- src/consumers/test_group/Makefile	(révision 4)
+++ src/consumers/test_group/Makefile	(révision 205)
@@ -1,96 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.2
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /usr/bin/ccmake
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/noularde/TSP/tsp_all/tsp
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/noularde/TSP/tsp_all/tsp
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Default target executed when no arguments are given to make.
-default_target: all
-
-# Special rule to run installation script.
-install: all
-	$(CMAKE_COMMAND) -P cmake_install.cmake
-
-# Special rule to re-run CMake using make.
-rebuild_cache:
-	@echo "Running CMake to regenerate build system..."
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Special rule to re-run CMake cache editor using make.
-edit_cache:
-	@echo "Running CMake cache editor..."
-	$(CMAKE_EDIT_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# The main all target
-all:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/test_group/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/test_group/clean
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-
-# Convenience name for target.
-src/consumers/test_group/CMakeFiles/tsp_testgrp_client.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/test_group/CMakeFiles/tsp_testgrp_client.dir/rule
-
-# Convenience name for target.
-tsp_testgrp_client: src/consumers/test_group/CMakeFiles/tsp_testgrp_client.dir/rule
-
-# target for object file
-client_group.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/test_group/CMakeFiles/tsp_testgrp_client.dir/build.make src/consumers/test_group/CMakeFiles/tsp_testgrp_client.dir/client_group.o
-
-# Help Target
-help::
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... install"
-	@echo "... rebuild_cache"
-	@echo "... tsp_testgrp_client"
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-
Index: src/consumers/test_group/CMakeLists.txt
===================================================================
--- src/consumers/test_group/CMakeLists.txt	(révision 4)
+++ src/consumers/test_group/CMakeLists.txt	(révision 205)
@@ -2,6 +2,7 @@
 SET(SRCS client_group)
 
 ADD_EXECUTABLE(${EXE_NAME} ${SRCS})
+TSP_PROGRAM_INSTALL(${EXE_NAME})
 
 TARGET_LINK_LIBRARIES(${EXE_NAME} tsp_consumer tsp_common tsp_services
 tsp_calc pthread)
@@ -9,3 +10,4 @@
 ADD_DEPENDENCIES(${EXE_NAME} tsp_calc tsp_common tsp_consumer tsp_services)
 
 
+
Index: src/consumers/generic/Makefile
===================================================================
--- src/consumers/generic/Makefile	(révision 4)
+++ src/consumers/generic/Makefile	(révision 205)
@@ -1,100 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.2
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /usr/bin/ccmake
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/noularde/TSP/tsp_all/tsp
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/noularde/TSP/tsp_all/tsp
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Default target executed when no arguments are given to make.
-default_target: all
-
-# Special rule to run installation script.
-install: all
-	$(CMAKE_COMMAND) -P cmake_install.cmake
-
-# Special rule to re-run CMake using make.
-rebuild_cache:
-	@echo "Running CMake to regenerate build system..."
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Special rule to re-run CMake cache editor using make.
-edit_cache:
-	@echo "Running CMake cache editor..."
-	$(CMAKE_EDIT_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# The main all target
-all:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/generic/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/generic/clean
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-
-# Convenience name for target.
-src/consumers/generic/CMakeFiles/tsp_request_generic.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/generic/CMakeFiles/tsp_request_generic.dir/rule
-
-# Convenience name for target.
-tsp_request_generic: src/consumers/generic/CMakeFiles/tsp_request_generic.dir/rule
-
-# target for object file
-generic_consumer.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/generic/CMakeFiles/tsp_request_generic.dir/build.make src/consumers/generic/CMakeFiles/tsp_request_generic.dir/generic_consumer.o
-
-# target for object file
-generic_consumer_main.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/generic/CMakeFiles/tsp_request_generic.dir/build.make src/consumers/generic/CMakeFiles/tsp_request_generic.dir/generic_consumer_main.o
-
-# Help Target
-help::
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... install"
-	@echo "... rebuild_cache"
-	@echo "... tsp_request_generic"
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-
Index: src/consumers/generic/generic_consumer.c
===================================================================
--- src/consumers/generic/generic_consumer.c	(révision 4)
+++ src/consumers/generic/generic_consumer.c	(révision 205)
@@ -34,11 +34,15 @@
 
 -----------------------------------------------------------------------
 */
-#include <unistd.h>
 #include <stdlib.h>
-#include <assert.h>
-#include <string.h>
+#ifdef WIN32
+    #define assert(exp)     ((void)0)
+#else
+    #include <unistd.h>
+    #include <assert.h>
 #include <libgen.h>
+#endif
+#include <string.h>
 #include <stdarg.h>
 
 #include <tsp_sys_headers.h>
@@ -100,6 +104,7 @@
   char*              cmdstr_abbrev;
 
   cmdstr_cpy = strdup(generic_consumer_request_string);
+
   cmdbasename = basename(cmdstr_cpy);
 
   retval = E_TSP_REQUEST_INVALID;
Index: src/consumers/generic/generic_consumer_main.c
===================================================================
--- src/consumers/generic/generic_consumer_main.c	(révision 4)
+++ src/consumers/generic/generic_consumer_main.c	(révision 205)
@@ -36,9 +36,14 @@
 */
 #include <stdio.h>
 #include <malloc.h>
-#include <unistd.h>
 #include <stdlib.h>
-#include <assert.h>
+#ifdef WIN32
+    #define assert(exp)     ((void)0)
+    #include  "getopt.h"
+#else
+    #include <unistd.h>
+    #include <assert.h>
+#endif
 #include <string.h>
 #include <signal.h>
 
@@ -93,8 +98,10 @@
 int 
 main(int argc, char *argv[]){
 
+#if !defined (WIN32)
   struct sigaction   my_action;
   struct sigaction   old_action;
+#endif
   int32_t            retcode=0;
   /* Main options handling */
   /*  char*         error_string;*/
@@ -104,12 +111,17 @@
   generic_consumer_request_t req;
 
   opt_ok            = 1;   
-  
+
+#if defined (WIN32)
+  /* Intercept the CTRL-C signal */  
+  (void) signal(SIGINT, my_sighandler);
+#else
   /* install SIGINT handler (POSIX way) */
   my_action.sa_handler = &my_sighandler;  
   sigfillset(&my_action.sa_mask);
   my_action.sa_flags = SA_RESTART;
   sigaction(SIGINT,&my_action,&old_action);    
+#endif
 
   if(TSP_STATUS_OK!=TSP_consumer_init(&argc, &argv)) {
       STRACE_ERROR(("TSP init failed"));
@@ -122,7 +134,7 @@
   while (opt_ok && (EOF != (c_opt = getopt(argc,argv,"u:hnsv")))) {    
     switch (c_opt) {
     case 'u':
-      opt_ok+=2;
+      opt_ok+=2;      
       req.provider_url = strdup(optarg);
       break;
     case 'n':
Index: src/consumers/generic/CMakeLists.txt
===================================================================
--- src/consumers/generic/CMakeLists.txt	(révision 4)
+++ src/consumers/generic/CMakeLists.txt	(révision 205)
@@ -1,20 +1,25 @@
 
-SET(GENERIC_SRC 
+SET(GENERIC_SRC  
   generic_consumer 
   generic_consumer_main)
 
-TSP_XSCRIPT( 
-  tsp_request_open tsp_request_close
-  tsp_request_async_sample_read 
-  tsp_request_async_sample_write
-  tsp_request_information 
-  tsp_request_filtered_information
-  tsp_request_extended_information)
+#TSP_XSCRIPT( 
+#  tsp_request_open tsp_request_close
+#  tsp_request_async_sample_read 
+#  tsp_request_async_sample_write
+#  tsp_request_information 
+#  tsp_request_filtered_information
+#  tsp_request_extended_information)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/consumers/generic)
+IF (WIN32)
+		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/external/TspWin32)
+ENDIF (WIN32)
 
 ADD_EXECUTABLE(tsp_request_generic ${GENERIC_SRC})
 	
 TARGET_LINK_LIBRARIES(tsp_request_generic 
-  tsp_consumer tsp_common tsp_services
-  pthread)
+  tsp_consumer tsp_common tsp_services ${TSP_WIN32_LIB}
+  ${PTHREAD_LIBRARY_NAME})
+
+TSP_PROGRAM_INSTALL(tsp_request_generic)
\ Pas de fin de ligne à la fin du fichier.
Index: src/consumers/CMakeLists.txt
===================================================================
--- src/consumers/CMakeLists.txt	(révision 4)
+++ src/consumers/CMakeLists.txt	(révision 205)
@@ -3,24 +3,33 @@
 
 ADD_SUBDIRECTORY(generic)
 ADD_SUBDIRECTORY(stdout)
-ADD_SUBDIRECTORY(stdout_callback)
-ADD_SUBDIRECTORY(test_group)
-ADD_SUBDIRECTORY(tutorial)
+# AP : Migration sous Windows
+IF (NOT WIN32)
+	ADD_SUBDIRECTORY(stdout_callback)
+	ADD_SUBDIRECTORY(test_group)
+	ADD_SUBDIRECTORY(tutorial)
+ENDIF (NOT WIN32)
 
 IF (FUSE_FOUND)
   ADD_SUBDIRECTORY(tspfs)
 ENDIF (FUSE_FOUND)
 
-ADD_SUBDIRECTORY(ascii_writer)
-ADD_SUBDIRECTORY(res_writer)
+# AP : Migration sous Windows
+IF (NOT WIN32)
+	ADD_SUBDIRECTORY(ascii_writer)
+	ADD_SUBDIRECTORY(res_writer)
+ENDIF (NOT WIN32)
 
-IF (GTK_FOUND)
+IF (GTK_FOUND AND NOT WIN32)
   ADD_SUBDIRECTORY(gdisp)
   ADD_SUBDIRECTORY(gdisp+)
-ENDIF (GTK_FOUND)
+ENDIF (GTK_FOUND AND NOT WIN32)
 
-IF (OPENGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND)
-  ADD_SUBDIRECTORY(Visu3D)
-ELSE (OPENGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND)
-  MESSAGE("Cannot build Visu3D some lib is missing")
-ENDIF (OPENGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND)
+# AP : Migration sous Windows
+IF (NOT WIN32)
+	IF (OPENGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND)
+		ADD_SUBDIRECTORY(Visu3D)
+	ELSE (OPENGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND)
+		MESSAGE("Cannot build Visu3D some lib is missing")
+	ENDIF (OPENGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND)
+ENDIF (NOT WIN32)
Index: src/consumers/Visu3D/Makefile
===================================================================
--- src/consumers/Visu3D/Makefile	(révision 4)
+++ src/consumers/Visu3D/Makefile	(révision 205)
@@ -1,104 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.2
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /usr/bin/ccmake
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/noularde/TSP/tsp_all/tsp
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/noularde/TSP/tsp_all/tsp
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Default target executed when no arguments are given to make.
-default_target: all
-
-# Special rule to run installation script.
-install: all
-	$(CMAKE_COMMAND) -P cmake_install.cmake
-
-# Special rule to re-run CMake using make.
-rebuild_cache:
-	@echo "Running CMake to regenerate build system..."
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Special rule to re-run CMake cache editor using make.
-edit_cache:
-	@echo "Running CMake cache editor..."
-	$(CMAKE_EDIT_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# The main all target
-all:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/Visu3D/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/Visu3D/clean
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-
-# Convenience name for target.
-src/consumers/Visu3D/CMakeFiles/Visu3D.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/Visu3D/CMakeFiles/Visu3D.dir/rule
-
-# Convenience name for target.
-Visu3D: src/consumers/Visu3D/CMakeFiles/Visu3D.dir/rule
-
-# target for object file
-Loader3ds.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/Visu3D/CMakeFiles/Visu3D.dir/build.make src/consumers/Visu3D/CMakeFiles/Visu3D.dir/Loader3ds.o
-
-# target for object file
-glScene.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/Visu3D/CMakeFiles/Visu3D.dir/build.make src/consumers/Visu3D/CMakeFiles/Visu3D.dir/glScene.o
-
-# target for object file
-testTSP.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/Visu3D/CMakeFiles/Visu3D.dir/build.make src/consumers/Visu3D/CMakeFiles/Visu3D.dir/testTSP.o
-
-# Help Target
-help::
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... install"
-	@echo "... rebuild_cache"
-	@echo "... Visu3D"
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-
Index: src/consumers/Visu3D/CMakeLists.txt
===================================================================
--- src/consumers/Visu3D/CMakeLists.txt	(révision 4)
+++ src/consumers/Visu3D/CMakeLists.txt	(révision 205)
@@ -4,7 +4,8 @@
 ENDIF(GLUT_FOUND)
 
 ADD_EXECUTABLE(Visu3D ${VISU3D_SRC})
-	
-TARGET_LINK_LIBRARIES(Visu3D m GL GLU glut X11 Xmu tsp_consumer tsp_common tsp_services pthread)
+TSP_PROGRAM_INSTALL(Visu3D)	
+
+TARGET_LINK_LIBRARIES(Visu3D m GL GLU glut tsp_consumer tsp_common tsp_services $(PTHREAD_LIBRARY_NAME))
 
 ADD_DEPENDENCIES(Visu3D libtsp_common libtsp_consumer libtsp_services)
Index: src/consumers/stdout_callback/Makefile
===================================================================
--- src/consumers/stdout_callback/Makefile	(révision 4)
+++ src/consumers/stdout_callback/Makefile	(révision 205)
@@ -1,96 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.2
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /usr/bin/ccmake
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/noularde/TSP/tsp_all/tsp
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/noularde/TSP/tsp_all/tsp
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Default target executed when no arguments are given to make.
-default_target: all
-
-# Special rule to run installation script.
-install: all
-	$(CMAKE_COMMAND) -P cmake_install.cmake
-
-# Special rule to re-run CMake using make.
-rebuild_cache:
-	@echo "Running CMake to regenerate build system..."
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Special rule to re-run CMake cache editor using make.
-edit_cache:
-	@echo "Running CMake cache editor..."
-	$(CMAKE_EDIT_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# The main all target
-all:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/stdout_callback/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/stdout_callback/clean
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-
-# Convenience name for target.
-src/consumers/stdout_callback/CMakeFiles/tsp_stdout_client_callback.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/consumers/stdout_callback/CMakeFiles/tsp_stdout_client_callback.dir/rule
-
-# Convenience name for target.
-tsp_stdout_client_callback: src/consumers/stdout_callback/CMakeFiles/tsp_stdout_client_callback.dir/rule
-
-# target for object file
-client_callback_stdout.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/consumers/stdout_callback/CMakeFiles/tsp_stdout_client_callback.dir/build.make src/consumers/stdout_callback/CMakeFiles/tsp_stdout_client_callback.dir/client_callback_stdout.o
-
-# Help Target
-help::
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... install"
-	@echo "... rebuild_cache"
-	@echo "... tsp_stdout_client_callback"
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-
Index: src/consumers/stdout_callback/CMakeLists.txt
===================================================================
--- src/consumers/stdout_callback/CMakeLists.txt	(révision 4)
+++ src/consumers/stdout_callback/CMakeLists.txt	(révision 205)
@@ -2,6 +2,7 @@
 SET(STDOUT_SRC client_callback_stdout)
 
 ADD_EXECUTABLE(${EXE_NAME} ${STDOUT_SRC})
+TSP_PROGRAM_INSTALL(${EXE_NAME})
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/util/libcalc)
 
 TARGET_LINK_LIBRARIES(${EXE_NAME} tsp_consumer tsp_common tsp_services
