Changeset 11382

Timestamp:

07/13/11 18:41:12 (13 years ago)

Author:

tbretz

Message:

Added dim libraries to fad and ftm; added mcp

Location:

trunk/FACT++

Files:

• Makefile.am (modified) (4 diffs)
• Makefile.in (modified) (12 diffs)

trunk/FACT++/Makefile.am

@@ -51 +51 @@
         dclient5 dserver2 \
         fitsloader fitsgrep \
-        sched astro drivectrl
+        sched astro drivectrl \
+        readfits mcp
 endif
 
@@ -195 +196 @@
 
 ftm_SOURCES = src/ftm.cc src/HeadersFTM.cc
-ftm_LDADD   = libTime.la libTools.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
+fad_LDADD   = libTime.la libTools.la libTools.la libDim.la libDim++.la libConfiguration.la libDimExtension.la
 
 fsc_SOURCES = src/fsc.cc
@@ -246 +247 @@
         libConfiguration.la
 
+mcp_SOURCES = src/mcp.cc src/LocalControl.h
+mcp_LDADD   = libDim.la libDim++.la  libDimExtension.la \
+        libTime.la libTools.la libStateMachine.la \
+        libConfiguration.la
+
 
 argv_SOURCES = src/argv.cc
@@ -286 +292 @@
 fitsdump_SOURCES = src/fitsdump.cc 
 fitsdump_LDADD   = libConfiguration.la
+
+readfits_SOURCES = src/readfits.cc src/ReadFits.h
+readfits_LDADD   = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
 
 triggerschedule_SOURCES = src/triggerschedule.cc 

trunk/FACT++/Makefile.in

@@ -52 +52 @@
         fadctrl$(EXEEXT) fad$(EXEEXT) fscctrl$(EXEEXT) fsc$(EXEEXT) \
         chatclient$(EXEEXT) chatserv$(EXEEXT) biasctrl$(EXEEXT) \
-        fitsdump$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
-        $(am__EXEEXT_3)
+        mcp$(EXEEXT) fitsdump$(EXEEXT) readfits$(EXEEXT) \
+        $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
 @HAS_GUI_TRUE@am__append_1 = fact
 @HAS_LIBXP_TRUE@am__append_2 = did
@@ -236 +236 @@
 am_fad_OBJECTS = src/fad.$(OBJEXT) src/HeadersFAD.$(OBJEXT)
 fad_OBJECTS = $(am_fad_OBJECTS)
-fad_DEPENDENCIES = libTime.la libTools.la
+fad_DEPENDENCIES = libTime.la libTools.la libTools.la libDim.la \
+        libDim++.la libConfiguration.la libDimExtension.la
 am_fadctrl_OBJECTS = src/fadctrl.$(OBJEXT) src/HeadersFAD.$(OBJEXT) \
         src/EventBuilder.$(OBJEXT)
@@ -261 +262 @@
 am_ftm_OBJECTS = src/ftm.$(OBJEXT) src/HeadersFTM.$(OBJEXT)
 ftm_OBJECTS = $(am_ftm_OBJECTS)
-ftm_DEPENDENCIES = libTime.la libTools.la
+ftm_DEPENDENCIES = libTime.la libTools.la libDim.la libDim++.la \
+        libConfiguration.la libDimExtension.la
 am_ftmctrl_OBJECTS = src/ftmctrl.$(OBJEXT) src/HeadersFTM.$(OBJEXT)
 ftmctrl_OBJECTS = $(am_ftmctrl_OBJECTS)
@@ -274 +276 @@
 logtime_DEPENDENCIES = libTools.la libStateMachine.la libTime.la \
         libDim.la libDim++.la
+am_mcp_OBJECTS = src/mcp.$(OBJEXT)
+mcp_OBJECTS = $(am_mcp_OBJECTS)
+mcp_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la libTime.la \
+        libTools.la libStateMachine.la libConfiguration.la
+am_readfits_OBJECTS = src/readfits.$(OBJEXT)
+readfits_OBJECTS = $(am_readfits_OBJECTS)
+readfits_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
+        libDim.la libDim++.la libConfiguration.la
 sched_SOURCES = sched.c
 sched_OBJECTS = sched.$(OBJEXT)
@@ -346 +356 @@
         $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
         $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
-        $(logtime_SOURCES) sched.c $(scheduler_SOURCES) \
-        $(test_SOURCES) $(time_SOURCES) $(triggerschedule_SOURCES)
+        $(logtime_SOURCES) $(mcp_SOURCES) $(readfits_SOURCES) sched.c \
+        $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \
+        $(triggerschedule_SOURCES)
 DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
         $(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
@@ -359 +370 @@
         $(fitsdump_SOURCES) fitsgrep.c $(fitsloader_SOURCES) \
         $(fsc_SOURCES) $(fscctrl_SOURCES) $(ftm_SOURCES) \
-        $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) sched.c \
+        $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
+        $(mcp_SOURCES) $(readfits_SOURCES) sched.c \
         $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \
         $(triggerschedule_SOURCES)
@@ -746 +758 @@
 dserver2_LDADD = libTime.la libTools.la
 ftm_SOURCES = src/ftm.cc src/HeadersFTM.cc
-ftm_LDADD = libTime.la libTools.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
+fad_LDADD = libTime.la libTools.la libTools.la libDim.la libDim++.la libConfiguration.la libDimExtension.la
 fsc_SOURCES = src/fsc.cc
 fsc_LDADD = libTime.la libTools.la
@@ -789 +801 @@
         libConfiguration.la
 
+mcp_SOURCES = src/mcp.cc src/LocalControl.h
+mcp_LDADD = libDim.la libDim++.la  libDimExtension.la \
+        libTime.la libTools.la libStateMachine.la \
+        libConfiguration.la
+
 argv_SOURCES = src/argv.cc
 argv_LDADD = libConfiguration.la
@@ -818 +835 @@
 fitsdump_SOURCES = src/fitsdump.cc 
 fitsdump_LDADD = libConfiguration.la
+readfits_SOURCES = src/readfits.cc src/ReadFits.h
+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
@@ -1231 +1250 @@
         @rm -f logtime$(EXEEXT)
         $(AM_V_CXXLD)$(CXXLINK) $(logtime_OBJECTS) $(logtime_LDADD) $(LIBS)
+src/mcp.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+mcp$(EXEEXT): $(mcp_OBJECTS) $(mcp_DEPENDENCIES) 
+        @rm -f mcp$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(mcp_OBJECTS) $(mcp_LDADD) $(LIBS)
+src/readfits.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
+readfits$(EXEEXT): $(readfits_OBJECTS) $(readfits_DEPENDENCIES) 
+        @rm -f readfits$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(readfits_OBJECTS) $(readfits_LDADD) $(LIBS)
 sched$(EXEEXT): $(sched_OBJECTS) $(sched_DEPENDENCIES) 
         @rm -f sched$(EXEEXT)
@@ -1385 +1413 @@
         -rm -f src/log.$(OBJEXT)
         -rm -f src/logtime.$(OBJEXT)
+        -rm -f src/mcp.$(OBJEXT)
+        -rm -f src/readfits.$(OBJEXT)
         -rm -f src/scheduler.$(OBJEXT)
         -rm -f src/test.$(OBJEXT)
@@ -1481 +1511 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/log.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/logtime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/mcp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/readfits.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/scheduler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test.Po@am__quote@