Changeset 10607


Ignore:
Timestamp:
May 6, 2011, 9:53:36 AM (9 years ago)
Author:
tbretz
Message:
Updated
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/Makefile.in

    r10516 r10607  
    4949        logtime$(EXEEXT) time$(EXEEXT) argv$(EXEEXT) test3$(EXEEXT) \
    5050        dclient5$(EXEEXT) dserver2$(EXEEXT) dataLogger$(EXEEXT) \
     51        scheduler$(EXEEXT) ftmctrl$(EXEEXT) ftm$(EXEEXT) \
    5152        $(am__EXEEXT_2) $(am__EXEEXT_3)
    5253@HAS_LIBXP_TRUE@am__append_1 = did
     
    5556@IS_FALSE@am__append_2 = \
    5657@IS_FALSE@      test \
    57 @IS_FALSE@      ftmctrl ftm \
    5858@IS_FALSE@      chatclient chatserv \
    5959@IS_FALSE@      fitsgrep test \
     
    151151@HAS_GUI_TRUE@am__EXEEXT_1 = fact$(EXEEXT)
    152152@HAS_LIBXP_TRUE@am__EXEEXT_2 = did$(EXEEXT)
    153 @IS_FALSE@am__EXEEXT_3 = test$(EXEEXT) ftmctrl$(EXEEXT) ftm$(EXEEXT) \
    154 @IS_FALSE@      chatclient$(EXEEXT) chatserv$(EXEEXT) \
    155 @IS_FALSE@      fitsgrep$(EXEEXT) test$(EXEEXT) sched$(EXEEXT) \
    156 @IS_FALSE@      astro$(EXEEXT)
     153@IS_FALSE@am__EXEEXT_3 = test$(EXEEXT) chatclient$(EXEEXT) \
     154@IS_FALSE@      chatserv$(EXEEXT) fitsgrep$(EXEEXT) test$(EXEEXT) \
     155@IS_FALSE@      sched$(EXEEXT) astro$(EXEEXT)
    157156PROGRAMS = $(bin_PROGRAMS)
    158157am_argv_OBJECTS = src/argv.$(OBJEXT)
     
    197196        gui/DockWindow.moc.cc gui/MainWindow.moc.cc \
    198197        gui/HtmlDelegate.cc gui/CheckBoxDelegate.cc gui/DockWindow.cc \
    199         gui/MainWindow.cc gui/fact.cc gui/FactGui.cc
     198        gui/MainWindow.cc gui/fact.cc gui/FactGui.cc src/HeadersFTM.cc
    200199am__objects_1 =
    201200@HAS_GUI_TRUE@am__objects_2 = gui/design.$(OBJEXT)
     
    210209@HAS_GUI_TRUE@  gui/MainWindow.$(OBJEXT)
    211210am_fact_OBJECTS = $(am__objects_4) $(am__objects_5) gui/fact.$(OBJEXT) \
    212         gui/FactGui.$(OBJEXT)
     211        gui/FactGui.$(OBJEXT) src/HeadersFTM.$(OBJEXT)
    213212fact_OBJECTS = $(am_fact_OBJECTS)
    214213am__DEPENDENCIES_1 =
     
    240239sched_OBJECTS = sched.$(OBJEXT)
    241240sched_LDADD = $(LDADD)
     241am_scheduler_OBJECTS = src/scheduler.$(OBJEXT) \
     242        src/LocalControl.$(OBJEXT)
     243scheduler_OBJECTS = $(am_scheduler_OBJECTS)
     244scheduler_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
     245        libDim.la libDim++.la libConfiguration.la
    242246am_test_OBJECTS = src/test.$(OBJEXT)
    243247test_OBJECTS = $(am_test_OBJECTS)
     
    301305        $(dns_SOURCES) $(dserver2_SOURCES) $(fact_SOURCES) fitsgrep.c \
    302306        $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
    303         $(logtime_SOURCES) sched.c $(test_SOURCES) $(test3_SOURCES) \
    304         $(time_SOURCES)
     307        $(logtime_SOURCES) sched.c $(scheduler_SOURCES) \
     308        $(test_SOURCES) $(test3_SOURCES) $(time_SOURCES)
    305309DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
    306310        $(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \
     
    310314        $(dns_SOURCES) $(dserver2_SOURCES) $(am__fact_SOURCES_DIST) \
    311315        fitsgrep.c $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
    312         $(logtime_SOURCES) sched.c $(test_SOURCES) $(test3_SOURCES) \
    313         $(time_SOURCES)
     316        $(logtime_SOURCES) sched.c $(scheduler_SOURCES) \
     317        $(test_SOURCES) $(test3_SOURCES) $(time_SOURCES)
    314318man1dir = $(mandir)/man1
    315319NROFF = nroff
     
    721725    libConfiguration.la
    722726
     727scheduler_SOURCES = src/scheduler.cc src/LocalControl.cc src/LocalControl.h
     728scheduler_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
     729sendcommand_SOURCES = src/sendcommand.cc
     730sendcommand_LDADD = libDim.la libDim++.la
    723731
    724732#fitsgrep_SOURCES = src/fitsgrep.cc
     
    744752
    745753fact_SOURCES = $(BUILT_SOURCES) $(QT_SOURCES) \
    746         gui/fact.cc gui/FactGui.cc
     754        gui/fact.cc gui/FactGui.cc src/HeadersFTM.cc
    747755
    748756
     
    10591067gui/FactGui.$(OBJEXT): gui/$(am__dirstamp) \
    10601068        gui/$(DEPDIR)/$(am__dirstamp)
     1069src/HeadersFTM.$(OBJEXT): src/$(am__dirstamp) \
     1070        src/$(DEPDIR)/$(am__dirstamp)
    10611071fact$(EXEEXT): $(fact_OBJECTS) $(fact_DEPENDENCIES)
    10621072        @rm -f fact$(EXEEXT)
     
    10661076        $(AM_V_CCLD)$(LINK) $(fitsgrep_OBJECTS) $(fitsgrep_LDADD) $(LIBS)
    10671077src/ftm.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    1068 src/HeadersFTM.$(OBJEXT): src/$(am__dirstamp) \
    1069         src/$(DEPDIR)/$(am__dirstamp)
    10701078ftm$(EXEEXT): $(ftm_OBJECTS) $(ftm_DEPENDENCIES)
    10711079        @rm -f ftm$(EXEEXT)
     
    10881096        @rm -f sched$(EXEEXT)
    10891097        $(AM_V_CCLD)$(LINK) $(sched_OBJECTS) $(sched_LDADD) $(LIBS)
     1098src/scheduler.$(OBJEXT): src/$(am__dirstamp) \
     1099        src/$(DEPDIR)/$(am__dirstamp)
     1100scheduler$(EXEEXT): $(scheduler_OBJECTS) $(scheduler_DEPENDENCIES)
     1101        @rm -f scheduler$(EXEEXT)
     1102        $(AM_V_CXXLD)$(CXXLINK) $(scheduler_OBJECTS) $(scheduler_LDADD) $(LIBS)
    10901103src/test.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    10911104test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES)
     
    12201233        -rm -f src/log.$(OBJEXT)
    12211234        -rm -f src/logtime.$(OBJEXT)
     1235        -rm -f src/scheduler.$(OBJEXT)
    12221236        -rm -f src/test.$(OBJEXT)
    12231237        -rm -f src/test3.$(OBJEXT)
     
    13041318@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/log.Po@am__quote@
    13051319@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/logtime.Po@am__quote@
     1320@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/scheduler.Po@am__quote@
    13061321@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test.Po@am__quote@
    13071322@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test3.Po@am__quote@
     
    19191934@HAS_HELP2MAN_TRUE@$(dist_man1_MANS): $(dist_man1_MANS:.man=)
    19201935@HAS_HELP2MAN_TRUE@     @mkdir -p man
    1921 @HAS_HELP2MAN_TRUE@     $(AM_V_GEN)help2man -N -o $@ -m $(@:.man=) $(@:.man=)
     1936@HAS_HELP2MAN_TRUE@     $(AM_V_GEN)help2man -N -o $@ -m $(@:.man=) ./$(@:.man=)
    19221937
    19231938@HAS_GROFF_TRUE@.man.html: $<
Note: See TracChangeset for help on using the changeset viewer.