Changeset 10607 for trunk

Timestamp:

05/06/11 09:53:36 (14 years ago)

Author:

tbretz

Message:

Updated

File:

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

trunk/FACT++/Makefile.in

@@ -49 +49 @@
         logtime$(EXEEXT) time$(EXEEXT) argv$(EXEEXT) test3$(EXEEXT) \
         dclient5$(EXEEXT) dserver2$(EXEEXT) dataLogger$(EXEEXT) \
+        scheduler$(EXEEXT) ftmctrl$(EXEEXT) ftm$(EXEEXT) \
         $(am__EXEEXT_2) $(am__EXEEXT_3)
 @HAS_LIBXP_TRUE@am__append_1 = did
@@ -55 +56 @@
 @IS_FALSE@am__append_2 = \
 @IS_FALSE@      test \
-@IS_FALSE@      ftmctrl ftm \
 @IS_FALSE@      chatclient chatserv \
 @IS_FALSE@      fitsgrep test \
@@ -151 +151 @@
 @HAS_GUI_TRUE@am__EXEEXT_1 = fact$(EXEEXT)
 @HAS_LIBXP_TRUE@am__EXEEXT_2 = did$(EXEEXT)
-@IS_FALSE@am__EXEEXT_3 = test$(EXEEXT) ftmctrl$(EXEEXT) ftm$(EXEEXT) \
-@IS_FALSE@      chatclient$(EXEEXT) chatserv$(EXEEXT) \
-@IS_FALSE@      fitsgrep$(EXEEXT) test$(EXEEXT) sched$(EXEEXT) \
-@IS_FALSE@      astro$(EXEEXT)
+@IS_FALSE@am__EXEEXT_3 = test$(EXEEXT) chatclient$(EXEEXT) \
+@IS_FALSE@      chatserv$(EXEEXT) fitsgrep$(EXEEXT) test$(EXEEXT) \
+@IS_FALSE@      sched$(EXEEXT) astro$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 am_argv_OBJECTS = src/argv.$(OBJEXT)
@@ -197 +196 @@
         gui/DockWindow.moc.cc gui/MainWindow.moc.cc \
         gui/HtmlDelegate.cc gui/CheckBoxDelegate.cc gui/DockWindow.cc \
-        gui/MainWindow.cc gui/fact.cc gui/FactGui.cc
+        gui/MainWindow.cc gui/fact.cc gui/FactGui.cc src/HeadersFTM.cc
 am__objects_1 =
 @HAS_GUI_TRUE@am__objects_2 = gui/design.$(OBJEXT)
@@ -210 +209 @@
 @HAS_GUI_TRUE@  gui/MainWindow.$(OBJEXT)
 am_fact_OBJECTS = $(am__objects_4) $(am__objects_5) gui/fact.$(OBJEXT) \
-        gui/FactGui.$(OBJEXT)
+        gui/FactGui.$(OBJEXT) src/HeadersFTM.$(OBJEXT)
 fact_OBJECTS = $(am_fact_OBJECTS)
 am__DEPENDENCIES_1 =
@@ -240 +239 @@
 sched_OBJECTS = sched.$(OBJEXT)
 sched_LDADD = $(LDADD)
+am_scheduler_OBJECTS = src/scheduler.$(OBJEXT) \
+        src/LocalControl.$(OBJEXT)
+scheduler_OBJECTS = $(am_scheduler_OBJECTS)
+scheduler_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
+        libDim.la libDim++.la libConfiguration.la
 am_test_OBJECTS = src/test.$(OBJEXT)
 test_OBJECTS = $(am_test_OBJECTS)
@@ -301 +305 @@
         $(dns_SOURCES) $(dserver2_SOURCES) $(fact_SOURCES) fitsgrep.c \
         $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
-        $(logtime_SOURCES) sched.c $(test_SOURCES) $(test3_SOURCES) \
-        $(time_SOURCES)
+        $(logtime_SOURCES) sched.c $(scheduler_SOURCES) \
+        $(test_SOURCES) $(test3_SOURCES) $(time_SOURCES)
 DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
         $(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \
@@ -310 +314 @@
         $(dns_SOURCES) $(dserver2_SOURCES) $(am__fact_SOURCES_DIST) \
         fitsgrep.c $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
-        $(logtime_SOURCES) sched.c $(test_SOURCES) $(test3_SOURCES) \
-        $(time_SOURCES)
+        $(logtime_SOURCES) sched.c $(scheduler_SOURCES) \
+        $(test_SOURCES) $(test3_SOURCES) $(time_SOURCES)
 man1dir = $(mandir)/man1
 NROFF = nroff
@@ -721 +725 @@
     libConfiguration.la
 
+scheduler_SOURCES = src/scheduler.cc src/LocalControl.cc src/LocalControl.h 
+scheduler_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
+sendcommand_SOURCES = src/sendcommand.cc
+sendcommand_LDADD = libDim.la libDim++.la
 
 #fitsgrep_SOURCES = src/fitsgrep.cc
@@ -744 +752 @@
 
 fact_SOURCES = $(BUILT_SOURCES) $(QT_SOURCES) \
-        gui/fact.cc gui/FactGui.cc
+        gui/fact.cc gui/FactGui.cc src/HeadersFTM.cc
 
 
@@ -1059 +1067 @@
 gui/FactGui.$(OBJEXT): gui/$(am__dirstamp) \
         gui/$(DEPDIR)/$(am__dirstamp)
+src/HeadersFTM.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
 fact$(EXEEXT): $(fact_OBJECTS) $(fact_DEPENDENCIES) 
         @rm -f fact$(EXEEXT)
@@ -1066 +1076 @@
         $(AM_V_CCLD)$(LINK) $(fitsgrep_OBJECTS) $(fitsgrep_LDADD) $(LIBS)
 src/ftm.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/HeadersFTM.$(OBJEXT): src/$(am__dirstamp) \
-        src/$(DEPDIR)/$(am__dirstamp)
 ftm$(EXEEXT): $(ftm_OBJECTS) $(ftm_DEPENDENCIES) 
         @rm -f ftm$(EXEEXT)
@@ -1088 +1096 @@
         @rm -f sched$(EXEEXT)
         $(AM_V_CCLD)$(LINK) $(sched_OBJECTS) $(sched_LDADD) $(LIBS)
+src/scheduler.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
+scheduler$(EXEEXT): $(scheduler_OBJECTS) $(scheduler_DEPENDENCIES) 
+        @rm -f scheduler$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(scheduler_OBJECTS) $(scheduler_LDADD) $(LIBS)
 src/test.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) 
@@ -1220 +1233 @@
         -rm -f src/log.$(OBJEXT)
         -rm -f src/logtime.$(OBJEXT)
+        -rm -f src/scheduler.$(OBJEXT)
         -rm -f src/test.$(OBJEXT)
         -rm -f src/test3.$(OBJEXT)
@@ -1304 +1318 @@
 @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)/scheduler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test3.Po@am__quote@
@@ -1919 +1934 @@
 @HAS_HELP2MAN_TRUE@$(dist_man1_MANS): $(dist_man1_MANS:.man=)
 @HAS_HELP2MAN_TRUE@     @mkdir -p man
-@HAS_HELP2MAN_TRUE@     $(AM_V_GEN)help2man -N -o $@ -m $(@:.man=) $(@:.man=)
+@HAS_HELP2MAN_TRUE@     $(AM_V_GEN)help2man -N -o $@ -m $(@:.man=) ./$(@:.man=)
 
 @HAS_GROFF_TRUE@.man.html: $<