Changeset 12344


Ignore:
Timestamp:
10/31/11 17:41:47 (13 years ago)
Author:
tbretz
Message:
Removed obsolete DataCalib.h and DataCalib.cc from viewer.
Location:
trunk/FACT++
Files:
2 edited

Legend:

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

    r12297 r12344  
    403403viewer_SOURCES = $(viewer_SRCADD) $(viewer_QT_SOURCES) \
    404404        src/DataProcessorImp.cc src/DataProcessorImp.h \
    405         src/DataCalib.cc src/DataCalib.h \
    406405        src/FitsFile.cc  src/FitsFile.h
    407406        src/Fits.cc      src/Fits.h
  • trunk/FACT++/Makefile.in

    r12202 r12344  
    1515
    1616@SET_MAKE@
     17
     18#include aminclude.am
     19
     20#-------------------------------------------------------------------------
    1721
    1822
     
    3842build_triplet = @build@
    3943host_triplet = @host@
    40 DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \
    41         $(dist_noinst_SCRIPTS) $(libDim___la_HEADERS) \
    42         $(libDim_la_HEADERS) $(srcdir)/Makefile.am \
    43         $(srcdir)/Makefile.in $(srcdir)/aminclude.am \
    44         $(top_srcdir)/configure .aux_dir/compile .aux_dir/config.guess \
    45         .aux_dir/config.sub .aux_dir/depcomp .aux_dir/install-sh \
    46         .aux_dir/ltmain.sh .aux_dir/missing AUTHORS COPYING ChangeLog \
    47         INSTALL NEWS
    4844bin_PROGRAMS = dns$(EXEEXT) log$(EXEEXT) logtime$(EXEEXT) \
    4945        time$(EXEEXT) argv$(EXEEXT) dimctrl$(EXEEXT) \
     
    7874@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_12 = $(dist_man1_MANS:.man=.pdf)
    7975subdir = .
     76DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \
     77        $(dist_noinst_SCRIPTS) $(libDim___la_HEADERS) \
     78        $(libDim_la_HEADERS) $(srcdir)/Makefile.am \
     79        $(srcdir)/Makefile.in $(top_srcdir)/configure .aux_dir/compile \
     80        .aux_dir/config.guess .aux_dir/config.sub .aux_dir/depcomp \
     81        .aux_dir/install-sh .aux_dir/ltmain.sh .aux_dir/missing \
     82        AUTHORS COPYING ChangeLog INSTALL NEWS
    8083ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    8184am__aclocal_m4_deps = $(top_srcdir)/.macro_dir/ac_check_class.m4 \
     
    277280am_fitsdump_OBJECTS = src/fitsdump.$(OBJEXT)
    278281fitsdump_OBJECTS = $(am_fitsdump_OBJECTS)
    279 fitsdump_DEPENDENCIES = libConfiguration.la
     282fitsdump_DEPENDENCIES = libConfiguration.la libTime.la
    280283fitsgrep_SOURCES = fitsgrep.c
    281284fitsgrep_OBJECTS = fitsgrep.$(OBJEXT)
     
    340343am__viewer_SOURCES_DIST = gui/RawEventsViewer/viewer.h \
    341344        gui/RawEventsViewer/RawEventsViewer.moc.cc \
    342         gui/BasicGlCamera.moc.cc \
     345        gui/BasicGlCamera.moc.cc gui/QCameraWidget.moc.cc \
    343346        gui/RawEventsViewer/RawEventsViewer.cc gui/BasicGlCamera.cc \
    344         src/DataProcessorImp.cc src/DataProcessorImp.h \
    345         src/DataCalib.cc src/DataCalib.h src/FitsFile.cc \
    346         src/FitsFile.h
     347        gui/QCameraWidget.cc src/DataProcessorImp.cc \
     348        src/DataProcessorImp.h src/FitsFile.cc src/FitsFile.h
    347349@HAS_VIEWER_TRUE@am__objects_8 = gui/RawEventsViewer/RawEventsViewer.moc.$(OBJEXT) \
    348 @HAS_VIEWER_TRUE@       gui/BasicGlCamera.moc.$(OBJEXT)
     350@HAS_VIEWER_TRUE@       gui/BasicGlCamera.moc.$(OBJEXT) \
     351@HAS_VIEWER_TRUE@       gui/QCameraWidget.moc.$(OBJEXT)
    349352@HAS_VIEWER_TRUE@am__objects_9 = $(am__objects_2) $(am__objects_8)
    350353@HAS_VIEWER_TRUE@am__objects_10 = gui/RawEventsViewer/RawEventsViewer.$(OBJEXT) \
    351 @HAS_VIEWER_TRUE@       gui/BasicGlCamera.$(OBJEXT)
     354@HAS_VIEWER_TRUE@       gui/BasicGlCamera.$(OBJEXT) \
     355@HAS_VIEWER_TRUE@       gui/QCameraWidget.$(OBJEXT)
    352356am_viewer_OBJECTS = $(am__objects_9) $(am__objects_10) \
    353         src/DataProcessorImp.$(OBJEXT) src/DataCalib.$(OBJEXT) \
    354         src/FitsFile.$(OBJEXT)
     357        src/DataProcessorImp.$(OBJEXT) src/FitsFile.$(OBJEXT)
    355358viewer_OBJECTS = $(am_viewer_OBJECTS)
    356359viewer_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
     
    654657top_builddir = @top_builddir@
    655658top_srcdir = @top_srcdir@
    656 @DX_COND_doc_TRUE@@DX_COND_html_TRUE@DX_CLEAN_HTML = @DX_DOCDIR@/html
    657 @DX_COND_chm_TRUE@@DX_COND_doc_TRUE@DX_CLEAN_CHM = @DX_DOCDIR@/chm
    658 @DX_COND_chi_TRUE@@DX_COND_chm_TRUE@@DX_COND_doc_TRUE@DX_CLEAN_CHI = @DX_DOCDIR@/@PACKAGE@.chi
    659 @DX_COND_doc_TRUE@@DX_COND_man_TRUE@DX_CLEAN_MAN = @DX_DOCDIR@/man
    660 @DX_COND_doc_TRUE@@DX_COND_rtf_TRUE@DX_CLEAN_RTF = @DX_DOCDIR@/rtf
    661 @DX_COND_doc_TRUE@@DX_COND_xml_TRUE@DX_CLEAN_XML = @DX_DOCDIR@/xml
    662 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@DX_CLEAN_PS = @DX_DOCDIR@/@PACKAGE@.ps
    663 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@DX_PS_GOAL = doxygen-ps
    664 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@DX_CLEAN_PDF = @DX_DOCDIR@/@PACKAGE@.pdf
    665 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@DX_PDF_GOAL = doxygen-pdf
    666 @DX_COND_doc_TRUE@@DX_COND_latex_TRUE@DX_CLEAN_LATEX = @DX_DOCDIR@/latex
    667 @DX_COND_doc_TRUE@DX_CLEANFILES = \
    668 @DX_COND_doc_TRUE@      @DX_DOCDIR@/@PACKAGE@.tag \
    669 @DX_COND_doc_TRUE@      -r \
    670 @DX_COND_doc_TRUE@      $(DX_CLEAN_HTML) \
    671 @DX_COND_doc_TRUE@      $(DX_CLEAN_CHM) \
    672 @DX_COND_doc_TRUE@      $(DX_CLEAN_CHI) \
    673 @DX_COND_doc_TRUE@      $(DX_CLEAN_MAN) \
    674 @DX_COND_doc_TRUE@      $(DX_CLEAN_RTF) \
    675 @DX_COND_doc_TRUE@      $(DX_CLEAN_XML) \
    676 @DX_COND_doc_TRUE@      $(DX_CLEAN_PS) \
    677 @DX_COND_doc_TRUE@      $(DX_CLEAN_PDF) \
    678 @DX_COND_doc_TRUE@      $(DX_CLEAN_LATEX)
    679 
    680 
    681 #-------------------------------------------------------------------------
    682659ACLOCAL_AMFLAGS = -I .macro_dir
    683660SVN_REVISION = -DREVISION=\"`svnversion -n .`\"
     
    918895fitsloader_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
    919896fitsdump_SOURCES = src/fitsdump.cc
    920 fitsdump_LDADD = libConfiguration.la
     897fitsdump_LDADD = libConfiguration.la libTime.la
    921898readfits_SOURCES = src/readfits.cc src/ReadFits.h
    922899readfits_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
     
    948925@HAS_VIEWER_TRUE@viewer_QT_SOURCES = \
    949926@HAS_VIEWER_TRUE@       gui/RawEventsViewer/RawEventsViewer.cc \
    950 @HAS_VIEWER_TRUE@       gui/BasicGlCamera.cc
     927@HAS_VIEWER_TRUE@       gui/BasicGlCamera.cc \
     928@HAS_VIEWER_TRUE@       gui/QCameraWidget.cc
    951929
    952930@HAS_VIEWER_TRUE@viewer_SRCADD = $(viewer_DIALOGS:.ui=.h) $(viewer_RESOURCES:.qrc=.cc) $(viewer_QT_SOURCES:.cc=.moc.cc)
     
    969947viewer_SOURCES = $(viewer_SRCADD) $(viewer_QT_SOURCES) \
    970948        src/DataProcessorImp.cc src/DataProcessorImp.h \
    971         src/DataCalib.cc src/DataCalib.h \
    972949        src/FitsFile.cc  src/FitsFile.h
    973950
     
    985962am--refresh:
    986963        @:
    987 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/aminclude.am $(am__configure_deps)
     964$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(am__configure_deps)
    988965        @for dep in $?; do \
    989966          case '$(am__configure_deps)' in \
     
    22612238        uninstall-libLTLIBRARIES uninstall-man uninstall-man1
    22622239
    2263 @DX_COND_doc_TRUE@@DX_CONFIG@:
    2264 @DX_COND_doc_TRUE@      $(DX_DOXYGEN) -g
    2265 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps
    2266 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@@DX_DOCDIR@/@PACKAGE@.ps: @DX_DOCDIR@/@PACKAGE@.tag
    2267 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     cd @DX_DOCDIR@/latex; \
    2268 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
    2269 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     $(DX_LATEX) refman.tex; \
    2270 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     $(MAKEINDEX_PATH) refman.idx; \
    2271 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     $(DX_LATEX) refman.tex; \
    2272 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     countdown=5; \
    2273 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
    2274 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@             refman.log > /dev/null 2>&1 && test $$countdown -gt 0; \
    2275 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     do \
    2276 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@             $(DX_LATEX) refman.tex; \
    2277 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@             countdown=`expr $$countdown - 1`; \
    2278 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     done; \
    2279 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@     $(DX_DVIPS) -o ../@PACKAGE@.ps refman.dvi
    2280 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@doxygen-pdf: @DX_DOCDIR@/@PACKAGE@.pdf
    2281 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@@DX_DOCDIR@/@PACKAGE@.pdf: @DX_DOCDIR@/@PACKAGE@.tag
    2282 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    cd @DX_DOCDIR@/latex; \
    2283 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
    2284 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    $(DX_PDFLATEX) refman.tex; \
    2285 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    $(DX_MAKEINDEX) refman.idx; \
    2286 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    $(DX_PDFLATEX) refman.tex; \
    2287 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    countdown=5; \
    2288 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
    2289 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@            refman.log > /dev/null 2>&1 && test $$countdown -gt 0; \
    2290 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    do \
    2291 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@            $(DX_PDFLATEX) refman.tex; \
    2292 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@            countdown=`expr $$countdown - 1`; \
    2293 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    done; \
    2294 @DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@    mv refman.pdf ../@PACKAGE@.pdf
    2295 @DX_COND_doc_TRUE@.PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL)
    2296 @DX_COND_doc_TRUE@.INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
    2297 @DX_COND_doc_TRUE@doxygen-run: @DX_DOCDIR@/@PACKAGE@.tag
    2298 @DX_COND_doc_TRUE@doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
    2299 @DX_COND_doc_TRUE@@DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS)
    2300 @DX_COND_doc_TRUE@      rm -rf @DX_DOCDIR@
    2301 @DX_COND_doc_TRUE@      $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
    23022240        src/Fits.cc      src/Fits.h
    23032241
Note: See TracChangeset for help on using the changeset viewer.