Index: /trunk/FACT++/Makefile.am
===================================================================
--- /trunk/FACT++/Makefile.am	(revision 10870)
+++ /trunk/FACT++/Makefile.am	(revision 10871)
@@ -205,20 +205,20 @@
 
 chatserv_LDADD = libTools.la libStateMachine.la libConfiguration.la libTime.la libDim.la libDim++.la
-chatserv_SOURCES = src/chatserv.cc src/LocalControl.cc src/LocalControl.h
-
-
-dclient5_SOURCES = src/dclient5.cc src/LocalControl.cc src/LocalControl.h
+chatserv_SOURCES = src/chatserv.cc src/LocalControl.h
+
+
+dclient5_SOURCES = src/dclient5.cc src/LocalControl.h
 dclient5_LDADD   = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
     libConfiguration.la
 
-ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFTM.cc
+ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.h src/HeadersFTM.cc
 ftmctrl_LDADD   = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
     libConfiguration.la
 
-drivectrl_SOURCES = src/drivectrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFTM.cc
+drivectrl_SOURCES = src/drivectrl.cc src/LocalControl.h src/HeadersFTM.cc
 drivectrl_LDADD   = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
     libConfiguration.la
 
-fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFAD.cc \
+fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.h src/HeadersFAD.cc \
     src/EventBuilder.c src/EventBuilder.h
 fadctrl_LDADD   = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
@@ -247,5 +247,5 @@
 test_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
 
-dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc src/LocalControl.h
+dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.h
 if HAS_FITS
 dataLogger_SOURCES += src/Fits.cc
@@ -254,8 +254,8 @@
     libConfiguration.la
 
-scheduler_SOURCES = src/scheduler.cc src/LocalControl.cc src/LocalControl.h 
+scheduler_SOURCES = src/scheduler.cc src/LocalControl.h 
 scheduler_LDADD   = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
 
-fitsloader_SOURCES = src/fitsloader.cc src/LocalControl.cc src/LocalControl.h 
+fitsloader_SOURCES = src/fitsloader.cc src/LocalControl.h 
 fitsloader_LDADD   = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
 
Index: /trunk/FACT++/Makefile.in
===================================================================
--- /trunk/FACT++/Makefile.in	(revision 10870)
+++ /trunk/FACT++/Makefile.in	(revision 10871)
@@ -168,19 +168,16 @@
 chatclient_DEPENDENCIES = libTools.la libStateMachine.la libTime.la \
 	libDim.la libDim++.la libConfiguration.la
-am_chatserv_OBJECTS = src/chatserv.$(OBJEXT) \
-	src/LocalControl.$(OBJEXT)
+am_chatserv_OBJECTS = src/chatserv.$(OBJEXT)
 chatserv_OBJECTS = $(am_chatserv_OBJECTS)
 chatserv_DEPENDENCIES = libTools.la libStateMachine.la \
 	libConfiguration.la libTime.la libDim.la libDim++.la
-am__dataLogger_SOURCES_DIST = src/dataLogger.cc src/LocalControl.cc \
-	src/LocalControl.h src/Fits.cc
+am__dataLogger_SOURCES_DIST = src/dataLogger.cc src/LocalControl.h \
+	src/Fits.cc
 @HAS_FITS_TRUE@am__objects_1 = src/Fits.$(OBJEXT)
-am_dataLogger_OBJECTS = src/dataLogger.$(OBJEXT) \
-	src/LocalControl.$(OBJEXT) $(am__objects_1)
+am_dataLogger_OBJECTS = src/dataLogger.$(OBJEXT) $(am__objects_1)
 dataLogger_OBJECTS = $(am_dataLogger_OBJECTS)
 dataLogger_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \
 	libStateMachine.la libConfiguration.la
-am_dclient5_OBJECTS = src/dclient5.$(OBJEXT) \
-	src/LocalControl.$(OBJEXT)
+am_dclient5_OBJECTS = src/dclient5.$(OBJEXT)
 dclient5_OBJECTS = $(am_dclient5_OBJECTS)
 dclient5_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \
@@ -198,5 +195,5 @@
 dns_DEPENDENCIES = libDim.la
 am_drivectrl_OBJECTS = src/drivectrl.$(OBJEXT) \
-	src/LocalControl.$(OBJEXT) src/HeadersFTM.$(OBJEXT)
+	src/HeadersFTM.$(OBJEXT)
 drivectrl_OBJECTS = $(am_drivectrl_OBJECTS)
 drivectrl_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \
@@ -231,6 +228,6 @@
 fad_DEPENDENCIES = libTime.la libTools.la libStateMachine.la libDim.la \
 	libDim++.la
-am_fadctrl_OBJECTS = src/fadctrl.$(OBJEXT) src/LocalControl.$(OBJEXT) \
-	src/HeadersFAD.$(OBJEXT) src/EventBuilder.$(OBJEXT)
+am_fadctrl_OBJECTS = src/fadctrl.$(OBJEXT) src/HeadersFAD.$(OBJEXT) \
+	src/EventBuilder.$(OBJEXT)
 fadctrl_OBJECTS = $(am_fadctrl_OBJECTS)
 fadctrl_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \
@@ -242,6 +239,5 @@
 fitsgrep_OBJECTS = fitsgrep.$(OBJEXT)
 fitsgrep_LDADD = $(LDADD)
-am_fitsloader_OBJECTS = src/fitsloader.$(OBJEXT) \
-	src/LocalControl.$(OBJEXT)
+am_fitsloader_OBJECTS = src/fitsloader.$(OBJEXT)
 fitsloader_OBJECTS = $(am_fitsloader_OBJECTS)
 fitsloader_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
@@ -251,6 +247,5 @@
 ftm_DEPENDENCIES = libTime.la libTools.la libStateMachine.la libDim.la \
 	libDim++.la
-am_ftmctrl_OBJECTS = src/ftmctrl.$(OBJEXT) src/LocalControl.$(OBJEXT) \
-	src/HeadersFTM.$(OBJEXT)
+am_ftmctrl_OBJECTS = src/ftmctrl.$(OBJEXT) src/HeadersFTM.$(OBJEXT)
 ftmctrl_OBJECTS = $(am_ftmctrl_OBJECTS)
 ftmctrl_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \
@@ -267,6 +262,5 @@
 sched_OBJECTS = sched.$(OBJEXT)
 sched_LDADD = $(LDADD)
-am_scheduler_OBJECTS = src/scheduler.$(OBJEXT) \
-	src/LocalControl.$(OBJEXT)
+am_scheduler_OBJECTS = src/scheduler.$(OBJEXT)
 scheduler_OBJECTS = $(am_scheduler_OBJECTS)
 scheduler_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
@@ -745,18 +739,18 @@
 logtime_SOURCES = src/logtime.cc
 chatserv_LDADD = libTools.la libStateMachine.la libConfiguration.la libTime.la libDim.la libDim++.la
-chatserv_SOURCES = src/chatserv.cc src/LocalControl.cc src/LocalControl.h
-dclient5_SOURCES = src/dclient5.cc src/LocalControl.cc src/LocalControl.h
+chatserv_SOURCES = src/chatserv.cc src/LocalControl.h
+dclient5_SOURCES = src/dclient5.cc src/LocalControl.h
 dclient5_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
     libConfiguration.la
 
-ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFTM.cc
+ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.h src/HeadersFTM.cc
 ftmctrl_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
     libConfiguration.la
 
-drivectrl_SOURCES = src/drivectrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFTM.cc
+drivectrl_SOURCES = src/drivectrl.cc src/LocalControl.h src/HeadersFTM.cc
 drivectrl_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
     libConfiguration.la
 
-fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFAD.cc \
+fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.h src/HeadersFAD.cc \
     src/EventBuilder.c src/EventBuilder.h
 
@@ -777,12 +771,12 @@
 test_SOURCES = src/test.cc
 test_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
-dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc \
-	src/LocalControl.h $(am__append_3)
+dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.h \
+	$(am__append_3)
 dataLogger_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
     libConfiguration.la
 
-scheduler_SOURCES = src/scheduler.cc src/LocalControl.cc src/LocalControl.h 
+scheduler_SOURCES = src/scheduler.cc src/LocalControl.h 
 scheduler_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
-fitsloader_SOURCES = src/fitsloader.cc src/LocalControl.cc src/LocalControl.h 
+fitsloader_SOURCES = src/fitsloader.cc src/LocalControl.h 
 fitsloader_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
 fitsdump_SOURCES = src/fitsdump.cc 
@@ -1059,6 +1053,4 @@
 	$(AM_V_CXXLD)$(CXXLINK) $(chatclient_OBJECTS) $(chatclient_LDADD) $(LIBS)
 src/chatserv.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/LocalControl.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 chatserv$(EXEEXT): $(chatserv_OBJECTS) $(chatserv_DEPENDENCIES) 
@@ -1287,5 +1279,4 @@
 	-rm -f src/HeadersFAD.$(OBJEXT)
 	-rm -f src/HeadersFTM.$(OBJEXT)
-	-rm -f src/LocalControl.$(OBJEXT)
 	-rm -f src/MessageDim.$(OBJEXT)
 	-rm -f src/MessageDim.lo
@@ -1392,5 +1383,4 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/HeadersFAD.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/HeadersFTM.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/LocalControl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/MessageDim.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/MessageImp.Plo@am__quote@