Index: /trunk/FACT++/Makefile.in =================================================================== --- /trunk/FACT++/Makefile.in (revision 10775) +++ /trunk/FACT++/Makefile.in (revision 10776) @@ -50,5 +50,5 @@ dclient5$(EXEEXT) dserver2$(EXEEXT) dataLogger$(EXEEXT) \ scheduler$(EXEEXT) triggerschedule$(EXEEXT) ftmctrl$(EXEEXT) \ - ftm$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_3) + ftm$(EXEEXT) fadctrl$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_3) @HAS_LIBXP_TRUE@am__append_1 = did @@ -58,14 +58,13 @@ @IS_FALSE@ chatclient chatserv \ @IS_FALSE@ fitsgrep test \ -@IS_FALSE@ sched astro fadctrl +@IS_FALSE@ sched astro drivectrl @HAS_FITS_TRUE@am__append_3 = src/Fits.cc -@HAS_HELP2MAN_TRUE@am__append_4 = $(dist_man1_MANS) -@HAS_GROFF_TRUE@am__append_5 = $(dist_man1_MANS:.man=.html) +@HAS_GROFF_TRUE@am__append_4 = $(dist_man1_MANS:.man=.html) +@HAS_GROFF_TRUE@am__append_5 = $(dist_man1_MANS:.man=.html) @HAS_GROFF_TRUE@am__append_6 = $(dist_man1_MANS:.man=.html) -@HAS_GROFF_TRUE@am__append_7 = $(dist_man1_MANS:.man=.html) +@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_7 = $(dist_man1_MANS:.man=.pdf) @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_8 = $(dist_man1_MANS:.man=.pdf) @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_9 = $(dist_man1_MANS:.man=.pdf) -@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_10 = $(dist_man1_MANS:.man=.pdf) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -154,5 +153,5 @@ @IS_FALSE@am__EXEEXT_3 = test$(EXEEXT) chatclient$(EXEEXT) \ @IS_FALSE@ chatserv$(EXEEXT) fitsgrep$(EXEEXT) test$(EXEEXT) \ -@IS_FALSE@ sched$(EXEEXT) astro$(EXEEXT) fadctrl$(EXEEXT) +@IS_FALSE@ sched$(EXEEXT) astro$(EXEEXT) drivectrl$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) am_argv_OBJECTS = src/argv.$(OBJEXT) @@ -191,4 +190,9 @@ dns_OBJECTS = $(am_dns_OBJECTS) dns_DEPENDENCIES = libDim.la +am_drivectrl_OBJECTS = src/drivectrl.$(OBJEXT) \ + src/LocalControl.$(OBJEXT) src/HeadersFTM.$(OBJEXT) +drivectrl_OBJECTS = $(am_drivectrl_OBJECTS) +drivectrl_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \ + libStateMachine.la libConfiguration.la am_dserver2_OBJECTS = src/dserver2.$(OBJEXT) dserver2_OBJECTS = $(am_dserver2_OBJECTS) @@ -217,5 +221,5 @@ libStateMachine.la libConfiguration.la am_fadctrl_OBJECTS = src/fadctrl.$(OBJEXT) src/LocalControl.$(OBJEXT) \ - src/HeadersFTM.$(OBJEXT) + src/HeadersFAD.$(OBJEXT) src/EventBuilder.$(OBJEXT) fadctrl_OBJECTS = $(am_fadctrl_OBJECTS) fadctrl_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \ @@ -312,6 +316,6 @@ astro.c $(chatclient_SOURCES) $(chatserv_SOURCES) \ $(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \ - $(dns_SOURCES) $(dserver2_SOURCES) $(fact_SOURCES) \ - $(fadctrl_SOURCES) fitsgrep.c $(ftm_SOURCES) \ + $(dns_SOURCES) $(drivectrl_SOURCES) $(dserver2_SOURCES) \ + $(fact_SOURCES) $(fadctrl_SOURCES) fitsgrep.c $(ftm_SOURCES) \ $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) sched.c \ $(scheduler_SOURCES) $(test_SOURCES) $(test3_SOURCES) \ @@ -322,10 +326,10 @@ astro.c $(chatclient_SOURCES) $(chatserv_SOURCES) \ $(am__dataLogger_SOURCES_DIST) $(dclient5_SOURCES) \ - $(did_SOURCES) $(dns_SOURCES) $(dserver2_SOURCES) \ - $(am__fact_SOURCES_DIST) $(fadctrl_SOURCES) fitsgrep.c \ - $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \ - $(logtime_SOURCES) sched.c $(scheduler_SOURCES) \ - $(test_SOURCES) $(test3_SOURCES) $(time_SOURCES) \ - $(triggerschedule_SOURCES) + $(did_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \ + $(dserver2_SOURCES) $(am__fact_SOURCES_DIST) \ + $(fadctrl_SOURCES) fitsgrep.c $(ftm_SOURCES) \ + $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) sched.c \ + $(scheduler_SOURCES) $(test_SOURCES) $(test3_SOURCES) \ + $(time_SOURCES) $(triggerschedule_SOURCES) man1dir = $(mandir)/man1 NROFF = nroff @@ -606,5 +610,5 @@ #------------------------------------------------------------------------- -CLEANFILES = $(BUILT_SOURCES) $(am__append_7) $(am__append_10) +CLEANFILES = $(BUILT_SOURCES) $(am__append_6) $(am__append_9) dist_noinst_SCRIPTS = autogen.sh EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \ @@ -613,5 +617,5 @@ dim/README_v14.txt dim/README_v17.txt dim/README_v16.txt \ dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \ - $(DIALOGS) $(RESOURCES) $(am__append_6) $(am__append_9) + $(DIALOGS) $(RESOURCES) $(am__append_5) $(am__append_8) dns_LDADD = libDim.la dns_SOURCES = dim/src/dns.c @@ -702,5 +706,7 @@ src/DimDescriptionService.cc \ \ - src/Connection.h src/Connection.cc + src/Connection.h src/Connection.cc \ + \ + FACT.h ByteOrder.h libConfiguration_la_SOURCES = \ @@ -729,5 +735,11 @@ libConfiguration.la -fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFTM.cc +drivectrl_SOURCES = src/drivectrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFTM.cc +drivectrl_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \ + libConfiguration.la + +fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFAD.cc \ + src/EventBuilder.c src/EventBuilder.h + fadctrl_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \ libConfiguration.la @@ -784,5 +796,5 @@ #------------------------------------------------------------------------- -MAN_TARGETS = $(am__append_4) $(am__append_5) $(am__append_8) +MAN_TARGETS = $(dist_man1_MANS) $(am__append_4) $(am__append_7) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1059,4 +1071,11 @@ @rm -f dns$(EXEEXT) $(AM_V_CCLD)$(LINK) $(dns_OBJECTS) $(dns_LDADD) $(LIBS) +src/drivectrl.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/HeadersFTM.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +drivectrl$(EXEEXT): $(drivectrl_OBJECTS) $(drivectrl_DEPENDENCIES) + @rm -f drivectrl$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(drivectrl_OBJECTS) $(drivectrl_LDADD) $(LIBS) src/dserver2.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) @@ -1087,10 +1106,12 @@ 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) $(AM_V_CXXLD)$(CXXLINK) $(fact_OBJECTS) $(fact_LDADD) $(LIBS) src/fadctrl.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/HeadersFAD.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/EventBuilder.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) fadctrl$(EXEEXT): $(fadctrl_OBJECTS) $(fadctrl_DEPENDENCIES) @@ -1220,4 +1241,5 @@ -rm -f src/Event.$(OBJEXT) -rm -f src/Event.lo + -rm -f src/EventBuilder.$(OBJEXT) -rm -f src/EventImp.$(OBJEXT) -rm -f src/EventImp.lo @@ -1225,4 +1247,5 @@ -rm -f src/FACT.lo -rm -f src/Fits.$(OBJEXT) + -rm -f src/HeadersFAD.$(OBJEXT) -rm -f src/HeadersFTM.$(OBJEXT) -rm -f src/LocalControl.$(OBJEXT) @@ -1259,4 +1282,5 @@ -rm -f src/dataLogger.$(OBJEXT) -rm -f src/dclient5.$(OBJEXT) + -rm -f src/drivectrl.$(OBJEXT) -rm -f src/dserver2.$(OBJEXT) -rm -f src/fadctrl.$(OBJEXT) @@ -1321,7 +1345,9 @@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimServiceInfoList.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Event.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/EventBuilder.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/EventImp.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/FACT.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Fits.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/HeadersFAD.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/HeadersFTM.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/LocalControl.Po@am__quote@ @@ -1345,4 +1371,5 @@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dataLogger.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dclient5.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/drivectrl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dserver2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fadctrl.Po@am__quote@ @@ -1966,13 +1993,13 @@ $(AM_V_GEN)$(RCC4) -name `echo "$<" | sed 's|^.*/\(.*\)\.qrc$$|\1|'` $< -o $@ -@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_GROFF_TRUE@.man.html: $< -@HAS_GROFF_TRUE@ $(AM_V_GEN)groff -mandoc `man -w -l $<` -T html > $@ - -@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@.man.pdf: $< -@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@ $(AM_V_GEN)groff -mandoc `man -w -l $<` | ps2pdf - $@ +$(dist_man1_MANS): $(dist_man1_MANS:.man=) + @mkdir -p man + $(AM_V_GEN)help2man -N -o $@ -m $(@:.man=) ./$(@:.man=) + +.man.html: $< + $(AM_V_GEN)groff -mandoc `man -w -l $<` -T html > $@ + +.man.pdf: $< + $(AM_V_GEN)groff -mandoc `man -w -l $<` | ps2pdf - $@ man: $(MAN_TARGETS) doxygen-doc