Index: /trunk/FACT++/Makefile.am
===================================================================
--- /trunk/FACT++/Makefile.am	(revision 10514)
+++ /trunk/FACT++/Makefile.am	(revision 10515)
@@ -54,7 +54,7 @@
 # 		  libAstro.la
 
-dist_man1_MANS = test3.man
-
-#-------------------------------------------------------------------------
+#-------------------------------------------------------------------------
+
+CLEANFILES=
 
 dist_noinst_SCRIPTS = autogen.sh
@@ -76,7 +76,4 @@
 	dim/README_v18.txt \
 	dim/README_v19.txt
-
-EXTRA_DIST += $(dist_man1_MANS:.man=.html) $(dist_man1_MANS:.man=.pdf)
-CLEANFILES  = $(dist_man1_MANS:.man=.pdf)  $(dist_man1_MANS:.man=.html)
 
 dns_LDADD    = libDim.la
@@ -183,21 +180,21 @@
 
 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
 
@@ -208,9 +205,9 @@
 
 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
 
 
@@ -222,8 +219,8 @@
 
 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
 
@@ -254,6 +251,7 @@
 
 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) \
 	gui/fact.cc gui/FactGui.cc
@@ -277,21 +275,4 @@
 
 MAN_TARGETS =
-
-if HAS_GROFF
-
-.man.html: $<
-	$(AM_V_GEN)groff -mandoc `man -w -l $<` -T html > $@
-
-MAN_TARGETS += $(dist_man1_MANS:.man=.html)
-
-
-if HAS_PS2PDF
-.man.pdf: $<
-	$(AM_V_GEN)groff -mandoc `man -w -l $<` | ps2pdf - $@
-
-MAN_TARGETS += $(dist_man1_MANS:.man=.pdf)
-endif
-
-endif
 
 if HAS_HELP2MAN
@@ -300,9 +281,29 @@
 	$(AM_V_GEN)help2man -N -o $@ -m $(@:.man=) $(@:.man=)
 
-MAN_TARGETS += $(dist_man1_MANS)
+dist_man1_MANS = test3.man
+MAN_TARGETS   += $(dist_man1_MANS)
+endif
+
+if HAS_GROFF
+
+.man.html: $<
+	$(AM_V_GEN)groff -mandoc `man -w -l $<` -T html > $@
+
+MAN_TARGETS += $(dist_man1_MANS:.man=.html)
+EXTRA_DIST  += $(dist_man1_MANS:.man=.html) 
+CLEANFILES  += $(dist_man1_MANS:.man=.html) 
+
+if HAS_PS2PDF
+.man.pdf: $<
+	$(AM_V_GEN)groff -mandoc `man -w -l $<` | ps2pdf - $@
+
+MAN_TARGETS += $(dist_man1_MANS:.man=.pdf)
+EXTRA_DIST  += $(dist_man1_MANS:.man=.pdf)
+CLEANFILES  += $(dist_man1_MANS:.man=.pdf)
+endif
+
 endif
 
 man: $(MAN_TARGETS) doxygen-doc
-
 
 diff: