Changeset 18190

Timestamp:

06/01/15 11:55:13 (9 years ago)

Author:

tbretz

Message:

Added pfminictrl

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 gpsctrl sqmctrl pwrctrl \
+        tngweather lidctrl gpsctrl pfminictrl sqmctrl pwrctrl \
         magicweather magiclidar \
         smartfact evtserver getevent \
@@ -116 +116 @@
         magicweather.man \
         mcp.man \
+        pfminictrl.man \
         pwrctrl.man \
         ratecontrol.man \
@@ -340 +341 @@
         libConfiguration.la
 
+pfminictrl_SOURCES = src/pfminictrl.cc src/LocalControl.h
+pfminictrl_LDADD   = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la \
+        libConfiguration.la
+
 sqmctrl_SOURCES = src/sqmctrl.cc src/LocalControl.h
 sqmctrl_LDADD   = libDim++.la libDim.la libDimExtension.la \

trunk/FACT++/Makefile.in

@@ -54 +54 @@
         feedback$(EXEEXT) ratescan$(EXEEXT) ratecontrol$(EXEEXT) \
         tngweather$(EXEEXT) lidctrl$(EXEEXT) gpsctrl$(EXEEXT) \
-        sqmctrl$(EXEEXT) pwrctrl$(EXEEXT) magicweather$(EXEEXT) \
-        magiclidar$(EXEEXT) smartfact$(EXEEXT) evtserver$(EXEEXT) \
-        getevent$(EXEEXT) temperature$(EXEEXT) timecheck$(EXEEXT) \
-        showlog$(EXEEXT) fitsdump$(EXEEXT) fitscheck$(EXEEXT) \
-        fitsselect$(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)
+        pfminictrl$(EXEEXT) sqmctrl$(EXEEXT) pwrctrl$(EXEEXT) \
+        magicweather$(EXEEXT) magiclidar$(EXEEXT) smartfact$(EXEEXT) \
+        evtserver$(EXEEXT) getevent$(EXEEXT) temperature$(EXEEXT) \
+        timecheck$(EXEEXT) showlog$(EXEEXT) fitsdump$(EXEEXT) \
+        fitscheck$(EXEEXT) fitsselect$(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)
 @HAS_GUI_TRUE@am__append_1 = fact
 @HAS_DBUS_TRUE@am__append_2 = skypeclient
@@ -400 +400 @@
 moon_OBJECTS = $(am_moon_OBJECTS)
 moon_DEPENDENCIES = libTime.la libConfiguration.la
+am_pfminictrl_OBJECTS = src/pfminictrl.$(OBJEXT)
+pfminictrl_OBJECTS = $(am_pfminictrl_OBJECTS)
+pfminictrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la libConfiguration.la
 am_pwrctrl_OBJECTS = src/pwrctrl.$(OBJEXT) src/HeadersPower.$(OBJEXT)
 pwrctrl_OBJECTS = $(am_pwrctrl_OBJECTS)
@@ -559 +563 @@
         $(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) \
-        $(sqmctrl_SOURCES) $(temperature_SOURCES) $(test_SOURCES) \
-        $(time_SOURCES) $(timecheck_SOURCES) $(tngweather_SOURCES) \
+        $(pfminictrl_SOURCES) $(pwrctrl_SOURCES) \
+        $(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \
+        sched.c $(scheduler_SOURCES) $(showlog_SOURCES) \
+        $(skypeclient_SOURCES) $(smartfact_SOURCES) $(sqmctrl_SOURCES) \
+        $(temperature_SOURCES) $(test_SOURCES) $(time_SOURCES) \
+        $(timecheck_SOURCES) $(tngweather_SOURCES) \
         $(triggerschedule_SOURCES) $(viewer_SOURCES) $(webDid_SOURCES) \
         $(zfits_SOURCES)
@@ -584 +589 @@
         $(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) $(sqmctrl_SOURCES) $(temperature_SOURCES) \
-        $(test_SOURCES) $(time_SOURCES) $(timecheck_SOURCES) \
-        $(tngweather_SOURCES) $(triggerschedule_SOURCES) \
-        $(am__viewer_SOURCES_DIST) $(webDid_SOURCES) $(zfits_SOURCES)
+        $(moon_SOURCES) $(pfminictrl_SOURCES) $(pwrctrl_SOURCES) \
+        $(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \
+        sched.c $(scheduler_SOURCES) $(showlog_SOURCES) \
+        $(skypeclient_SOURCES) $(smartfact_SOURCES) $(sqmctrl_SOURCES) \
+        $(temperature_SOURCES) $(test_SOURCES) $(time_SOURCES) \
+        $(timecheck_SOURCES) $(tngweather_SOURCES) \
+        $(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST) \
+        $(webDid_SOURCES) $(zfits_SOURCES)
 man1dir = $(mandir)/man1
 NROFF = nroff
@@ -889 +895 @@
 @HAS_HELP2MAN_TRUE@     magicweather.man \
 @HAS_HELP2MAN_TRUE@     mcp.man \
+@HAS_HELP2MAN_TRUE@     pfminictrl.man \
 @HAS_HELP2MAN_TRUE@     pwrctrl.man \
 @HAS_HELP2MAN_TRUE@     ratecontrol.man \
@@ -1083 +1090 @@
 gpsctrl_SOURCES = src/gpsctrl.cc src/LocalControl.h
 gpsctrl_LDADD = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la \
+        libConfiguration.la
+
+pfminictrl_SOURCES = src/pfminictrl.cc src/LocalControl.h
+pfminictrl_LDADD = libDim++.la libDim.la libDimExtension.la \
         libStateMachine.la libTools.la libTime.la \
         libConfiguration.la
@@ -1767 +1779 @@
         @rm -f moon$(EXEEXT)
         $(AM_V_CXXLD)$(CXXLINK) $(moon_OBJECTS) $(moon_LDADD) $(LIBS)
+src/pfminictrl.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
+pfminictrl$(EXEEXT): $(pfminictrl_OBJECTS) $(pfminictrl_DEPENDENCIES) $(EXTRA_pfminictrl_DEPENDENCIES) 
+        @rm -f pfminictrl$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(pfminictrl_OBJECTS) $(pfminictrl_LDADD) $(LIBS)
 src/pwrctrl.$(OBJEXT): src/$(am__dirstamp) \
         src/$(DEPDIR)/$(am__dirstamp)
@@ -2074 +2091 @@
         -rm -f src/mcp.$(OBJEXT)
         -rm -f src/moon.$(OBJEXT)
+        -rm -f src/pfminictrl.$(OBJEXT)
         -rm -f src/pwrctrl.$(OBJEXT)
         -rm -f src/ratecontrol.$(OBJEXT)
@@ -2227 +2245 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/mcp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/moon.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/pfminictrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/pwrctrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ratecontrol.Po@am__quote@