Index: /trunk/FACT++/Makefile.am =================================================================== --- /trunk/FACT++/Makefile.am (revision 14528) +++ /trunk/FACT++/Makefile.am (revision 14529) @@ -1,3 +1,3 @@ -#include aminclude.am +include aminclude.am #------------------------------------------------------------------------- @@ -83,6 +83,5 @@ dclient5 dserver2 \ fitsloader fitsgrep \ - sched astro drivectrl \ - readfits + sched astro readfits endif @@ -95,17 +94,23 @@ dist_man1_MANS = \ dimctrl.man \ + datalogger.man \ ftmctrl.man \ fadctrl.man \ fscctrl.man \ + biasctrl.man \ + drivectrl.man \ mcp.man \ feedback.man \ ratescan.man \ - biasctrl.man \ - drivectrl.man \ - datalogger.man \ + ratecontrol.man \ fitsdump.man \ fitscheck.man \ - smartfact.man + magicweather.man \ + smartfact.man \ timecheck.man +if HAS_SOPRANO +dist_man1_MANS += tngweather.man lidctrl.man pwrctrl.man +endif + endif Index: /trunk/FACT++/Makefile.in =================================================================== --- /trunk/FACT++/Makefile.in (revision 14528) +++ /trunk/FACT++/Makefile.in (revision 14529) @@ -15,8 +15,4 @@ @SET_MAKE@ - -#include aminclude.am - -#------------------------------------------------------------------------- @@ -42,4 +38,12 @@ build_triplet = @build@ host_triplet = @host@ +DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \ + $(dist_noinst_SCRIPTS) $(libDim___la_HEADERS) \ + $(libDim_la_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/aminclude.am \ + $(top_srcdir)/configure .aux_dir/compile .aux_dir/config.guess \ + .aux_dir/config.sub .aux_dir/depcomp .aux_dir/install-sh \ + .aux_dir/ltmain.sh .aux_dir/missing AUTHORS COPYING ChangeLog \ + INSTALL NEWS bin_PROGRAMS = dns$(EXEEXT) log$(EXEEXT) logtime$(EXEEXT) \ time$(EXEEXT) argv$(EXEEXT) dimctrl$(EXEEXT) \ @@ -67,26 +71,19 @@ @IS_FALSE@ dclient5 dserver2 \ @IS_FALSE@ fitsloader fitsgrep \ -@IS_FALSE@ sched astro drivectrl \ -@IS_FALSE@ readfits - -@HAS_FITS_TRUE@am__append_9 = src/FitsFile.h src/FitsFile.cc \ +@IS_FALSE@ sched astro readfits + +@HAS_HELP2MAN_TRUE@@HAS_SOPRANO_TRUE@am__append_9 = tngweather.man lidctrl.man pwrctrl.man +@HAS_FITS_TRUE@am__append_10 = src/FitsFile.h src/FitsFile.cc \ @HAS_FITS_TRUE@ src/DataWriteFits.cc src/DataWriteFits.h \ @HAS_FITS_TRUE@ src/DataWriteFits2.cc src/DataWriteFits2.h -@HAS_FITS_TRUE@am__append_10 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc -@HAS_GROFF_TRUE@am__append_11 = $(dist_man1_MANS:.man=.html) -@HAS_GROFF_TRUE@am__append_12 = $(dist_man1_MANS:.man=.html) +@HAS_FITS_TRUE@am__append_11 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc +@HAS_GROFF_TRUE@am__append_12 = $(dist_man1_MANS:.man=.html) @HAS_GROFF_TRUE@am__append_13 = $(dist_man1_MANS:.man=.html) -@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_14 = $(dist_man1_MANS:.man=.pdf) +@HAS_GROFF_TRUE@am__append_14 = $(dist_man1_MANS:.man=.html) @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_15 = $(dist_man1_MANS:.man=.pdf) @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_16 = $(dist_man1_MANS:.man=.pdf) +@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_17 = $(dist_man1_MANS:.man=.pdf) subdir = . -DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \ - $(dist_noinst_SCRIPTS) $(libDim___la_HEADERS) \ - $(libDim_la_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure .aux_dir/compile \ - .aux_dir/config.guess .aux_dir/config.sub .aux_dir/depcomp \ - .aux_dir/install-sh .aux_dir/ltmain.sh .aux_dir/missing \ - AUTHORS COPYING ChangeLog INSTALL NEWS ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/.macro_dir/ac_check_class.m4 \ @@ -195,5 +192,5 @@ @IS_FALSE@ dserver2$(EXEEXT) fitsloader$(EXEEXT) \ @IS_FALSE@ fitsgrep$(EXEEXT) sched$(EXEEXT) astro$(EXEEXT) \ -@IS_FALSE@ drivectrl$(EXEEXT) readfits$(EXEEXT) +@IS_FALSE@ readfits$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) am_argv_OBJECTS = src/argv.$(OBJEXT) @@ -754,4 +751,30 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +@DX_COND_doc_TRUE@@DX_COND_html_TRUE@DX_CLEAN_HTML = @DX_DOCDIR@/html +@DX_COND_chm_TRUE@@DX_COND_doc_TRUE@DX_CLEAN_CHM = @DX_DOCDIR@/chm +@DX_COND_chi_TRUE@@DX_COND_chm_TRUE@@DX_COND_doc_TRUE@DX_CLEAN_CHI = @DX_DOCDIR@/@PACKAGE@.chi +@DX_COND_doc_TRUE@@DX_COND_man_TRUE@DX_CLEAN_MAN = @DX_DOCDIR@/man +@DX_COND_doc_TRUE@@DX_COND_rtf_TRUE@DX_CLEAN_RTF = @DX_DOCDIR@/rtf +@DX_COND_doc_TRUE@@DX_COND_xml_TRUE@DX_CLEAN_XML = @DX_DOCDIR@/xml +@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@DX_CLEAN_PS = @DX_DOCDIR@/@PACKAGE@.ps +@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@DX_PS_GOAL = doxygen-ps +@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@DX_CLEAN_PDF = @DX_DOCDIR@/@PACKAGE@.pdf +@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@DX_PDF_GOAL = doxygen-pdf +@DX_COND_doc_TRUE@@DX_COND_latex_TRUE@DX_CLEAN_LATEX = @DX_DOCDIR@/latex +@DX_COND_doc_TRUE@DX_CLEANFILES = \ +@DX_COND_doc_TRUE@ @DX_DOCDIR@/@PACKAGE@.tag \ +@DX_COND_doc_TRUE@ -r \ +@DX_COND_doc_TRUE@ $(DX_CLEAN_HTML) \ +@DX_COND_doc_TRUE@ $(DX_CLEAN_CHM) \ +@DX_COND_doc_TRUE@ $(DX_CLEAN_CHI) \ +@DX_COND_doc_TRUE@ $(DX_CLEAN_MAN) \ +@DX_COND_doc_TRUE@ $(DX_CLEAN_RTF) \ +@DX_COND_doc_TRUE@ $(DX_CLEAN_XML) \ +@DX_COND_doc_TRUE@ $(DX_CLEAN_PS) \ +@DX_COND_doc_TRUE@ $(DX_CLEAN_PDF) \ +@DX_COND_doc_TRUE@ $(DX_CLEAN_LATEX) + + +#------------------------------------------------------------------------- ACLOCAL_AMFLAGS = -I .macro_dir SVN_REVISION = -DREVISION=\"`svnversion -n .`\" @@ -773,22 +796,13 @@ # libAstro.la -@HAS_HELP2MAN_TRUE@dist_man1_MANS = \ -@HAS_HELP2MAN_TRUE@ dimctrl.man \ -@HAS_HELP2MAN_TRUE@ ftmctrl.man \ -@HAS_HELP2MAN_TRUE@ fadctrl.man \ -@HAS_HELP2MAN_TRUE@ fscctrl.man \ -@HAS_HELP2MAN_TRUE@ mcp.man \ -@HAS_HELP2MAN_TRUE@ feedback.man \ -@HAS_HELP2MAN_TRUE@ ratescan.man \ -@HAS_HELP2MAN_TRUE@ biasctrl.man \ -@HAS_HELP2MAN_TRUE@ drivectrl.man \ -@HAS_HELP2MAN_TRUE@ datalogger.man \ -@HAS_HELP2MAN_TRUE@ fitsdump.man \ -@HAS_HELP2MAN_TRUE@ fitscheck.man \ -@HAS_HELP2MAN_TRUE@ smartfact.man - +@HAS_HELP2MAN_TRUE@dist_man1_MANS = dimctrl.man datalogger.man \ +@HAS_HELP2MAN_TRUE@ ftmctrl.man fadctrl.man fscctrl.man \ +@HAS_HELP2MAN_TRUE@ biasctrl.man drivectrl.man mcp.man \ +@HAS_HELP2MAN_TRUE@ feedback.man ratescan.man ratecontrol.man \ +@HAS_HELP2MAN_TRUE@ fitsdump.man fitscheck.man magicweather.man \ +@HAS_HELP2MAN_TRUE@ smartfact.man timecheck.man $(am__append_9) #------------------------------------------------------------------------- -CLEANFILES = $(BUILT_SOURCES) $(am__append_13) $(am__append_16) +CLEANFILES = $(BUILT_SOURCES) $(am__append_14) $(am__append_17) dist_noinst_SCRIPTS = autogen.sh EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \ @@ -798,5 +812,5 @@ dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \ $(fact_DIALOGS) $(fact_RESOURCES) $(viewer_DIALOGS) \ - $(viewer_RESOURCES) $(am__append_12) $(am__append_15) + $(viewer_RESOURCES) $(am__append_13) $(am__append_16) dns_LDADD = libDim.la libDimExtension.la dns_SOURCES = src/dns.c @@ -971,5 +985,5 @@ src/DataProcessorImp.h src/DataCalib.cc src/DataCalib.h \ src/DataWriteRaw.cc src/DataWriteRaw.h src/DrsCalib.h \ - $(am__append_9) + $(am__append_10) fadctrl_LDADD = libDim++.la libDim.la libDimExtension.la \ libStateMachine.la libTools.la libTime.la \ @@ -1033,5 +1047,5 @@ test_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la datalogger_SOURCES = src/datalogger.cc src/LocalControl.h \ - src/DimState.cc src/DimState.h $(am__append_10) + src/DimState.cc src/DimState.h $(am__append_11) datalogger_LDADD = libDim++.la libDim.la libDimExtension.la \ libStateMachine.la libTools.la libTime.la \ @@ -1112,5 +1126,5 @@ #------------------------------------------------------------------------- -MAN_TARGETS = $(dist_man1_MANS) $(am__append_11) $(am__append_14) +MAN_TARGETS = $(dist_man1_MANS) $(am__append_12) $(am__append_15) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1120,5 +1134,5 @@ am--refresh: Makefile @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/aminclude.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -1143,4 +1157,5 @@ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; +$(srcdir)/aminclude.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -2701,5 +2716,50 @@ uninstall-libLTLIBRARIES uninstall-man uninstall-man1 -@HAS_HELP2MAN_TRUE@ timecheck.man + +@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps + +@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@@DX_DOCDIR@/@PACKAGE@.ps: @DX_DOCDIR@/@PACKAGE@.tag +@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@ cd @DX_DOCDIR@/latex; \ +@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@ rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \ +@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@ $(DX_LATEX) refman.tex; \ +@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@ $(MAKEINDEX_PATH) refman.idx; \ +@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@ $(DX_LATEX) refman.tex; \ +@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@ countdown=5; \ +@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@ while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \ +@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@ refman.log > /dev/null 2>&1 && test $$countdown -gt 0; \ +@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@ do \ +@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@ $(DX_LATEX) refman.tex; \ +@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@ countdown=`expr $$countdown - 1`; \ +@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@ done; \ +@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@ $(DX_DVIPS) -o ../@PACKAGE@.ps refman.dvi + +@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@doxygen-pdf: @DX_DOCDIR@/@PACKAGE@.pdf + +@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@@DX_DOCDIR@/@PACKAGE@.pdf: @DX_DOCDIR@/@PACKAGE@.tag +@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@ cd @DX_DOCDIR@/latex; \ +@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@ rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \ +@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@ $(DX_PDFLATEX) refman.tex; \ +@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@ $(DX_MAKEINDEX) refman.idx; \ +@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@ $(DX_PDFLATEX) refman.tex; \ +@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@ countdown=5; \ +@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@ while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \ +@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@ refman.log > /dev/null 2>&1 && test $$countdown -gt 0; \ +@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@ do \ +@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@ $(DX_PDFLATEX) refman.tex; \ +@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@ countdown=`expr $$countdown - 1`; \ +@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@ done; \ +@DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@ mv refman.pdf ../@PACKAGE@.pdf + +@DX_COND_doc_TRUE@.PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL) + +@DX_COND_doc_TRUE@.INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) + +@DX_COND_doc_TRUE@doxygen-run: @DX_DOCDIR@/@PACKAGE@.tag + +@DX_COND_doc_TRUE@doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) + +@DX_COND_doc_TRUE@@DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS) +@DX_COND_doc_TRUE@ rm -rf @DX_DOCDIR@ +@DX_COND_doc_TRUE@ $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG) .ui.h: $<