Index: src/util/Makefile
===================================================================
--- src/util/Makefile	(révision 4)
+++ src/util/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/util/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/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/util/libres/Makefile
===================================================================
--- src/util/libres/Makefile	(révision 4)
+++ src/util/libres/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/util/libres/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/libres/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/util/libres/CMakeFiles/tsp_res.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/libres/CMakeFiles/tsp_res.dir/rule
-
-# Convenience name for target.
-tsp_res: src/util/libres/CMakeFiles/tsp_res.dir/rule
-
-# target for object file
-datar.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libres/CMakeFiles/tsp_res.dir/build.make src/util/libres/CMakeFiles/tsp_res.dir/datar.o
-
-# target for object file
-dataw.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libres/CMakeFiles/tsp_res.dir/build.make src/util/libres/CMakeFiles/tsp_res.dir/dataw.o
-
-# target for object file
-use_dbl.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libres/CMakeFiles/tsp_res.dir/build.make src/util/libres/CMakeFiles/tsp_res.dir/use_dbl.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"
-
-
-
-#=============================================================================
-# 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/util/libres/dataw.c
===================================================================
--- src/util/libres/dataw.c	(révision 4)
+++ src/util/libres/dataw.c	(révision 205)
@@ -284,7 +284,7 @@
 
 
 
-void	d_clos(void)
+void	d_clos()
 {
 
   if(d_glob_rhandle)
Index: src/util/libres/CMakeLists.txt
===================================================================
--- src/util/libres/CMakeLists.txt	(révision 4)
+++ src/util/libres/CMakeLists.txt	(révision 205)
@@ -3,3 +3,4 @@
 dataw.c)
 
 ADD_LIBRARY(tsp_res ${LIBRES_SRC})
+TSP_LIBRARY_INSTALL(tsp_res)
Index: src/util/libutil/Makefile
===================================================================
--- src/util/libutil/Makefile	(révision 4)
+++ src/util/libutil/Makefile	(révision 205)
@@ -1,121 +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/util/libutil/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/libutil/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/util/libutil/CMakeFiles/tsp_check_host_and_ip.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/libutil/CMakeFiles/tsp_check_host_and_ip.dir/rule
-
-# Convenience name for target.
-tsp_check_host_and_ip: src/util/libutil/CMakeFiles/tsp_check_host_and_ip.dir/rule
-
-# Convenience name for target.
-src/util/libutil/CMakeFiles/tsp_hash_dump.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/libutil/CMakeFiles/tsp_hash_dump.dir/rule
-
-# Convenience name for target.
-tsp_hash_dump: src/util/libutil/CMakeFiles/tsp_hash_dump.dir/rule
-
-# Convenience name for target.
-src/util/libutil/CMakeFiles/tsp_util.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/libutil/CMakeFiles/tsp_util.dir/rule
-
-# Convenience name for target.
-tsp_util: src/util/libutil/CMakeFiles/tsp_util.dir/rule
-
-# target for object file
-tsp_check_host_and_ip.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libutil/CMakeFiles/tsp_check_host_and_ip.dir/build.make src/util/libutil/CMakeFiles/tsp_check_host_and_ip.dir/tsp_check_host_and_ip.o
-
-# target for object file
-tsp_hash.o:
-	cd /home/noularde/TSP/tsp_all/tsp && cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libutil/CMakeFiles/tsp_hash_dump.dir/build.make src/util/libutil/CMakeFiles/tsp_hash_dump.dir/tsp_hash.o
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libutil/CMakeFiles/tsp_util.dir/build.make src/util/libutil/CMakeFiles/tsp_util.dir/tsp_hash.o
-
-# target for object file
-tsp_hash_main.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libutil/CMakeFiles/tsp_hash_dump.dir/build.make src/util/libutil/CMakeFiles/tsp_hash_dump.dir/tsp_hash_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_check_host_and_ip"
-	@echo "... tsp_hash_dump"
-	@echo "... tsp_util"
-
-
-
-#=============================================================================
-# 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/util/libutil/CMakeLists.txt
===================================================================
--- src/util/libutil/CMakeLists.txt	(révision 4)
+++ src/util/libutil/CMakeLists.txt	(révision 205)
@@ -2,6 +2,8 @@
 tsp_hash.c)
 
 ADD_LIBRARY(tsp_util ${LIBUTIL_SRC})
+TSP_LIBRARY_INSTALL(tsp_util)
 ADD_EXECUTABLE(tsp_hash_dump tsp_hash.c tsp_hash_main.c)
-
+TSP_PROGRAM_INSTALL(tsp_hash_dump)
 ADD_EXECUTABLE(tsp_check_host_and_ip tsp_check_host_and_ip.c)
+TSP_PROGRAM_INSTALL(tsp_check_host_and_ip)
Index: src/util/libpages/Makefile
===================================================================
--- src/util/libpages/Makefile	(révision 4)
+++ src/util/libpages/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/util/libpages/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/libpages/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/util/libpages/CMakeFiles/tsp_page_config.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/libpages/CMakeFiles/tsp_page_config.dir/rule
-
-# Convenience name for target.
-tsp_page_config: src/util/libpages/CMakeFiles/tsp_page_config.dir/rule
-
-# target for object file
-page_config.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libpages/CMakeFiles/tsp_page_config.dir/build.make src/util/libpages/CMakeFiles/tsp_page_config.dir/page_config.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_page_config"
-
-
-
-#=============================================================================
-# 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/util/libpages/CMakeLists.txt
===================================================================
--- src/util/libpages/CMakeLists.txt	(révision 4)
+++ src/util/libpages/CMakeLists.txt	(révision 205)
@@ -4,4 +4,5 @@
 ADD_DEFINITIONS(${XML2_CFLAGS})
 
 ADD_LIBRARY(tsp_page_config ${LIBPAGES_SRC})
+TSP_LIBRARY_INSTALL(tsp_page_config)
 TARGET_LINK_LIBRARIES(tsp_page_config ${XML2_LIBRARY})
Index: src/util/libcalc/Makefile
===================================================================
--- src/util/libcalc/Makefile	(révision 4)
+++ src/util/libcalc/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/util/libcalc/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/libcalc/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/util/libcalc/CMakeFiles/tsp_calc.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/libcalc/CMakeFiles/tsp_calc.dir/rule
-
-# Convenience name for target.
-tsp_calc: src/util/libcalc/CMakeFiles/tsp_calc.dir/rule
-
-# target for object file
-calc_func.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libcalc/CMakeFiles/tsp_calc.dir/build.make src/util/libcalc/CMakeFiles/tsp_calc.dir/calc_func.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_calc"
-
-
-
-#=============================================================================
-# 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/util/libcalc/calc_func.h
===================================================================
--- src/util/libcalc/calc_func.h	(révision 4)
+++ src/util/libcalc/calc_func.h	(révision 205)
@@ -38,14 +38,26 @@
 #ifndef CALC_FUNC_H
 #define CALC_FUNC_H
 
+#include <tsp_abs_types.h>
+
+#undef _EXPORT_TSP_CALC
+#if defined (WIN32) && defined (TSP_SHARED_LIBS)
+#  ifdef tsp_calc_EXPORTS
+#    define _EXPORT_TSP_CALC __declspec(dllexport) 
+#  else
+#    define _EXPORT_TSP_CALC __declspec(dllimport) 
+#  endif
+#else
+#  define _EXPORT_TSP_CALC
+#endif
 
 BEGIN_C_DECLS
 
 /* return nice value for plotting */
-double calc_func (int index, double my_time);
+_EXPORT_TSP_CALC double calc_func (int index, double my_time);
 
 /* return nice value for plotting */
-char calc_func_char (int index, double my_time);
+_EXPORT_TSP_CALC char calc_func_char (int index, double my_time);
 
 
 
Index: src/util/libcalc/CMakeLists.txt
===================================================================
--- src/util/libcalc/CMakeLists.txt	(révision 4)
+++ src/util/libcalc/CMakeLists.txt	(révision 205)
@@ -1,6 +1,7 @@
-SET(LIBCALC_SRC
-calc_func.c)
+SET(LIBCALC_SRC calc_func)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/util/libcalc)
 ADD_LIBRARY(tsp_calc ${LIBCALC_SRC})
+TSP_LIBRARY_INSTALL(tsp_calc)
+TSP_XINCLUDE(${LIBCALC_SRC})
 
Index: src/util/libcalc/calc_func.c
===================================================================
--- src/util/libcalc/calc_func.c	(révision 4)
+++ src/util/libcalc/calc_func.c	(révision 205)
@@ -38,6 +38,7 @@
 
 #include <math.h>
 
+#include "calc_func.h"
 
 /* return nice value for plotting */
 double calc_func (int index, double my_time)
@@ -118,8 +119,11 @@
   }
   else
   {
-      index= my_time * index;
-      int module = index % 20;
+      /* AP : Migration sous Windows */
+      /* index= my_time * index; */
+      /* int module = index % 20; */
+      int i = my_time * index;
+      int module = i % 20;
       ret=lettre[module];
 
   }
Index: src/util/libbb/Makefile
===================================================================
--- src/util/libbb/Makefile	(révision 4)
+++ src/util/libbb/Makefile	(révision 205)
@@ -1,120 +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/util/libbb/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/libbb/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/util/libbb/CMakeFiles/bb.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/libbb/CMakeFiles/bb.dir/rule
-
-# Convenience name for target.
-bb: src/util/libbb/CMakeFiles/bb.dir/rule
-
-# target for object file
-bb_alias.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libbb/CMakeFiles/bb.dir/build.make src/util/libbb/CMakeFiles/bb.dir/bb_alias.o
-
-# target for object file
-bb_core.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libbb/CMakeFiles/bb.dir/build.make src/util/libbb/CMakeFiles/bb.dir/bb_core.o
-
-# target for object file
-bb_core_sysv.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libbb/CMakeFiles/bb.dir/build.make src/util/libbb/CMakeFiles/bb.dir/bb_core_sysv.o
-
-# target for object file
-bb_sha1.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libbb/CMakeFiles/bb.dir/build.make src/util/libbb/CMakeFiles/bb.dir/bb_sha1.o
-
-# target for object file
-bb_simple.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libbb/CMakeFiles/bb.dir/build.make src/util/libbb/CMakeFiles/bb.dir/bb_simple.o
-
-# target for object file
-bb_tools.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libbb/CMakeFiles/bb.dir/build.make src/util/libbb/CMakeFiles/bb.dir/bb_tools.o
-
-# target for object file
-bb_utils.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libbb/CMakeFiles/bb.dir/build.make src/util/libbb/CMakeFiles/bb.dir/bb_utils.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 "... bb"
-
-
-
-#=============================================================================
-# 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/util/libbb/bb_utils.c
===================================================================
--- src/util/libbb/bb_utils.c	(révision 4)
+++ src/util/libbb/bb_utils.c	(révision 205)
@@ -40,7 +40,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
-
+#include <assert.h>
 #include <sys/ipc.h>
 
 #include <tsp_sys_headers.h>
Index: src/util/libbb/scripting/Makefile
===================================================================
--- src/util/libbb/scripting/Makefile	(révision 4)
+++ src/util/libbb/scripting/Makefile	(révision 205)
@@ -1,38 +0,0 @@
-include $(DEVBASE)/make/Makeparams
-
-# -----------------------------------------------------------
-
-SOURCES = \
-	bb_utils.c \
-	bb_core.c \
-	bb_simple.c \
-	bb_sha1.c \
-	bb_tools.c \
-	bb_tools_tclwrap.c
-
-SHOBJECTS=$(SOURCES:%.c=$(DIRSHOBJ)/%.o) 
-
-SCRIPT_SHLIB_TARGET=libbb
-
-# -----------------------------------------------------------
-# No label all:: because it's in Makeparams and calls build::	
-# same thing for clean:: that calls destroy::
-# -----------------------------------------------------------
-
-wrappergen : bb_tools.i
-	-@swig -tcl -namespace  -pkgversion "0.1" -o bb_tools_tclwrap.c -I.. bb_tools.i
-
-
-bb_tools_tclwrap.c : wrappergen
-
-build:: wrappergen $(SHOBJECTS)
-	$(MAKE) make_shlib
-
-destroy::
-	$(RM) $(SHOBJECTS)
-	$(MAKE) remove_shlib
-
-# -----------------------------------------------------------
-include $(DEVBASE)/make/Makerules
-
-
Index: src/util/libbb/bbtools/Makefile
===================================================================
--- src/util/libbb/bbtools/Makefile	(révision 4)
+++ src/util/libbb/bbtools/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/util/libbb/bbtools/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/libbb/bbtools/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/util/libbb/bbtools/CMakeFiles/bb_simu.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/libbb/bbtools/CMakeFiles/bb_simu.dir/rule
-
-# Convenience name for target.
-bb_simu: src/util/libbb/bbtools/CMakeFiles/bb_simu.dir/rule
-
-# Convenience name for target.
-src/util/libbb/bbtools/CMakeFiles/bb_tools.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/libbb/bbtools/CMakeFiles/bb_tools.dir/rule
-
-# Convenience name for target.
-bb_tools: src/util/libbb/bbtools/CMakeFiles/bb_tools.dir/rule
-
-# target for object file
-bb_simu.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libbb/bbtools/CMakeFiles/bb_simu.dir/build.make src/util/libbb/bbtools/CMakeFiles/bb_simu.dir/bb_simu.o
-
-# target for object file
-bb_tools_main.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libbb/bbtools/CMakeFiles/bb_tools.dir/build.make src/util/libbb/bbtools/CMakeFiles/bb_tools.dir/bb_tools_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 "... bb_simu"
-	@echo "... bb_tools"
-
-
-
-#=============================================================================
-# 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/util/libbb/bbtools/CMakeLists.txt
===================================================================
--- src/util/libbb/bbtools/CMakeLists.txt	(révision 4)
+++ src/util/libbb/bbtools/CMakeLists.txt	(révision 205)
@@ -21,7 +21,9 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/util/libbb)
 
 ADD_EXECUTABLE(bb_simu ${SIMU_SRC})
-ADD_EXECUTABLE(bb_tools ${TOOLS_SRC})
 TARGET_LINK_LIBRARIES(bb_simu bb m)
-TARGET_LINK_LIBRARIES(bb_tools bb)
+TSP_PROGRAM_INSTALL(bb_simu)
 
+ADD_EXECUTABLE(bb_tools ${TOOLS_SRC})
+TARGET_LINK_LIBRARIES(bb_tools bb)
+TSP_PROGRAM_INSTALL(bb_tools)
Index: src/util/libbb/CMakeLists.txt
===================================================================
--- src/util/libbb/CMakeLists.txt	(révision 4)
+++ src/util/libbb/CMakeLists.txt	(révision 205)
@@ -6,7 +6,8 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/util/libbb)
 
 ADD_LIBRARY(bb ${_SRC})
-TARGET_LINK_LIBRARIES(bb pthread)
+TSP_LIBRARY_INSTALL(bb)
+TARGET_LINK_LIBRARIES(bb ${PTHREAD_LIBRARY_NAME})
 
 ADD_SUBDIRECTORY(bbtools)
 
Index: src/util/CMakeLists.txt
===================================================================
--- src/util/CMakeLists.txt	(révision 4)
+++ src/util/CMakeLists.txt	(révision 205)
@@ -1,10 +1,18 @@
 
-IF (XML2_FOUND)
+IF (XML2_FOUND AND NOT WIN32)
   ADD_SUBDIRECTORY(libpages)
   ADD_SUBDIRECTORY(libtspcfg)
-ENDIF (XML2_FOUND)
+ENDIF (XML2_FOUND AND NOT WIN32)
+
+# AP : Migration sous Windows
+IF (NOT WIN32)
+	ADD_SUBDIRECTORY(libutil)
+	ADD_SUBDIRECTORY(libres)
+ENDIF (NOT WIN32)
 
-ADD_SUBDIRECTORY(libutil)
-ADD_SUBDIRECTORY(libres)
 ADD_SUBDIRECTORY(libcalc)
-ADD_SUBDIRECTORY(libbb)
+
+# AP : Migration sous Windows
+IF (NOT WIN32)
+	ADD_SUBDIRECTORY(libbb)
+ENDIF (NOT WIN32)
Index: src/util/libhisto/Makefile
===================================================================
--- src/util/libhisto/Makefile	(révision 4)
+++ src/util/libhisto/Makefile	(révision 205)
@@ -1,27 +0,0 @@
-include $(DEVBASE)/make/Makeparams
-
-# -----------------------------------------------------------
-XINC    = histogram.h
-
-SOURCES = \
-	histogram.c 
-
-OBJECTS=$(SOURCES:%.c=%.o) 
-
-TARGET=$(DIRLIB)/libtsp_histo.a
-
-# -----------------------------------------------------------
-# No label all:: because it's in Makeparams and calls build::	
-# same thing for clean:: that calls destroy::
-# -----------------------------------------------------------
-
-build:: $(TARGET)($(OBJECTS))
-
-destroy::
-	$(RM) 	 $(TARGET) 
-
-# -----------------------------------------------------------
-include $(DEVBASE)/make/Makerules
-
-
-
Index: src/util/libtspcfg/Makefile
===================================================================
--- src/util/libtspcfg/Makefile	(révision 4)
+++ src/util/libtspcfg/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/util/libtspcfg/directorystart
-
-# The main clean target
-clean:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/libtspcfg/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/util/libtspcfg/CMakeFiles/tsp_cfg.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/libtspcfg/CMakeFiles/tsp_cfg.dir/rule
-
-# Convenience name for target.
-tsp_cfg: src/util/libtspcfg/CMakeFiles/tsp_cfg.dir/rule
-
-# Convenience name for target.
-src/util/libtspcfg/CMakeFiles/tspcfg.dir/rule:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f CMakeFiles/Makefile2 src/util/libtspcfg/CMakeFiles/tspcfg.dir/rule
-
-# Convenience name for target.
-tspcfg: src/util/libtspcfg/CMakeFiles/tspcfg.dir/rule
-
-# target for object file
-tspcfg_file.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libtspcfg/CMakeFiles/tspcfg.dir/build.make src/util/libtspcfg/CMakeFiles/tspcfg.dir/tspcfg_file.o
-
-# target for object file
-tspcfg_file_main.o:
-	cd /home/noularde/TSP/tsp_all/tsp && $(MAKE) -f src/util/libtspcfg/CMakeFiles/tsp_cfg.dir/build.make src/util/libtspcfg/CMakeFiles/tsp_cfg.dir/tspcfg_file_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_cfg"
-	@echo "... tspcfg"
-
-
-
-#=============================================================================
-# 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/util/libtspcfg/CMakeLists.txt
===================================================================
--- src/util/libtspcfg/CMakeLists.txt	(révision 4)
+++ src/util/libtspcfg/CMakeLists.txt	(révision 205)
@@ -3,5 +3,7 @@
 ADD_DEFINITIONS(${XML2_CFLAGS})
 
 ADD_LIBRARY(tspcfg ${_SRC})
+TSP_LIBRARY_INSTALL(tspcfg)
 ADD_EXECUTABLE(tsp_cfg tspcfg_file_main.c)
+TSP_PROGRAM_INSTALL(tsp_cfg)
 TARGET_LINK_LIBRARIES(tsp_cfg tspcfg ${XML2_LIBRARY} tsp_common)
