Index: trunk/FACT++/Makefile.am =================================================================== --- trunk/FACT++/Makefile.am (revision 12343) +++ trunk/FACT++/Makefile.am (revision 12344) @@ -403,5 +403,4 @@ viewer_SOURCES = $(viewer_SRCADD) $(viewer_QT_SOURCES) \ src/DataProcessorImp.cc src/DataProcessorImp.h \ - src/DataCalib.cc src/DataCalib.h \ src/FitsFile.cc src/FitsFile.h src/Fits.cc src/Fits.h Index: trunk/FACT++/Makefile.in =================================================================== --- trunk/FACT++/Makefile.in (revision 12343) +++ trunk/FACT++/Makefile.in (revision 12344) @@ -15,4 +15,8 @@ @SET_MAKE@ + +#include aminclude.am + +#------------------------------------------------------------------------- @@ -38,12 +42,4 @@ 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) \ @@ -78,4 +74,11 @@ @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_12 = $(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 \ @@ -277,5 +280,5 @@ am_fitsdump_OBJECTS = src/fitsdump.$(OBJEXT) fitsdump_OBJECTS = $(am_fitsdump_OBJECTS) -fitsdump_DEPENDENCIES = libConfiguration.la +fitsdump_DEPENDENCIES = libConfiguration.la libTime.la fitsgrep_SOURCES = fitsgrep.c fitsgrep_OBJECTS = fitsgrep.$(OBJEXT) @@ -340,17 +343,17 @@ am__viewer_SOURCES_DIST = gui/RawEventsViewer/viewer.h \ gui/RawEventsViewer/RawEventsViewer.moc.cc \ - gui/BasicGlCamera.moc.cc \ + gui/BasicGlCamera.moc.cc gui/QCameraWidget.moc.cc \ gui/RawEventsViewer/RawEventsViewer.cc gui/BasicGlCamera.cc \ - src/DataProcessorImp.cc src/DataProcessorImp.h \ - src/DataCalib.cc src/DataCalib.h src/FitsFile.cc \ - src/FitsFile.h + gui/QCameraWidget.cc src/DataProcessorImp.cc \ + src/DataProcessorImp.h src/FitsFile.cc src/FitsFile.h @HAS_VIEWER_TRUE@am__objects_8 = gui/RawEventsViewer/RawEventsViewer.moc.$(OBJEXT) \ -@HAS_VIEWER_TRUE@ gui/BasicGlCamera.moc.$(OBJEXT) +@HAS_VIEWER_TRUE@ gui/BasicGlCamera.moc.$(OBJEXT) \ +@HAS_VIEWER_TRUE@ gui/QCameraWidget.moc.$(OBJEXT) @HAS_VIEWER_TRUE@am__objects_9 = $(am__objects_2) $(am__objects_8) @HAS_VIEWER_TRUE@am__objects_10 = gui/RawEventsViewer/RawEventsViewer.$(OBJEXT) \ -@HAS_VIEWER_TRUE@ gui/BasicGlCamera.$(OBJEXT) +@HAS_VIEWER_TRUE@ gui/BasicGlCamera.$(OBJEXT) \ +@HAS_VIEWER_TRUE@ gui/QCameraWidget.$(OBJEXT) am_viewer_OBJECTS = $(am__objects_9) $(am__objects_10) \ - src/DataProcessorImp.$(OBJEXT) src/DataCalib.$(OBJEXT) \ - src/FitsFile.$(OBJEXT) + src/DataProcessorImp.$(OBJEXT) src/FitsFile.$(OBJEXT) viewer_OBJECTS = $(am_viewer_OBJECTS) viewer_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @@ -654,30 +657,4 @@ 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 .`\" @@ -918,5 +895,5 @@ fitsloader_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la fitsdump_SOURCES = src/fitsdump.cc -fitsdump_LDADD = libConfiguration.la +fitsdump_LDADD = libConfiguration.la libTime.la readfits_SOURCES = src/readfits.cc src/ReadFits.h readfits_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la @@ -948,5 +925,6 @@ @HAS_VIEWER_TRUE@viewer_QT_SOURCES = \ @HAS_VIEWER_TRUE@ gui/RawEventsViewer/RawEventsViewer.cc \ -@HAS_VIEWER_TRUE@ gui/BasicGlCamera.cc +@HAS_VIEWER_TRUE@ gui/BasicGlCamera.cc \ +@HAS_VIEWER_TRUE@ gui/QCameraWidget.cc @HAS_VIEWER_TRUE@viewer_SRCADD = $(viewer_DIALOGS:.ui=.h) $(viewer_RESOURCES:.qrc=.cc) $(viewer_QT_SOURCES:.cc=.moc.cc) @@ -969,5 +947,4 @@ viewer_SOURCES = $(viewer_SRCADD) $(viewer_QT_SOURCES) \ src/DataProcessorImp.cc src/DataProcessorImp.h \ - src/DataCalib.cc src/DataCalib.h \ src/FitsFile.cc src/FitsFile.h @@ -985,5 +962,5 @@ am--refresh: @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/aminclude.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -2261,43 +2238,4 @@ uninstall-libLTLIBRARIES uninstall-man uninstall-man1 -@DX_COND_doc_TRUE@@DX_CONFIG@: -@DX_COND_doc_TRUE@ $(DX_DOXYGEN) -g -@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) src/Fits.cc src/Fits.h