Index: /trunk/FACT++/Makefile.am
===================================================================
--- /trunk/FACT++/Makefile.am	(revision 12829)
+++ /trunk/FACT++/Makefile.am	(revision 12830)
@@ -65,6 +65,6 @@
 
 lib_LTLIBRARIES = \
-	libDim.la libDim++.la libDimExtension.la libTime.la libTools.la \
-	libConfiguration.la libStateMachine.la
+	libDim++.la libDim.la libDimExtension.la \
+	libConfiguration.la libStateMachine.la libTime.la libTools.la
 # 	libAstro.la
 
@@ -201,5 +201,4 @@
 	src/DimWriteStatistics.h src/DimWriteStatistics.cc
 
-
 libConfiguration_la_SOURCES = \
 	src/Configuration.h src/Configuration.cc \
@@ -215,8 +214,8 @@
 
 ftm_SOURCES = src/ftm.cc src/HeadersFTM.cc
-ftm_LDADD   = libTime.la libTools.la libDim.la libDim++.la libConfiguration.la libDimExtension.la
+ftm_LDADD   = libTime.la libTools.la libDim++.la libDim.la libConfiguration.la libDimExtension.la
 
 fad_SOURCES = src/fad.cc src/HeadersFAD.cc
-fad_LDADD   = libTime.la libTools.la libTools.la libDim.la libDim++.la libConfiguration.la libDimExtension.la
+fad_LDADD   = libTime.la libTools.la libTools.la libDim++.la libDim.la libConfiguration.la libDimExtension.la
 
 fsc_SOURCES = src/fsc.cc
@@ -225,33 +224,33 @@
 
 log_SOURCES = src/log.cc
-log_LDADD   = libTime.la libDim.la libDim++.la libTools.la libStateMachine.la 
+log_LDADD   = libDim++.la libDim.la libStateMachine.la libTime.la libTools.la
 
 
 logtime_SOURCES = src/logtime.cc
-logtime_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la
+logtime_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la
 
 
 chatserv_SOURCES = src/chatserv.cc src/LocalControl.h
-chatserv_LDADD = libTools.la libStateMachine.la libConfiguration.la libTime.la \
-	libDim.la libDim++.la libDimExtension.la
+chatserv_LDADD = libStateMachine.la libTools.la libConfiguration.la libTime.la \
+	libDim++.la libDim.la libDimExtension.la
 
 
 dclient5_SOURCES = src/dclient5.cc src/LocalControl.h
-dclient5_LDADD   = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
+dclient5_LDADD   = libDim++.la libDim.la libStateMachine.la libTime.la libTools.la \
     libConfiguration.la
 
 ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.h src/HeadersFTM.cc
-ftmctrl_LDADD   = libDim.la libDim++.la  libDimExtension.la \
-	libTime.la libTools.la libStateMachine.la \
+ftmctrl_LDADD   = libDim++.la libDim.la libDimExtension.la \
+	libStateMachine.la libTime.la libTools.la \
 	libConfiguration.la
 
 drivectrl_SOURCES = src/drivectrl.cc src/LocalControl.h src/HeadersFTM.cc
-drivectrl_LDADD   = libDim.la libDim++.la libDimExtension.la \
- 	libTime.la libTools.la libStateMachine.la \
+drivectrl_LDADD   = libDim++.la libDim.la libDimExtension.la \
+ 	libStateMachine.la libTools.la libTime.la \
     	libConfiguration.la
 
 magicweather_SOURCES = src/magicweather.cc src/LocalControl.h
-magicweather_LDADD   = libDim.la libDim++.la libDimExtension.la \
- 	libTime.la libTools.la libStateMachine.la \
+magicweather_LDADD   = libDim++.la libDim.la libDimExtension.la \
+ 	libStateMachine.la libTools.la libTime.la \
     	libConfiguration.la
 
@@ -266,36 +265,36 @@
 	src/DataWriteFits.cc    src/DataWriteFits.h
 endif
-fadctrl_LDADD   = libDim.la libDim++.la  libDimExtension.la \
-	libTime.la libTools.la libStateMachine.la \
+fadctrl_LDADD   = libDim++.la libDim.la  libDimExtension.la \
+	libStateMachine.la libTools.la libTime.la \
     	libConfiguration.la
 
 fscctrl_SOURCES = src/fscctrl.cc src/LocalControl.h
-fscctrl_LDADD   = libDim.la libDim++.la  libDimExtension.la \
-	libTime.la libTools.la libStateMachine.la \
+fscctrl_LDADD   = libDim++.la libDim.la  libDimExtension.la \
+	libStateMachine.la libTools.la libTime.la \
     	libConfiguration.la
 
 biasctrl_SOURCES = src/biasctrl.cc src/LocalControl.h src/PixelMap.cc
-biasctrl_LDADD   = libDim.la libDim++.la  libDimExtension.la \
-	libTime.la libTools.la libStateMachine.la \
+biasctrl_LDADD   = libDim++.la libDim.la  libDimExtension.la \
+	libStateMachine.la libTools.la libTime.la \
     	libConfiguration.la
 
 mcp_SOURCES = src/mcp.cc src/LocalControl.h
-mcp_LDADD   = libDim.la libDim++.la  libDimExtension.la \
-	libTime.la libTools.la libStateMachine.la \
+mcp_LDADD   = libDim++.la libDim.la  libDimExtension.la \
+	libStateMachine.la libTools.la libTime.la \
     	libConfiguration.la
 
 feedback_SOURCES = src/feedback.cc src/LocalControl.h src/PixelMap.cc
-feedback_LDADD   = libDim.la libDim++.la  libDimExtension.la \
-	libTime.la libTools.la libStateMachine.la \
+feedback_LDADD   = libDim++.la libDim.la  libDimExtension.la \
+	libStateMachine.la libTools.la libTime.la \
     	libConfiguration.la
 
 ratescan_SOURCES = src/ratescan.cc src/LocalControl.h src/PixelMap.cc
-ratescan_LDADD   = libDim.la libDim++.la  libDimExtension.la \
-	libTime.la libTools.la libStateMachine.la \
+ratescan_LDADD   = libDim++.la libDim.la  libDimExtension.la \
+	libStateMachine.la libTools.la libTime.la \
     	libConfiguration.la
 
 ratecontrol_SOURCES = src/ratecontrol.cc src/LocalControl.h src/PixelMap.cc
-ratecontrol_LDADD   = libDim.la libDim++.la  libDimExtension.la \
-	libTime.la libTools.la libStateMachine.la \
+ratecontrol_LDADD   = libDim++.la libDim.la  libDimExtension.la \
+	libStateMachine.la libTools.la libTime.la \
     	libConfiguration.la
 
@@ -306,11 +305,11 @@
 
 dimctrl_SOURCES = src/dimctrl.cc src/RemoteControl.cc src/RemoteControl.h
-dimctrl_LDADD = libTools.la libStateMachine.la libTime.la \
-	libDim.la libDim++.la libDimExtension.la libConfiguration.la
+dimctrl_LDADD = libStateMachine.la libTools.la libTime.la \
+	libDim++.la libDim.la libDimExtension.la libConfiguration.la
 
 
 chatclient_SOURCES = src/chatclient.cc src/ChatClient.h
-chatclient_LDADD = libTools.la libStateMachine.la libTime.la \
-	libDim.la libDim++.la libDimExtension.la libConfiguration.la
+chatclient_LDADD = libStateMachine.la libTools.la libTime.la \
+	libDim++.la libDim.la libDimExtension.la libConfiguration.la
 
 
@@ -322,5 +321,5 @@
 
 test_SOURCES = src/test.cc
-test_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
+test_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
 
 datalogger_SOURCES = src/datalogger.cc src/LocalControl.h
@@ -328,14 +327,14 @@
 datalogger_SOURCES += src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
 endif
-datalogger_LDADD  = libDim.la libDim++.la libDimExtension.la \
-	libTime.la libTools.la libStateMachine.la \
+datalogger_LDADD  = libDim++.la libDim.la libDimExtension.la \
+	libStateMachine.la libTools.la libTime.la \
     	libConfiguration.la
 
 scheduler_SOURCES = src/scheduler.cc src/LocalControl.h 
 scheduler_LDADD   = libStateMachine.la libTools.la libTime.la \
-	libDim.la libDim++.la libDimExtension.la libConfiguration.la
+	libDim++.la libDim.la libDimExtension.la libConfiguration.la
 
 fitsloader_SOURCES = src/fitsloader.cc src/LocalControl.h 
-fitsloader_LDADD   = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
+fitsloader_LDADD   = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
 
 fitsdump_SOURCES = src/fitsdump.cc 
@@ -343,8 +342,8 @@
 
 readfits_SOURCES = src/readfits.cc src/ReadFits.h
-readfits_LDADD   = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
+readfits_LDADD   = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
 
 triggerschedule_SOURCES = src/triggerschedule.cc 
-triggerschedule_LDADD   = libDim.la libDim++.la libDimExtension.la libConfiguration.la
+triggerschedule_LDADD   = libDim++.la libDim.la libDimExtension.la libConfiguration.la
 
 #fitsgrep_SOURCES = src/fitsgrep.cc
@@ -398,6 +397,6 @@
 
 fact_LDADD = $(ROOTLDFLAGS) $(ROOTGLIBS) $(QT4_LIB) $(QT4_LDFLAGS) -L. \
-	libDim.la libDim++.la libDimExtension.la \
-	libTools.la libTime.la libTools.la libStateMachine.la \
+	libDim++.la libDim.la libDimExtension.la \
+	libTools.la libStateMachine.la libTime.la libTools.la \
 	libConfiguration.la
 
@@ -411,7 +410,7 @@
 
 viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU \
-	libDim.la libDim++.la libDimExtension.la \
-	libConfiguration.la libTools.la libStateMachine.la \
-	libTime.la
+	libDimExtension.la \
+	libConfiguration.la libStateMachine.la libTools.la \
+	libTime.la libDim++.la libDim.la 
 
 viewer_SOURCES = $(viewer_SRCADD) $(viewer_QT_SOURCES) \