Index: /trunk/FACT++/Makefile.in
===================================================================
--- /trunk/FACT++/Makefile.in	(revision 10515)
+++ /trunk/FACT++/Makefile.in	(revision 10516)
@@ -60,7 +60,11 @@
 @IS_FALSE@	sched astro
 
-@HAS_GROFF_TRUE@am__append_3 = $(dist_man1_MANS:.man=.html)
-@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_4 = $(dist_man1_MANS:.man=.pdf)
-@HAS_HELP2MAN_TRUE@am__append_5 = $(dist_man1_MANS)
+@HAS_HELP2MAN_TRUE@am__append_3 = $(dist_man1_MANS)
+@HAS_GROFF_TRUE@am__append_4 = $(dist_man1_MANS:.man=.html)
+@HAS_GROFF_TRUE@am__append_5 = $(dist_man1_MANS:.man=.html) 
+@HAS_GROFF_TRUE@am__append_6 = $(dist_man1_MANS:.man=.html) 
+@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_7 = $(dist_man1_MANS:.man=.pdf)
+@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_8 = $(dist_man1_MANS:.man=.pdf)
+@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_9 = $(dist_man1_MANS:.man=.pdf)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -158,19 +162,23 @@
 astro_OBJECTS = astro.$(OBJEXT)
 astro_LDADD = $(LDADD)
-chatclient_SOURCES = chatclient.c
-chatclient_OBJECTS = chatclient.$(OBJEXT)
-chatclient_LDADD = $(LDADD)
-chatserv_SOURCES = chatserv.c
-chatserv_OBJECTS = chatserv.$(OBJEXT)
-chatserv_LDADD = $(LDADD)
+am_chatclient_OBJECTS = src/chatclient.$(OBJEXT) \
+	src/ChatClient.$(OBJEXT)
+chatclient_OBJECTS = $(am_chatclient_OBJECTS)
+chatclient_DEPENDENCIES = libTools.la libStateMachine.la libTime.la \
+	libDim.la libDim++.la libConfiguration.la
+am_chatserv_OBJECTS = src/chatserv.$(OBJEXT) \
+	src/LocalControl.$(OBJEXT)
+chatserv_OBJECTS = $(am_chatserv_OBJECTS)
+chatserv_DEPENDENCIES = libTools.la libStateMachine.la \
+	libConfiguration.la libTime.la libDim.la libDim++.la
 am_dataLogger_OBJECTS = src/dataLogger.$(OBJEXT) \
 	src/LocalControl.$(OBJEXT) src/Fits.$(OBJEXT)
 dataLogger_OBJECTS = $(am_dataLogger_OBJECTS)
-dataLogger_DEPENDENCIES = libDim.la libDim++.la libTools.la libTime.la \
+dataLogger_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \
 	libStateMachine.la libConfiguration.la
 am_dclient5_OBJECTS = src/dclient5.$(OBJEXT) \
 	src/LocalControl.$(OBJEXT)
 dclient5_OBJECTS = $(am_dclient5_OBJECTS)
-dclient5_DEPENDENCIES = libDim.la libDim++.la libTools.la libTime.la \
+dclient5_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \
 	libStateMachine.la libConfiguration.la
 am_did_OBJECTS = dim/src/did/did-did.$(OBJEXT) \
@@ -207,5 +215,6 @@
 fact_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libDim.la \
-	libDim++.la libTools.la libTime.la libStateMachine.la
+	libDim++.la libTools.la libTime.la libTools.la \
+	libStateMachine.la libConfiguration.la
 fitsgrep_SOURCES = fitsgrep.c
 fitsgrep_OBJECTS = fitsgrep.$(OBJEXT)
@@ -218,13 +227,13 @@
 	src/HeadersFTM.$(OBJEXT)
 ftmctrl_OBJECTS = $(am_ftmctrl_OBJECTS)
-ftmctrl_DEPENDENCIES = libDim.la libDim++.la libTools.la libTime.la \
+ftmctrl_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \
 	libStateMachine.la libConfiguration.la
 am_log_OBJECTS = src/log.$(OBJEXT)
 log_OBJECTS = $(am_log_OBJECTS)
-log_DEPENDENCIES = libTime.la libTools.la libDim.la libDim++.la \
+log_DEPENDENCIES = libTime.la libDim.la libDim++.la libTools.la \
 	libStateMachine.la
 am_logtime_OBJECTS = src/logtime.$(OBJEXT)
 logtime_OBJECTS = $(am_logtime_OBJECTS)
-logtime_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
+logtime_DEPENDENCIES = libTools.la libStateMachine.la libTime.la \
 	libDim.la libDim++.la
 sched_SOURCES = sched.c
@@ -233,9 +242,9 @@
 am_test_OBJECTS = src/test.$(OBJEXT)
 test_OBJECTS = $(am_test_OBJECTS)
-test_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
+test_DEPENDENCIES = libTools.la libStateMachine.la libTime.la \
 	libDim.la libDim++.la libConfiguration.la
 am_test3_OBJECTS = src/test3.$(OBJEXT) src/RemoteControl.$(OBJEXT)
 test3_OBJECTS = $(am_test3_OBJECTS)
-test3_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
+test3_DEPENDENCIES = libTools.la libStateMachine.la libTime.la \
 	libDim.la libDim++.la libConfiguration.la
 am_time_OBJECTS = src/time.$(OBJEXT)
@@ -288,16 +297,17 @@
 	$(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \
 	$(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \
-	astro.c chatclient.c chatserv.c $(dataLogger_SOURCES) \
-	$(dclient5_SOURCES) $(did_SOURCES) $(dns_SOURCES) \
-	$(dserver2_SOURCES) $(fact_SOURCES) fitsgrep.c $(ftm_SOURCES) \
-	$(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) sched.c \
-	$(test_SOURCES) $(test3_SOURCES) $(time_SOURCES)
+	astro.c $(chatclient_SOURCES) $(chatserv_SOURCES) \
+	$(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
+	$(dns_SOURCES) $(dserver2_SOURCES) $(fact_SOURCES) fitsgrep.c \
+	$(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
+	$(logtime_SOURCES) sched.c $(test_SOURCES) $(test3_SOURCES) \
+	$(time_SOURCES)
 DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
 	$(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \
 	$(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \
-	astro.c chatclient.c chatserv.c $(dataLogger_SOURCES) \
-	$(dclient5_SOURCES) $(did_SOURCES) $(dns_SOURCES) \
-	$(dserver2_SOURCES) $(am__fact_SOURCES_DIST) fitsgrep.c \
-	$(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
+	astro.c $(chatclient_SOURCES) $(chatserv_SOURCES) \
+	$(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
+	$(dns_SOURCES) $(dserver2_SOURCES) $(am__fact_SOURCES_DIST) \
+	fitsgrep.c $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
 	$(logtime_SOURCES) sched.c $(test_SOURCES) $(test3_SOURCES) \
 	$(time_SOURCES)
@@ -574,7 +584,7 @@
 
 # 		  libAstro.la
-dist_man1_MANS = test3.man
 
 #-------------------------------------------------------------------------
+CLEANFILES = $(BUILT_SOURCES) $(am__append_6) $(am__append_9)
 dist_noinst_SCRIPTS = autogen.sh
 EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \
@@ -583,8 +593,5 @@
 	dim/README_v14.txt dim/README_v17.txt dim/README_v16.txt \
 	dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
-	$(dist_man1_MANS:.man=.html) $(dist_man1_MANS:.man=.pdf) \
-	$(DIALOGS) $(RESOURCES)
-CLEANFILES = $(dist_man1_MANS:.man=.pdf) $(dist_man1_MANS:.man=.html) \
-	$(BUILT_SOURCES)
+	$(DIALOGS) $(RESOURCES) $(am__append_5) $(am__append_8)
 dns_LDADD = libDim.la
 dns_SOURCES = dim/src/dns.c
@@ -684,16 +691,15 @@
 ftm_LDADD = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
 log_SOURCES = src/log.cc
-log_LDADD = libTime.la libTools.la libDim.la libDim++.la libStateMachine.la 
-logtime_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la
+log_LDADD = libTime.la libDim.la libDim++.la libTools.la libStateMachine.la 
+logtime_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la
 logtime_SOURCES = src/logtime.cc
-
-#chatserv_LDADD = libStateMachine.la libConfiguration.la libTools.la libTime.la libDim.la libDim++.la
-#chatserv_SOURCES = src/chatserv.cc src/LocalControl.cc src/LocalControl.h
+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
-dclient5_LDADD = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
+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_LDADD = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
+ftmctrl_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
     libConfiguration.la
 
@@ -701,8 +707,7 @@
 argv_LDADD = libConfiguration.la 
 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
-
-#chatclient_SOURCES = src/chatclient.cc src/ChatClient.cc src/ChatClient.h
-#chatclient_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
+test3_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
+chatclient_SOURCES = src/chatclient.cc src/ChatClient.cc src/ChatClient.h
+chatclient_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
 time_SOURCES = src/time.cc
 time_LDADD = libTime.la 
@@ -711,7 +716,7 @@
 #astro_LDADD = libAstro.la libTime.la 
 test_SOURCES = src/test.cc
-test_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
+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 src/Fits.cc
-dataLogger_LDADD = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
+dataLogger_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
     libConfiguration.la
 
@@ -735,5 +740,6 @@
 BUILT_SOURCES = $(DIALOGS:.ui=.h) $(RESOURCES:.qrc=.cc) $(QT_SOURCES:.cc=.moc.cc)
 fact_LDADD = $(ROOTLDFLAGS) $(ROOTGLIBS) $(QT4_LIB) $(QT4_LDFLAGS) -L. \
-	libDim.la libDim++.la libTools.la libTime.la libStateMachine.la
+	libDim.la libDim++.la libTools.la libTime.la libTools.la libStateMachine.la \
+	libConfiguration.la
 
 fact_SOURCES = $(BUILT_SOURCES) $(QT_SOURCES) \
@@ -745,5 +751,6 @@
 
 #-------------------------------------------------------------------------
-MAN_TARGETS = $(am__append_3) $(am__append_4) $(am__append_5)
+MAN_TARGETS = $(am__append_3) $(am__append_4) $(am__append_7)
+@HAS_HELP2MAN_TRUE@dist_man1_MANS = test3.man
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -977,13 +984,19 @@
 	@rm -f astro$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(astro_OBJECTS) $(astro_LDADD) $(LIBS)
+src/chatclient.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/ChatClient.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 chatclient$(EXEEXT): $(chatclient_OBJECTS) $(chatclient_DEPENDENCIES) 
 	@rm -f chatclient$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(chatclient_OBJECTS) $(chatclient_LDADD) $(LIBS)
+	$(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) 
 	@rm -f chatserv$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(chatserv_OBJECTS) $(chatserv_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(chatserv_OBJECTS) $(chatserv_LDADD) $(LIBS)
 src/dataLogger.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/LocalControl.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/Fits.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
@@ -1142,4 +1155,5 @@
 	-rm -f gui/design.$(OBJEXT)
 	-rm -f gui/fact.$(OBJEXT)
+	-rm -f src/ChatClient.$(OBJEXT)
 	-rm -f src/Configuration.$(OBJEXT)
 	-rm -f src/Configuration.lo
@@ -1197,4 +1211,6 @@
 	-rm -f src/WindowLog.lo
 	-rm -f src/argv.$(OBJEXT)
+	-rm -f src/chatclient.$(OBJEXT)
+	-rm -f src/chatserv.$(OBJEXT)
 	-rm -f src/dataLogger.$(OBJEXT)
 	-rm -f src/dclient5.$(OBJEXT)
@@ -1214,6 +1230,4 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/astro.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chatclient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chatserv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fitsgrep.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sched.Po@am__quote@
@@ -1250,4 +1264,5 @@
 @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/design.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/fact.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ChatClient.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Configuration.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Connection.Plo@am__quote@
@@ -1280,4 +1295,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/WindowLog.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/argv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatclient.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatserv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dataLogger.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dclient5.Po@am__quote@
@@ -1900,13 +1917,13 @@
 	$(AM_V_GEN)$(RCC4) -name `echo "$<" | sed 's|^.*/\(.*\)\.qrc$$|\1|'` $< -o $@
 
-@HAS_GROFF_TRUE@.man.html: $<
-@HAS_GROFF_TRUE@	$(AM_V_GEN)groff -mandoc `man -w -l $<` -T html > $@
-
-@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@.man.pdf: $<
-@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@	$(AM_V_GEN)groff -mandoc `man -w -l $<` | ps2pdf - $@
-
 @HAS_HELP2MAN_TRUE@$(dist_man1_MANS): $(dist_man1_MANS:.man=)
 @HAS_HELP2MAN_TRUE@	@mkdir -p man
 @HAS_HELP2MAN_TRUE@	$(AM_V_GEN)help2man -N -o $@ -m $(@:.man=) $(@:.man=)
+
+@HAS_GROFF_TRUE@.man.html: $<
+@HAS_GROFF_TRUE@	$(AM_V_GEN)groff -mandoc `man -w -l $<` -T html > $@
+
+@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@.man.pdf: $<
+@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@	$(AM_V_GEN)groff -mandoc `man -w -l $<` | ps2pdf - $@
 
 man: $(MAN_TARGETS) doxygen-doc