Changeset 11720 for trunk


Ignore:
Timestamp:
07/30/11 16:14:01 (13 years ago)
Author:
tbretz
Message:
Move QT4_INCLUDES to configure.ac; added the new FitsFile class.
Location:
trunk/FACT++
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/Makefile.am

    r11710 r11720  
    1414   $(SVN_REVISION)
    1515
    16 AM_CXXFLAGS = $(AM_CPPFLAGS) $(QT4_INCLUDES) \
     16AM_CXXFLAGS = $(AM_CPPFLAGS) \
    1717   -Woverloaded-virtual -Wnon-virtual-dtor -Wshadow -std=c++0x
    1818
    … …  
    241241fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.h src/HeadersFAD.cc \
    242242        src/EventBuilder.c src/EventBuilder.h
     243if HAS_FITS
     244fadctrl_SOURCES += src/FitsFile.h src/FitsFile.cc
     245endif
    243246fadctrl_LDADD   = libDim.la libDim++.la  libDimExtension.la \
    244247        libTime.la libTools.la libStateMachine.la \
    … …  
    286289datalogger_SOURCES = src/datalogger.cc src/LocalControl.h
    287290if HAS_FITS
    288 datalogger_SOURCES += src/Fits.cc
     291datalogger_SOURCES += src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
    289292endif
    290293datalogger_LDADD  = libDim.la libDim++.la libDimExtension.la \

  • trunk/FACT++/Makefile.in

    r11618 r11720  
    6666@IS_FALSE@      readfits
    6767
    68 @HAS_FITS_TRUE@am__append_5 = src/Fits.cc
    69 @HAS_GROFF_TRUE@am__append_6 = $(dist_man1_MANS:.man=.html)
    70 @HAS_GROFF_TRUE@am__append_7 = $(dist_man1_MANS:.man=.html) 
     68@HAS_FITS_TRUE@am__append_5 = src/FitsFile.h src/FitsFile.cc
     69@HAS_FITS_TRUE@am__append_6 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
     70@HAS_GROFF_TRUE@am__append_7 = $(dist_man1_MANS:.man=.html)
    7171@HAS_GROFF_TRUE@am__append_8 = $(dist_man1_MANS:.man=.html)
    72 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_9 = $(dist_man1_MANS:.man=.pdf)
     72@HAS_GROFF_TRUE@am__append_9 = $(dist_man1_MANS:.man=.html)
    7373@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_10 = $(dist_man1_MANS:.man=.pdf)
    7474@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_11 = $(dist_man1_MANS:.man=.pdf)
     75@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_12 = $(dist_man1_MANS:.man=.pdf)
    7576subdir = .
    7677ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    77 am__aclocal_m4_deps = $(top_srcdir)/.macro_dir/ac_check_package.m4 \
     78am__aclocal_m4_deps = $(top_srcdir)/.macro_dir/ac_check_class.m4 \
     79        $(top_srcdir)/.macro_dir/ac_check_cpp.m4 \
     80        $(top_srcdir)/.macro_dir/ac_check_package.m4 \
    7881        $(top_srcdir)/.macro_dir/ac_check_readline.m4 \
    7982        $(top_srcdir)/.macro_dir/ac_find_motif.m4 \
    … …  
    187190        libDimExtension.la
    188191am__datalogger_SOURCES_DIST = src/datalogger.cc src/LocalControl.h \
    189         src/Fits.cc
    190 @HAS_FITS_TRUE@am__objects_1 = src/Fits.$(OBJEXT)
     192        src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
     193@HAS_FITS_TRUE@am__objects_1 = src/FitsFile.$(OBJEXT) \
     194@HAS_FITS_TRUE@ src/Fits.$(OBJEXT)
    191195am_datalogger_OBJECTS = src/datalogger.$(OBJEXT) $(am__objects_1)
    192196datalogger_OBJECTS = $(am_datalogger_OBJECTS)
    … …  
    242246fad_DEPENDENCIES = libTime.la libTools.la libTools.la libDim.la \
    243247        libDim++.la libConfiguration.la libDimExtension.la
     248am__fadctrl_SOURCES_DIST = src/fadctrl.cc src/LocalControl.h \
     249        src/HeadersFAD.cc src/EventBuilder.c src/EventBuilder.h \
     250        src/FitsFile.h src/FitsFile.cc
     251@HAS_FITS_TRUE@am__objects_7 = src/FitsFile.$(OBJEXT)
    244252am_fadctrl_OBJECTS = src/fadctrl.$(OBJEXT) src/HeadersFAD.$(OBJEXT) \
    245         src/EventBuilder.$(OBJEXT)
     253        src/EventBuilder.$(OBJEXT) $(am__objects_7)
    246254fadctrl_OBJECTS = $(am_fadctrl_OBJECTS)
    247255fadctrl_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \
    … …  
    309317        gui/RawEventsViewer/RawEventsViewer.moc.cc \
    310318        gui/RawEventsViewer/RawEventsViewer.cc
    311 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__objects_7 = gui/RawEventsViewer/RawEventsViewer.moc.$(OBJEXT)
    312 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__objects_8 = $(am__objects_2) \
    313 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@ $(am__objects_7)
    314 @HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__objects_9 = gui/RawEventsViewer/RawEventsViewer.$(OBJEXT)
    315 am_viewer_OBJECTS = $(am__objects_8) $(am__objects_9)
     319@HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__objects_8 = gui/RawEventsViewer/RawEventsViewer.moc.$(OBJEXT)
     320@HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__objects_9 = $(am__objects_2) \
     321@HAS_GUI_TRUE@@HAS_VIEWER_TRUE@ $(am__objects_8)
     322@HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__objects_10 = gui/RawEventsViewer/RawEventsViewer.$(OBJEXT)
     323am_viewer_OBJECTS = $(am__objects_9) $(am__objects_10)
    316324viewer_OBJECTS = $(am_viewer_OBJECTS)
    317 viewer_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
     325viewer_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
     326        libConfiguration.la
    318327SCRIPTS = $(dist_noinst_SCRIPTS)
    319328DEFAULT_INCLUDES = -I.@am__isrc@
    … …  
    381390        $(did_SOURCES) $(dimctrl_SOURCES) $(dns_SOURCES) \
    382391        $(drivectrl_SOURCES) $(dserver2_SOURCES) \
    383         $(am__fact_SOURCES_DIST) $(fad_SOURCES) $(fadctrl_SOURCES) \
    384         $(fitsdump_SOURCES) fitsgrep.c $(fitsloader_SOURCES) \
    385         $(fsc_SOURCES) $(fscctrl_SOURCES) $(ftm_SOURCES) \
    386         $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
    387         $(mcp_SOURCES) $(readfits_SOURCES) sched.c \
     392        $(am__fact_SOURCES_DIST) $(fad_SOURCES) \
     393        $(am__fadctrl_SOURCES_DIST) $(fitsdump_SOURCES) fitsgrep.c \
     394        $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
     395        $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
     396        $(logtime_SOURCES) $(mcp_SOURCES) $(readfits_SOURCES) sched.c \
    388397        $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \
    389398        $(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST)
    … …  
    645654   $(SVN_REVISION)
    646655
    647 AM_CXXFLAGS = $(AM_CPPFLAGS) $(QT4_INCLUDES) \
     656AM_CXXFLAGS = $(AM_CPPFLAGS) \
    648657   -Woverloaded-virtual -Wnon-virtual-dtor -Wshadow -std=c++0x
    649658
    … …  
    661670
    662671#-------------------------------------------------------------------------
    663 CLEANFILES = $(BUILT_SOURCES) $(am__append_8) $(am__append_11)
     672CLEANFILES = $(BUILT_SOURCES) $(am__append_9) $(am__append_12)
    664673dist_noinst_SCRIPTS = autogen.sh
    665674EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \
    … …  
    668677        dim/README_v14.txt dim/README_v17.txt dim/README_v16.txt \
    669678        dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
    670         $(DIALOGS) $(RESOURCES) $(am__append_7) $(am__append_10)
     679        $(DIALOGS) $(RESOURCES) $(am__append_8) $(am__append_11)
    671680dns_LDADD = libDim.la libDimExtension.la
    672681dns_SOURCES = src/dns.c
    … …  
    802811
    803812fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.h src/HeadersFAD.cc \
    804         src/EventBuilder.c src/EventBuilder.h
    805 
     813        src/EventBuilder.c src/EventBuilder.h $(am__append_5)
    806814fadctrl_LDADD = libDim.la libDim++.la  libDimExtension.la \
    807815        libTime.la libTools.la libStateMachine.la \
    … …  
    841849test_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
    842850datalogger_SOURCES = src/datalogger.cc src/LocalControl.h \
    843         $(am__append_5)
     851        $(am__append_6)
    844852datalogger_LDADD = libDim.la libDim++.la libDimExtension.la \
    845853        libTime.la libTools.la libStateMachine.la \
    … …  
    895903        gui/fact.cc gui/FactGui.cc src/HeadersFTM.cc
    896904
    897 viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU
     905viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU libConfiguration.la
    898906viewer_SOURCES = $(viewer_SRCADD) $(viewer_QT_SOURCES)
    899907
    … …  
    902910
    903911#-------------------------------------------------------------------------
    904 MAN_TARGETS = $(dist_man1_MANS) $(am__append_6) $(am__append_9)
     912MAN_TARGETS = $(dist_man1_MANS) $(am__append_7) $(am__append_10)
    905913all: $(BUILT_SOURCES)
    906914        $(MAKE) $(AM_MAKEFLAGS) all-am
    … …  
    11581166        $(AM_V_CXXLD)$(CXXLINK) $(chatserv_OBJECTS) $(chatserv_LDADD) $(LIBS)
    11591167src/datalogger.$(OBJEXT): src/$(am__dirstamp) \
     1168        src/$(DEPDIR)/$(am__dirstamp)
     1169src/FitsFile.$(OBJEXT): src/$(am__dirstamp) \
    11601170        src/$(DEPDIR)/$(am__dirstamp)
    11611171src/Fits.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    … …  
    14141424        -rm -f src/FACT.lo
    14151425        -rm -f src/Fits.$(OBJEXT)
     1426        -rm -f src/FitsFile.$(OBJEXT)
    14161427        -rm -f src/HeadersFAD.$(OBJEXT)
    14171428        -rm -f src/HeadersFTM.$(OBJEXT)
    … …  
    15271538@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/FACT.Plo@am__quote@
    15281539@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Fits.Po@am__quote@
     1540@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/FitsFile.Po@am__quote@
    15291541@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/HeadersFAD.Po@am__quote@
    15301542@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/HeadersFTM.Po@am__quote@
Note: See TracChangeset for help on using the changeset viewer.