Index: /trunk/FACT++/Makefile.am
===================================================================
--- /trunk/FACT++/Makefile.am	(revision 10301)
+++ /trunk/FACT++/Makefile.am	(revision 10302)
@@ -23,5 +23,9 @@
 #-------------------------------------------------------------------------
 
-bin_PROGRAMS    = dns did log logtime argv time test3 dclient5 dserver2
+bin_PROGRAMS = \
+	dns did \
+	log logtime argv time \
+	test3 dclient5 dserver2 dataLogger
+#	sched test ftm ftmctrl 
 
 lib_LTLIBRARIES = libDim.la libDim++.la libTime.la libTools.la \
@@ -55,5 +59,8 @@
 did_LDADD    = libDim.la 
 did_CPPFLAGS = $(AM_CPPFLAGS) -Idim_v19r15/src/did 
-did_SOURCES  = dim_v19r15/src/did/did.c dim_v19r15/src/did/dui_util.c
+did_SOURCES  = \
+	dim_v19r15/src/did/did.c dim_v19r15/src/did/did.h \
+	dim_v19r15/src/did/dui_util.c dim_v19r15/src/did/dui_util.h \
+	dim_v19r15/src/did/dui_colors.h
 
 
@@ -87,4 +94,5 @@
 libDim___la_HEADERS = \
 	dim_v19r15/dim/dic.hxx \
+	dim_v19r15/dim/dis.hxx \
 	dim_v19r15/dim/dim_core.hxx \
 	dim_v19r15/dim/dim.hxx \
@@ -117,6 +125,10 @@
 	src/Console.h         src/Console.cc \
 	src/Shell.h           src/Shell.cc \
+	src/Description.h     src/Description.cc \
+	src/DimDescriptionService.h \
+	src/DimDescriptionService.cc \
 	src/Connection.h      src/Connection.cc \
-	src/EventDim.h
+	src/EventDim.h \
+	src/DimErrorRedirecter.h
 
 
@@ -131,4 +143,7 @@
 dserver2_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
 
+#ftm_SOURCES = src/ftm.cc 
+#ftm_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
+
 
 log_SOURCES = src/log.cc
@@ -140,8 +155,16 @@
 
 
-dclient5_SOURCES = src/dclient5.cc src/LocalControl.cc
+dclient5_SOURCES = src/dclient5.cc src/LocalControl.cc src/LocalControl.h
 dclient5_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
     libConfiguration.la
 
+ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.cc src/LocalControl.h
+ftmctrl_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
+    libConfiguration.la
+
+#sched_SOURCES = src/sched.cc src/LocalControl.cc src/LocalControl.h
+#sched_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
+#    libConfiguration.la
+
 
 argv_SOURCES = src/argv.cc
@@ -149,5 +172,5 @@
 
 
-test3_SOURCES = src/test3.cc src/RemoteControl.cc
+test3_SOURCES = src/test3.cc src/RemoteControl.cc src/RemoteControl.h
 test3_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
 
@@ -155,4 +178,13 @@
 time_SOURCES = src/time.cc
 time_LDADD = libTime.la 
+
+#test_SOURCES = src/test.cc
+#test_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
+
+dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc src/LocalControl.h
+dataLogger_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
+    libConfiguration.la
+
+
 
 diff: