Changeset 13481

Timestamp:

04/30/12 22:48:26 (13 years ago)

Author:

tbretz

Message:

Reverting to last revision.

File:

• trunk/FACT++/Makefile.in (modified) (9 diffs)

trunk/FACT++/Makefile.in

@@ -50 +50 @@
         drivectrl$(EXEEXT) mcp$(EXEEXT) feedback$(EXEEXT) \
         ratescan$(EXEEXT) ratecontrol$(EXEEXT) magicweather$(EXEEXT) \
-        smartfact$(EXEEXT) fitsdump$(EXEEXT) fitscheck$(EXEEXT) \
-        $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
-        $(am__EXEEXT_4)
+        fitsdump$(EXEEXT) fitscheck$(EXEEXT) $(am__EXEEXT_1) \
+        $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4)
 @HAS_GUI_TRUE@am__append_1 = fact
 @HAS_VIEWER_TRUE@am__append_2 = viewer
@@ -349 +348 @@
 scheduler_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
         libDim++.la libDim.la libDimExtension.la libConfiguration.la
-am_smartfact_OBJECTS = src/smartfact.$(OBJEXT) src/PixelMap.$(OBJEXT)
-smartfact_OBJECTS = $(am_smartfact_OBJECTS)
-smartfact_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
-        libStateMachine.la libTools.la libTime.la libConfiguration.la
 am_test_OBJECTS = src/test.$(OBJEXT)
 test_OBJECTS = $(am_test_OBJECTS)
@@ -446 +441 @@
         $(magicweather_SOURCES) $(mcp_SOURCES) $(ratecontrol_SOURCES) \
         $(ratescan_SOURCES) $(readfits_SOURCES) sched.c \
-        $(scheduler_SOURCES) $(smartfact_SOURCES) $(test_SOURCES) \
-        $(time_SOURCES) $(triggerschedule_SOURCES) $(viewer_SOURCES)
+        $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \
+        $(triggerschedule_SOURCES) $(viewer_SOURCES)
 DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
         $(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
@@ -463 +458 @@
         $(logtime_SOURCES) $(magicweather_SOURCES) $(mcp_SOURCES) \
         $(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \
-        sched.c $(scheduler_SOURCES) $(smartfact_SOURCES) \
-        $(test_SOURCES) $(time_SOURCES) $(triggerschedule_SOURCES) \
-        $(am__viewer_SOURCES_DIST)
+        sched.c $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \
+        $(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST)
 man1dir = $(mandir)/man1
 NROFF = nroff
@@ -721 +715 @@
 @HAS_HELP2MAN_TRUE@     drivectrl.man \
 @HAS_HELP2MAN_TRUE@     datalogger.man \
-@HAS_HELP2MAN_TRUE@     smartfact.man \
 @HAS_HELP2MAN_TRUE@     fitsdump.man \
 @HAS_HELP2MAN_TRUE@     fitscheck.man
@@ -865 +858 @@
 drivectrl_SOURCES = src/drivectrl.cc src/LocalControl.h src/HeadersFTM.cc
 drivectrl_LDADD = libDim++.la libDim.la libDimExtension.la \
-        libStateMachine.la libTools.la libTime.la \
-        libConfiguration.la
-
-smartfact_SOURCES = src/smartfact.cc src/LocalControl.h src/PixelMap.cc
-smartfact_LDADD = libDim++.la libDim.la libDimExtension.la \
         libStateMachine.la libTools.la libTime.la \
         libConfiguration.la
@@ -1458 +1446 @@
         @rm -f scheduler$(EXEEXT)
         $(AM_V_CXXLD)$(CXXLINK) $(scheduler_OBJECTS) $(scheduler_LDADD) $(LIBS)
-src/smartfact.$(OBJEXT): src/$(am__dirstamp) \
-        src/$(DEPDIR)/$(am__dirstamp)
-smartfact$(EXEEXT): $(smartfact_OBJECTS) $(smartfact_DEPENDENCIES) 
-        @rm -f smartfact$(EXEEXT)
-        $(AM_V_CXXLD)$(CXXLINK) $(smartfact_OBJECTS) $(smartfact_LDADD) $(LIBS)
 src/test.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) 
@@ -1665 +1648 @@
         -rm -f src/readfits.$(OBJEXT)
         -rm -f src/scheduler.$(OBJEXT)
-        -rm -f src/smartfact.$(OBJEXT)
         -rm -f src/test.$(OBJEXT)
         -rm -f src/time.$(OBJEXT)
@@ -1790 +1772 @@
 @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)/smartfact.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/time.Po@am__quote@