Changeset 10776 for trunk


Ignore:
Timestamp:
05/23/11 09:54:06 (14 years ago)
Author:
tbretz
Message:
Updated
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/Makefile.in

    r10693 r10776  
    5050        dclient5$(EXEEXT) dserver2$(EXEEXT) dataLogger$(EXEEXT) \
    5151        scheduler$(EXEEXT) triggerschedule$(EXEEXT) ftmctrl$(EXEEXT) \
    52         ftm$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_3)
     52        ftm$(EXEEXT) fadctrl$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_3)
    5353@HAS_LIBXP_TRUE@am__append_1 = did
    5454
    … …  
    5858@IS_FALSE@      chatclient chatserv \
    5959@IS_FALSE@      fitsgrep test \
    60 @IS_FALSE@      sched astro fadctrl
     60@IS_FALSE@      sched astro drivectrl
    6161
    6262@HAS_FITS_TRUE@am__append_3 = src/Fits.cc
    63 @HAS_HELP2MAN_TRUE@am__append_4 = $(dist_man1_MANS)
    64 @HAS_GROFF_TRUE@am__append_5 = $(dist_man1_MANS:.man=.html)
     63@HAS_GROFF_TRUE@am__append_4 = $(dist_man1_MANS:.man=.html)
     64@HAS_GROFF_TRUE@am__append_5 = $(dist_man1_MANS:.man=.html) 
    6565@HAS_GROFF_TRUE@am__append_6 = $(dist_man1_MANS:.man=.html)
    66 @HAS_GROFF_TRUE@am__append_7 = $(dist_man1_MANS:.man=.html)
     66@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_7 = $(dist_man1_MANS:.man=.pdf)
    6767@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_8 = $(dist_man1_MANS:.man=.pdf)
    6868@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_9 = $(dist_man1_MANS:.man=.pdf)
    69 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_10 = $(dist_man1_MANS:.man=.pdf)
    7069subdir = .
    7170ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    154153@IS_FALSE@am__EXEEXT_3 = test$(EXEEXT) chatclient$(EXEEXT) \
    155154@IS_FALSE@      chatserv$(EXEEXT) fitsgrep$(EXEEXT) test$(EXEEXT) \
    156 @IS_FALSE@      sched$(EXEEXT) astro$(EXEEXT) fadctrl$(EXEEXT)
     155@IS_FALSE@      sched$(EXEEXT) astro$(EXEEXT) drivectrl$(EXEEXT)
    157156PROGRAMS = $(bin_PROGRAMS)
    158157am_argv_OBJECTS = src/argv.$(OBJEXT)
    … …  
    191190dns_OBJECTS = $(am_dns_OBJECTS)
    192191dns_DEPENDENCIES = libDim.la
     192am_drivectrl_OBJECTS = src/drivectrl.$(OBJEXT) \
     193        src/LocalControl.$(OBJEXT) src/HeadersFTM.$(OBJEXT)
     194drivectrl_OBJECTS = $(am_drivectrl_OBJECTS)
     195drivectrl_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \
     196        libStateMachine.la libConfiguration.la
    193197am_dserver2_OBJECTS = src/dserver2.$(OBJEXT)
    194198dserver2_OBJECTS = $(am_dserver2_OBJECTS)
    … …  
    217221        libStateMachine.la libConfiguration.la
    218222am_fadctrl_OBJECTS = src/fadctrl.$(OBJEXT) src/LocalControl.$(OBJEXT) \
    219         src/HeadersFTM.$(OBJEXT)
     223        src/HeadersFAD.$(OBJEXT) src/EventBuilder.$(OBJEXT)
    220224fadctrl_OBJECTS = $(am_fadctrl_OBJECTS)
    221225fadctrl_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \
    … …  
    312316        astro.c $(chatclient_SOURCES) $(chatserv_SOURCES) \
    313317        $(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
    314         $(dns_SOURCES) $(dserver2_SOURCES) $(fact_SOURCES) \
    315         $(fadctrl_SOURCES) fitsgrep.c $(ftm_SOURCES) \
     318        $(dns_SOURCES) $(drivectrl_SOURCES) $(dserver2_SOURCES) \
     319        $(fact_SOURCES) $(fadctrl_SOURCES) fitsgrep.c $(ftm_SOURCES) \
    316320        $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) sched.c \
    317321        $(scheduler_SOURCES) $(test_SOURCES) $(test3_SOURCES) \
    … …  
    322326        astro.c $(chatclient_SOURCES) $(chatserv_SOURCES) \
    323327        $(am__dataLogger_SOURCES_DIST) $(dclient5_SOURCES) \
    324         $(did_SOURCES) $(dns_SOURCES) $(dserver2_SOURCES) \
    325         $(am__fact_SOURCES_DIST) $(fadctrl_SOURCES) fitsgrep.c \
    326         $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
    327         $(logtime_SOURCES) sched.c $(scheduler_SOURCES) \
    328         $(test_SOURCES) $(test3_SOURCES) $(time_SOURCES) \
    329         $(triggerschedule_SOURCES)
     328        $(did_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \
     329        $(dserver2_SOURCES) $(am__fact_SOURCES_DIST) \
     330        $(fadctrl_SOURCES) fitsgrep.c $(ftm_SOURCES) \
     331        $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) sched.c \
     332        $(scheduler_SOURCES) $(test_SOURCES) $(test3_SOURCES) \
     333        $(time_SOURCES) $(triggerschedule_SOURCES)
    330334man1dir = $(mandir)/man1
    331335NROFF = nroff
    … …  
    606610
    607611#-------------------------------------------------------------------------
    608 CLEANFILES = $(BUILT_SOURCES) $(am__append_7) $(am__append_10)
     612CLEANFILES = $(BUILT_SOURCES) $(am__append_6) $(am__append_9)
    609613dist_noinst_SCRIPTS = autogen.sh
    610614EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \
    … …  
    613617        dim/README_v14.txt dim/README_v17.txt dim/README_v16.txt \
    614618        dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
    615         $(DIALOGS) $(RESOURCES) $(am__append_6) $(am__append_9)
     619        $(DIALOGS) $(RESOURCES) $(am__append_5) $(am__append_8)
    616620dns_LDADD = libDim.la
    617621dns_SOURCES = dim/src/dns.c
    … …  
    702706        src/DimDescriptionService.cc \
    703707        \
    704         src/Connection.h      src/Connection.cc
     708        src/Connection.h      src/Connection.cc \
     709        \
     710        FACT.h ByteOrder.h
    705711
    706712libConfiguration_la_SOURCES = \
    … …  
    729735    libConfiguration.la
    730736
    731 fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFTM.cc
     737drivectrl_SOURCES = src/drivectrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFTM.cc
     738drivectrl_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
     739    libConfiguration.la
     740
     741fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFAD.cc \
     742    src/EventBuilder.c src/EventBuilder.h
     743
    732744fadctrl_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
    733745    libConfiguration.la
    … …  
    784796
    785797#-------------------------------------------------------------------------
    786 MAN_TARGETS = $(am__append_4) $(am__append_5) $(am__append_8)
     798MAN_TARGETS = $(dist_man1_MANS) $(am__append_4) $(am__append_7)
    787799all: $(BUILT_SOURCES)
    788800        $(MAKE) $(AM_MAKEFLAGS) all-am
    … …  
    10591071        @rm -f dns$(EXEEXT)
    10601072        $(AM_V_CCLD)$(LINK) $(dns_OBJECTS) $(dns_LDADD) $(LIBS)
     1073src/drivectrl.$(OBJEXT): src/$(am__dirstamp) \
     1074        src/$(DEPDIR)/$(am__dirstamp)
     1075src/HeadersFTM.$(OBJEXT): src/$(am__dirstamp) \
     1076        src/$(DEPDIR)/$(am__dirstamp)
     1077drivectrl$(EXEEXT): $(drivectrl_OBJECTS) $(drivectrl_DEPENDENCIES)
     1078        @rm -f drivectrl$(EXEEXT)
     1079        $(AM_V_CXXLD)$(CXXLINK) $(drivectrl_OBJECTS) $(drivectrl_LDADD) $(LIBS)
    10611080src/dserver2.$(OBJEXT): src/$(am__dirstamp) \
    10621081        src/$(DEPDIR)/$(am__dirstamp)
    … …  
    10871106gui/FactGui.$(OBJEXT): gui/$(am__dirstamp) \
    10881107        gui/$(DEPDIR)/$(am__dirstamp)
    1089 src/HeadersFTM.$(OBJEXT): src/$(am__dirstamp) \
    1090         src/$(DEPDIR)/$(am__dirstamp)
    10911108fact$(EXEEXT): $(fact_OBJECTS) $(fact_DEPENDENCIES)
    10921109        @rm -f fact$(EXEEXT)
    10931110        $(AM_V_CXXLD)$(CXXLINK) $(fact_OBJECTS) $(fact_LDADD) $(LIBS)
    10941111src/fadctrl.$(OBJEXT): src/$(am__dirstamp) \
     1112        src/$(DEPDIR)/$(am__dirstamp)
     1113src/HeadersFAD.$(OBJEXT): src/$(am__dirstamp) \
     1114        src/$(DEPDIR)/$(am__dirstamp)
     1115src/EventBuilder.$(OBJEXT): src/$(am__dirstamp) \
    10951116        src/$(DEPDIR)/$(am__dirstamp)
    10961117fadctrl$(EXEEXT): $(fadctrl_OBJECTS) $(fadctrl_DEPENDENCIES)
    … …  
    12201241        -rm -f src/Event.$(OBJEXT)
    12211242        -rm -f src/Event.lo
     1243        -rm -f src/EventBuilder.$(OBJEXT)
    12221244        -rm -f src/EventImp.$(OBJEXT)
    12231245        -rm -f src/EventImp.lo
    … …  
    12251247        -rm -f src/FACT.lo
    12261248        -rm -f src/Fits.$(OBJEXT)
     1249        -rm -f src/HeadersFAD.$(OBJEXT)
    12271250        -rm -f src/HeadersFTM.$(OBJEXT)
    12281251        -rm -f src/LocalControl.$(OBJEXT)
    … …  
    12591282        -rm -f src/dataLogger.$(OBJEXT)
    12601283        -rm -f src/dclient5.$(OBJEXT)
     1284        -rm -f src/drivectrl.$(OBJEXT)
    12611285        -rm -f src/dserver2.$(OBJEXT)
    12621286        -rm -f src/fadctrl.$(OBJEXT)
    … …  
    13211345@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimServiceInfoList.Plo@am__quote@
    13221346@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Event.Plo@am__quote@
     1347@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/EventBuilder.Po@am__quote@
    13231348@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/EventImp.Plo@am__quote@
    13241349@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/FACT.Plo@am__quote@
    13251350@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Fits.Po@am__quote@
     1351@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/HeadersFAD.Po@am__quote@
    13261352@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/HeadersFTM.Po@am__quote@
    13271353@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/LocalControl.Po@am__quote@
    … …  
    13451371@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dataLogger.Po@am__quote@
    13461372@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dclient5.Po@am__quote@
     1373@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/drivectrl.Po@am__quote@
    13471374@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dserver2.Po@am__quote@
    13481375@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fadctrl.Po@am__quote@
    … …  
    19661993        $(AM_V_GEN)$(RCC4) -name `echo "$<" | sed 's|^.*/\(.*\)\.qrc$$|\1|'` $< -o $@
    19671994
    1968 @HAS_HELP2MAN_TRUE@$(dist_man1_MANS): $(dist_man1_MANS:.man=)
    1969 @HAS_HELP2MAN_TRUE@     @mkdir -p man
    1970 @HAS_HELP2MAN_TRUE@     $(AM_V_GEN)help2man -N -o $@ -m $(@:.man=) ./$(@:.man=)
    1971 
    1972 @HAS_GROFF_TRUE@.man.html: $<
    1973 @HAS_GROFF_TRUE@        $(AM_V_GEN)groff -mandoc `man -w -l $<` -T html > $@
    1974 
    1975 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@.man.pdf: $<
    1976 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@       $(AM_V_GEN)groff -mandoc `man -w -l $<` | ps2pdf - $@
     1995$(dist_man1_MANS): $(dist_man1_MANS:.man=)
     1996        @mkdir -p man
     1997        $(AM_V_GEN)help2man -N -o $@ -m $(@:.man=) ./$(@:.man=)
     1998
     1999.man.html: $<
     2000        $(AM_V_GEN)groff -mandoc `man -w -l $<` -T html > $@
     2001
     2002.man.pdf: $<
     2003        $(AM_V_GEN)groff -mandoc `man -w -l $<` | ps2pdf - $@
    19772004
    19782005man: $(MAN_TARGETS) doxygen-doc
Note: See TracChangeset for help on using the changeset viewer.