Changeset 17317

Timestamp:

11/13/13 15:01:13 (11 years ago)

Author:

tbretz

Message:

Added gpsctrl

Location:

trunk/FACT++

Files:

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

trunk/FACT++/Makefile.am

@@ -40 +40 @@
         biasctrl drivectrl agilentctrl \
         mcp feedback ratescan ratecontrol \
-        tngweather lidctrl pwrctrl \
+        tngweather lidctrl gpsctrl pwrctrl \
         magicweather magiclidar \
         smartfact \
@@ -109 +109 @@
         ftmctrl.man \
         lidctrl.man \
+        gpsctrl.man \
         magiclidar.man \
         magicweather.man \
@@ -330 +331 @@
         libConfiguration.la -lQtXml
 
+gpsctrl_SOURCES = src/gpsctrl.cc src/LocalControl.h
+gpsctrl_LDADD   = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la \
+        libConfiguration.la
+
 temperature_SOURCES = src/temperature.cc src/LocalControl.h
 temperature_LDADD   = libDim++.la libDim.la libDimExtension.la \

trunk/FACT++/Makefile.in

@@ -49 +49 @@
         drivectrl$(EXEEXT) agilentctrl$(EXEEXT) mcp$(EXEEXT) \
         feedback$(EXEEXT) ratescan$(EXEEXT) ratecontrol$(EXEEXT) \
-        tngweather$(EXEEXT) lidctrl$(EXEEXT) pwrctrl$(EXEEXT) \
-        magicweather$(EXEEXT) magiclidar$(EXEEXT) smartfact$(EXEEXT) \
-        temperature$(EXEEXT) timecheck$(EXEEXT) showlog$(EXEEXT) \
-        fitsdump$(EXEEXT) fitscheck$(EXEEXT) zfits$(EXEEXT) \
-        $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
+        tngweather$(EXEEXT) lidctrl$(EXEEXT) gpsctrl$(EXEEXT) \
+        pwrctrl$(EXEEXT) magicweather$(EXEEXT) magiclidar$(EXEEXT) \
+        smartfact$(EXEEXT) temperature$(EXEEXT) timecheck$(EXEEXT) \
+        showlog$(EXEEXT) fitsdump$(EXEEXT) fitscheck$(EXEEXT) \
+        zfits$(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)
@@ -353 +353 @@
 gcn_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
         libStateMachine.la libTools.la libTime.la libConfiguration.la
+am_gpsctrl_OBJECTS = src/gpsctrl.$(OBJEXT)
+gpsctrl_OBJECTS = $(am_gpsctrl_OBJECTS)
+gpsctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la libConfiguration.la
 am_lidctrl_OBJECTS = src/lidctrl.$(OBJEXT)
 lidctrl_OBJECTS = $(am_lidctrl_OBJECTS)
@@ -537 +541 @@
         fitsgrep.c $(fitsloader_SOURCES) $(fsc_SOURCES) \
         $(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
-        $(gcn_SOURCES) $(lidctrl_SOURCES) $(log_SOURCES) \
-        $(logtime_SOURCES) $(magiclidar_SOURCES) \
+        $(gcn_SOURCES) $(gpsctrl_SOURCES) $(lidctrl_SOURCES) \
+        $(log_SOURCES) $(logtime_SOURCES) $(magiclidar_SOURCES) \
         $(magicweather_SOURCES) $(makedata_SOURCES) \
         $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
@@ -561 +565 @@
         $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
         $(ftm_SOURCES) $(ftmctrl_SOURCES) $(gcn_SOURCES) \
-        $(lidctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
-        $(magiclidar_SOURCES) $(magicweather_SOURCES) \
-        $(makedata_SOURCES) $(makeplots_SOURCES) $(mcp_SOURCES) \
-        $(moon_SOURCES) $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) \
-        $(ratescan_SOURCES) $(readfits_SOURCES) sched.c \
-        $(scheduler_SOURCES) $(showlog_SOURCES) $(skypeclient_SOURCES) \
-        $(smartfact_SOURCES) $(temperature_SOURCES) $(test_SOURCES) \
-        $(time_SOURCES) $(timecheck_SOURCES) $(tngweather_SOURCES) \
+        $(gpsctrl_SOURCES) $(lidctrl_SOURCES) $(log_SOURCES) \
+        $(logtime_SOURCES) $(magiclidar_SOURCES) \
+        $(magicweather_SOURCES) $(makedata_SOURCES) \
+        $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
+        $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \
+        $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \
+        $(showlog_SOURCES) $(skypeclient_SOURCES) $(smartfact_SOURCES) \
+        $(temperature_SOURCES) $(test_SOURCES) $(time_SOURCES) \
+        $(timecheck_SOURCES) $(tngweather_SOURCES) \
         $(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST) \
         $(webDid_SOURCES) $(zfits_SOURCES)
@@ -836 +841 @@
 @HAS_HELP2MAN_TRUE@     ftmctrl.man \
 @HAS_HELP2MAN_TRUE@     lidctrl.man \
+@HAS_HELP2MAN_TRUE@     gpsctrl.man \
 @HAS_HELP2MAN_TRUE@     magiclidar.man \
 @HAS_HELP2MAN_TRUE@     magicweather.man \
@@ -1029 +1035 @@
         libStateMachine.la libTools.la libTime.la \
         libConfiguration.la -lQtXml
+
+gpsctrl_SOURCES = src/gpsctrl.cc src/LocalControl.h
+gpsctrl_LDADD = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la \
+        libConfiguration.la
 
 temperature_SOURCES = src/temperature.cc src/LocalControl.h
@@ -1633 +1644 @@
         @rm -f gcn$(EXEEXT)
         $(AM_V_CXXLD)$(CXXLINK) $(gcn_OBJECTS) $(gcn_LDADD) $(LIBS)
+src/gpsctrl.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
+gpsctrl$(EXEEXT): $(gpsctrl_OBJECTS) $(gpsctrl_DEPENDENCIES) $(EXTRA_gpsctrl_DEPENDENCIES) 
+        @rm -f gpsctrl$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(gpsctrl_OBJECTS) $(gpsctrl_LDADD) $(LIBS)
 src/lidctrl.$(OBJEXT): src/$(am__dirstamp) \
         src/$(DEPDIR)/$(am__dirstamp)
@@ -1964 +1980 @@
         -rm -f src/ftmctrl.$(OBJEXT)
         -rm -f src/gcn.$(OBJEXT)
+        -rm -f src/gpsctrl.$(OBJEXT)
         -rm -f src/lidctrl.$(OBJEXT)
         -rm -f src/log.$(OBJEXT)
@@ -2112 +2129 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ftmctrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/gcn.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/gpsctrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/lidctrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/log.Po@am__quote@