Changeset 11035

Timestamp:

06/16/11 18:37:35 (13 years ago)

Author:

tbretz

Message:

Added fscctrl and fsc, removed some obsolete libraraies

Location:

trunk/FACT++

Files:

• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (11 diffs)

trunk/FACT++/Makefile.am

@@ -36 +36 @@
         ftmctrl ftm \
         fadctrl fad \
+        fscctrl fsc \
         fitsdump
 
@@ -188 +189 @@
 
 dserver2_SOURCES = src/dserver2.cc 
-dserver2_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
+dserver2_LDADD   = libTime.la libTools.la
 
 ftm_SOURCES = src/ftm.cc src/HeadersFTM.cc
-ftm_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
+ftm_LDADD   = libTime.la libTools.la
 
 fad_SOURCES = src/fad.cc src/HeadersFAD.cc
-fad_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
+fad_LDADD   = libTime.la libTools.la
+
+fsc_SOURCES = src/fsc.cc
+fsc_LDADD   = libTime.la libTools.la
 
 
@@ -226 +230 @@
         src/EventBuilder.c src/EventBuilder.h
 fadctrl_LDADD   = libDim.la libDim++.la  libDimExtension.la \
+        libTime.la libTools.la libStateMachine.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 \
         libConfiguration.la

trunk/FACT++/Makefile.in

@@ -50 +50 @@
         dclient5$(EXEEXT) dserver2$(EXEEXT) dataLogger$(EXEEXT) \
         scheduler$(EXEEXT) triggerschedule$(EXEEXT) ftmctrl$(EXEEXT) \
-        ftm$(EXEEXT) fadctrl$(EXEEXT) fad$(EXEEXT) fitsdump$(EXEEXT) \
-        $(am__EXEEXT_2) $(am__EXEEXT_3)
+        ftm$(EXEEXT) fadctrl$(EXEEXT) fad$(EXEEXT) fscctrl$(EXEEXT) \
+        fsc$(EXEEXT) fitsdump$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_3)
 @HAS_LIBXP_TRUE@am__append_1 = did
 
@@ -205 +205 @@
 am_dserver2_OBJECTS = src/dserver2.$(OBJEXT)
 dserver2_OBJECTS = $(am_dserver2_OBJECTS)
-dserver2_DEPENDENCIES = libTime.la libTools.la libStateMachine.la \
-        libDim.la libDim++.la
+dserver2_DEPENDENCIES = libTime.la libTools.la
 am__fact_SOURCES_DIST = gui/design.h gui/design.cc \
         gui/DockWindow.moc.cc gui/MainWindow.moc.cc gui/DockWindow.cc \
@@ -230 +229 @@
 am_fad_OBJECTS = src/fad.$(OBJEXT) src/HeadersFAD.$(OBJEXT)
 fad_OBJECTS = $(am_fad_OBJECTS)
-fad_DEPENDENCIES = libTime.la libTools.la libStateMachine.la libDim.la \
-        libDim++.la
+fad_DEPENDENCIES = libTime.la libTools.la
 am_fadctrl_OBJECTS = src/fadctrl.$(OBJEXT) src/HeadersFAD.$(OBJEXT) \
         src/EventBuilder.$(OBJEXT)
@@ -247 +245 @@
 fitsloader_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
         libDim.la libDim++.la libConfiguration.la
+am_fsc_OBJECTS = src/fsc.$(OBJEXT)
+fsc_OBJECTS = $(am_fsc_OBJECTS)
+fsc_DEPENDENCIES = libTime.la libTools.la
+am_fscctrl_OBJECTS = src/fscctrl.$(OBJEXT)
+fscctrl_OBJECTS = $(am_fscctrl_OBJECTS)
+fscctrl_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \
+        libTime.la libTools.la libStateMachine.la libConfiguration.la
 am_ftm_OBJECTS = src/ftm.$(OBJEXT) src/HeadersFTM.$(OBJEXT)
 ftm_OBJECTS = $(am_ftm_OBJECTS)
-ftm_DEPENDENCIES = libTime.la libTools.la libStateMachine.la libDim.la \
-        libDim++.la
+ftm_DEPENDENCIES = libTime.la libTools.la
 am_ftmctrl_OBJECTS = src/ftmctrl.$(OBJEXT) src/HeadersFTM.$(OBJEXT)
 ftmctrl_OBJECTS = $(am_ftmctrl_OBJECTS)
@@ -333 +337 @@
         $(dserver2_SOURCES) $(fact_SOURCES) $(fad_SOURCES) \
         $(fadctrl_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
-        $(fitsloader_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
-        $(log_SOURCES) $(logtime_SOURCES) sched.c $(scheduler_SOURCES) \
+        $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
+        $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
+        $(logtime_SOURCES) sched.c $(scheduler_SOURCES) \
         $(test_SOURCES) $(time_SOURCES) $(triggerschedule_SOURCES)
 DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
@@ -346 +351 @@
         $(am__fact_SOURCES_DIST) $(fad_SOURCES) $(fadctrl_SOURCES) \
         $(fitsdump_SOURCES) fitsgrep.c $(fitsloader_SOURCES) \
-        $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
-        $(logtime_SOURCES) sched.c $(scheduler_SOURCES) \
-        $(test_SOURCES) $(time_SOURCES) $(triggerschedule_SOURCES)
+        $(fsc_SOURCES) $(fscctrl_SOURCES) $(ftm_SOURCES) \
+        $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) sched.c \
+        $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \
+        $(triggerschedule_SOURCES)
 man1dir = $(mandir)/man1
 NROFF = nroff
@@ -735 +741 @@
 libTools_la_SOURCES = src/tools.h src/tools.cc
 dserver2_SOURCES = src/dserver2.cc 
-dserver2_LDADD = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
+dserver2_LDADD = libTime.la libTools.la
 ftm_SOURCES = src/ftm.cc src/HeadersFTM.cc
-ftm_LDADD = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
+ftm_LDADD = libTime.la libTools.la
 fad_SOURCES = src/fad.cc src/HeadersFAD.cc
-fad_LDADD = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
+fad_LDADD = libTime.la libTools.la
+fsc_SOURCES = src/fsc.cc
+fsc_LDADD = libTime.la libTools.la
 log_SOURCES = src/log.cc
 log_LDADD = libTime.la libDim.la libDim++.la libTools.la libStateMachine.la 
@@ -765 +773 @@
 
 fadctrl_LDADD = libDim.la libDim++.la  libDimExtension.la \
+        libTime.la libTools.la libStateMachine.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 \
         libConfiguration.la
@@ -1174 +1187 @@
         @rm -f fitsloader$(EXEEXT)
         $(AM_V_CXXLD)$(CXXLINK) $(fitsloader_OBJECTS) $(fitsloader_LDADD) $(LIBS)
+src/fsc.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+fsc$(EXEEXT): $(fsc_OBJECTS) $(fsc_DEPENDENCIES) 
+        @rm -f fsc$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(fsc_OBJECTS) $(fsc_LDADD) $(LIBS)
+src/fscctrl.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
+fscctrl$(EXEEXT): $(fscctrl_OBJECTS) $(fscctrl_DEPENDENCIES) 
+        @rm -f fscctrl$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(fscctrl_OBJECTS) $(fscctrl_LDADD) $(LIBS)
 src/ftm.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 ftm$(EXEEXT): $(ftm_OBJECTS) $(ftm_DEPENDENCIES) 
@@ -1335 +1357 @@
         -rm -f src/fitsdump.$(OBJEXT)
         -rm -f src/fitsloader.$(OBJEXT)
+        -rm -f src/fsc.$(OBJEXT)
+        -rm -f src/fscctrl.$(OBJEXT)
         -rm -f src/ftm.$(OBJEXT)
         -rm -f src/ftmctrl.$(OBJEXT)
@@ -1426 +1450 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fitsdump.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fitsloader.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fsc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fscctrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ftm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ftmctrl.Po@am__quote@