Changeset 14536 for trunk

Timestamp:

10/27/12 18:57:35 (12 years ago)

Author:

tbretz

Message:

Added agilentctrl.

Location:

trunk/FACT++

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (8 diffs)

trunk/FACT++/Makefile.am

@@ -36 +36 @@
         fscctrl fsc \
         chatclient chatserv \
-        biasctrl drivectrl \
+        biasctrl drivectrl agilentctrl \
         mcp feedback ratescan ratecontrol \
         magicweather \
@@ -287 +287 @@
         libConfiguration.la
 
+agilentctrl_SOURCES = src/agilentctrl.cc src/LocalControl.h src/HeadersAgilent.h
+agilentctrl_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 \

trunk/FACT++/Makefile.in

@@ -51 +51 @@
         fadctrl$(EXEEXT) fad$(EXEEXT) fscctrl$(EXEEXT) fsc$(EXEEXT) \
         chatclient$(EXEEXT) chatserv$(EXEEXT) biasctrl$(EXEEXT) \
-        drivectrl$(EXEEXT) mcp$(EXEEXT) feedback$(EXEEXT) \
-        ratescan$(EXEEXT) ratecontrol$(EXEEXT) magicweather$(EXEEXT) \
-        smartfact$(EXEEXT) timecheck$(EXEEXT) fitsdump$(EXEEXT) \
-        fitscheck$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
-        $(am__EXEEXT_3) $(am__EXEEXT_4) $(am__EXEEXT_5) \
-        $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8)
+        drivectrl$(EXEEXT) agilentctrl$(EXEEXT) mcp$(EXEEXT) \
+        feedback$(EXEEXT) ratescan$(EXEEXT) ratecontrol$(EXEEXT) \
+        magicweather$(EXEEXT) smartfact$(EXEEXT) timecheck$(EXEEXT) \
+        fitsdump$(EXEEXT) fitscheck$(EXEEXT) $(am__EXEEXT_1) \
+        $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \
+        $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
+        $(am__EXEEXT_8)
 @HAS_GUI_TRUE@am__append_1 = fact
 @HAS_SOPRANO_TRUE@am__append_2 = tngweather lidctrl pwrctrl
@@ -194 +195 @@
 @IS_FALSE@      readfits$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
+am_agilentctrl_OBJECTS = src/agilentctrl.$(OBJEXT)
+agilentctrl_OBJECTS = $(am_agilentctrl_OBJECTS)
+agilentctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la libConfiguration.la
 am_argv_OBJECTS = src/argv.$(OBJEXT)
 argv_OBJECTS = $(am_argv_OBJECTS)
@@ -484 +489 @@
         $(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
         $(libStateMachine_la_SOURCES) $(libTime_la_SOURCES) \
-        $(libTools_la_SOURCES) $(argv_SOURCES) astro.c \
-        $(biasctrl_SOURCES) $(chatclient_SOURCES) $(chatserv_SOURCES) \
-        $(datalogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
-        $(dimctrl_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \
-        $(dserver2_SOURCES) $(fact_SOURCES) $(fad_SOURCES) \
-        $(fadctrl_SOURCES) $(feedback_SOURCES) $(fitscheck_SOURCES) \
-        $(fitsdump_SOURCES) fitsgrep.c $(fitsloader_SOURCES) \
-        $(fsc_SOURCES) $(fscctrl_SOURCES) $(ftm_SOURCES) \
-        $(ftmctrl_SOURCES) $(lidctrl_SOURCES) $(log_SOURCES) \
-        $(logtime_SOURCES) $(magicweather_SOURCES) \
+        $(libTools_la_SOURCES) $(agilentctrl_SOURCES) $(argv_SOURCES) \
+        astro.c $(biasctrl_SOURCES) $(chatclient_SOURCES) \
+        $(chatserv_SOURCES) $(datalogger_SOURCES) $(dclient5_SOURCES) \
+        $(did_SOURCES) $(dimctrl_SOURCES) $(dns_SOURCES) \
+        $(drivectrl_SOURCES) $(dserver2_SOURCES) $(fact_SOURCES) \
+        $(fad_SOURCES) $(fadctrl_SOURCES) $(feedback_SOURCES) \
+        $(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
+        $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
+        $(ftm_SOURCES) $(ftmctrl_SOURCES) $(lidctrl_SOURCES) \
+        $(log_SOURCES) $(logtime_SOURCES) $(magicweather_SOURCES) \
         $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
         $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \
@@ -503 +508 @@
         $(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
         $(libStateMachine_la_SOURCES) $(libTime_la_SOURCES) \
-        $(libTools_la_SOURCES) $(argv_SOURCES) astro.c \
-        $(biasctrl_SOURCES) $(chatclient_SOURCES) $(chatserv_SOURCES) \
-        $(am__datalogger_SOURCES_DIST) $(dclient5_SOURCES) \
-        $(did_SOURCES) $(dimctrl_SOURCES) $(dns_SOURCES) \
-        $(drivectrl_SOURCES) $(dserver2_SOURCES) \
+        $(libTools_la_SOURCES) $(agilentctrl_SOURCES) $(argv_SOURCES) \
+        astro.c $(biasctrl_SOURCES) $(chatclient_SOURCES) \
+        $(chatserv_SOURCES) $(am__datalogger_SOURCES_DIST) \
+        $(dclient5_SOURCES) $(did_SOURCES) $(dimctrl_SOURCES) \
+        $(dns_SOURCES) $(drivectrl_SOURCES) $(dserver2_SOURCES) \
         $(am__fact_SOURCES_DIST) $(fad_SOURCES) \
         $(am__fadctrl_SOURCES_DIST) $(feedback_SOURCES) \
@@ -949 +954 @@
         libConfiguration.la
 
+agilentctrl_SOURCES = src/agilentctrl.cc src/LocalControl.h src/HeadersAgilent.h
+agilentctrl_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 \
@@ -1360 +1370 @@
           done; \
         done; rm -f c$${pid}_.???; exit $$bad
+src/agilentctrl.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
+agilentctrl$(EXEEXT): $(agilentctrl_OBJECTS) $(agilentctrl_DEPENDENCIES) $(EXTRA_agilentctrl_DEPENDENCIES) 
+        @rm -f agilentctrl$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(agilentctrl_OBJECTS) $(agilentctrl_LDADD) $(LIBS)
 src/argv.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 argv$(EXEEXT): $(argv_OBJECTS) $(argv_DEPENDENCIES) $(EXTRA_argv_DEPENDENCIES) 
@@ -1803 +1818 @@
         -rm -f src/WindowLog.$(OBJEXT)
         -rm -f src/WindowLog.lo
+        -rm -f src/agilentctrl.$(OBJEXT)
         -rm -f src/argv.$(OBJEXT)
         -rm -f src/biasctrl.$(OBJEXT)
@@ -1941 +1957 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Time.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/WindowLog.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/agilentctrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/argv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/biasctrl.Po@am__quote@