Index: trunk/FACT++/Makefile.in =================================================================== --- trunk/FACT++/Makefile.in (revision 18508) +++ trunk/FACT++/Makefile.in (revision 18509) @@ -46,5 +46,4 @@ .aux_dir/install-sh .aux_dir/ltmain.sh .aux_dir/missing \ AUTHORS COPYING ChangeLog INSTALL NEWS -@HAS_ROOT_QT_TRUE@am__append_1 = -lGQt bin_PROGRAMS = dns$(EXEEXT) log$(EXEEXT) logtime$(EXEEXT) \ time$(EXEEXT) argv$(EXEEXT) ftmctrl$(EXEEXT) fadctrl$(EXEEXT) \ @@ -61,19 +60,17 @@ $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \ $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \ - $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \ - $(am__EXEEXT_11) -@HAS_FITS_TRUE@am__append_2 = datalogger -@HAS_V8_TRUE@am__append_3 = dimctrl dimserver -@HAS_ROOT_TRUE@am__append_4 = rootifysql -@HAS_GUI_TRUE@am__append_5 = fact -@HAS_DBUS_TRUE@am__append_6 = skypeclient -@HAS_VIEWER_TRUE@am__append_7 = viewer -@HAS_NOVA_TRUE@am__append_8 = moon -@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__append_9 = makedata makeschedule -@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__append_10 = makeplots rootifysql -@HAS_LIBXP_TRUE@am__append_11 = did webDid + $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) +@HAS_FITS_TRUE@am__append_1 = datalogger +@HAS_V8_TRUE@am__append_2 = dimctrl dimserver +@HAS_GUI_TRUE@am__append_3 = fact +@HAS_DBUS_TRUE@am__append_4 = skypeclient +@HAS_VIEWER_TRUE@am__append_5 = viewer +@HAS_NOVA_TRUE@am__append_6 = moon +@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__append_7 = makedata makeschedule +@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__append_8 = makeplots rootifysql +@HAS_LIBXP_TRUE@am__append_9 = did webDid # This is a trick to be able to build them but not having them in 'all' -@IS_FALSE@am__append_12 = \ +@IS_FALSE@am__append_10 = \ @IS_FALSE@ ftm fsc fad \ @IS_FALSE@ test scheduler \ @@ -84,15 +81,15 @@ @IS_FALSE@ cosyctrl -@HAS_FITS_TRUE@am__append_13 = src/FitsFile.h src/FitsFile.cc \ +@HAS_FITS_TRUE@am__append_11 = 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_14 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc -@HAS_GROFF_TRUE@am__append_15 = $(dist_man1_MANS:.man=.html) -@HAS_GROFF_TRUE@am__append_16 = $(dist_man1_MANS:.man=.html) -@HAS_GROFF_TRUE@am__append_17 = $(dist_man1_MANS:.man=.html) +@HAS_FITS_TRUE@am__append_12 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc +@HAS_GROFF_TRUE@am__append_13 = $(dist_man1_MANS:.man=.html) +@HAS_GROFF_TRUE@am__append_14 = $(dist_man1_MANS:.man=.html) +@HAS_GROFF_TRUE@am__append_15 = $(dist_man1_MANS:.man=.html) +@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) @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_18 = $(dist_man1_MANS:.man=.pdf) -@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_19 = $(dist_man1_MANS:.man=.pdf) -@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_20 = $(dist_man1_MANS:.man=.pdf) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -228,15 +225,14 @@ @HAS_FITS_TRUE@am__EXEEXT_1 = datalogger$(EXEEXT) @HAS_V8_TRUE@am__EXEEXT_2 = dimctrl$(EXEEXT) dimserver$(EXEEXT) -@HAS_ROOT_TRUE@am__EXEEXT_3 = rootifysql$(EXEEXT) -@HAS_GUI_TRUE@am__EXEEXT_4 = fact$(EXEEXT) -@HAS_DBUS_TRUE@am__EXEEXT_5 = skypeclient$(EXEEXT) -@HAS_VIEWER_TRUE@am__EXEEXT_6 = viewer$(EXEEXT) -@HAS_NOVA_TRUE@am__EXEEXT_7 = moon$(EXEEXT) -@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__EXEEXT_8 = makedata$(EXEEXT) \ +@HAS_GUI_TRUE@am__EXEEXT_3 = fact$(EXEEXT) +@HAS_DBUS_TRUE@am__EXEEXT_4 = skypeclient$(EXEEXT) +@HAS_VIEWER_TRUE@am__EXEEXT_5 = viewer$(EXEEXT) +@HAS_NOVA_TRUE@am__EXEEXT_6 = moon$(EXEEXT) +@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__EXEEXT_7 = makedata$(EXEEXT) \ @HAS_NOVA_TRUE@@HAS_SQL_TRUE@ makeschedule$(EXEEXT) -@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_9 = makeplots$(EXEEXT) \ +@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_8 = makeplots$(EXEEXT) \ @HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@ rootifysql$(EXEEXT) -@HAS_LIBXP_TRUE@am__EXEEXT_10 = did$(EXEEXT) webDid$(EXEEXT) -@IS_FALSE@am__EXEEXT_11 = ftm$(EXEEXT) fsc$(EXEEXT) fad$(EXEEXT) \ +@HAS_LIBXP_TRUE@am__EXEEXT_9 = did$(EXEEXT) webDid$(EXEEXT) +@IS_FALSE@am__EXEEXT_10 = ftm$(EXEEXT) fsc$(EXEEXT) fad$(EXEEXT) \ @IS_FALSE@ test$(EXEEXT) scheduler$(EXEEXT) \ @IS_FALSE@ triggerschedule$(EXEEXT) dclient5$(EXEEXT) \ @@ -922,7 +918,9 @@ BOOST_FLAGS = -DBOOST_DISABLE_ASSERTS AM_CFLAGS = -pedantic -AM_CPPFLAGS = -Idim/dim -Ipal -Ierfa/src $(DIM_FLAGS) $(BOOST_FLAGS) \ - $(ROOTCPPFLAGS) -Wall -Winit-self -Wpointer-arith -Wcast-align \ - -Wextra -Wformat=2 $(SVN_REVISION) $(am__append_1) +AM_CPPFLAGS = -Idim/dim -Ipal -Ierfa/src \ + $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \ + -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \ + $(SVN_REVISION) + AM_CXXFLAGS = $(AM_CPPFLAGS) \ -Woverloaded-virtual -Wnon-virtual-dtor -Wshadow @@ -970,5 +968,5 @@ #------------------------------------------------------------------------- -CLEANFILES = $(BUILT_SOURCES) $(am__append_17) $(am__append_20) +CLEANFILES = $(BUILT_SOURCES) $(am__append_15) $(am__append_18) dist_noinst_SCRIPTS = autogen.sh EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \ @@ -978,5 +976,5 @@ dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \ $(fact_DIALOGS) $(fact_RESOURCES) $(viewer_DIALOGS) \ - $(viewer_RESOURCES) $(am__append_16) $(am__append_19) + $(viewer_RESOURCES) $(am__append_14) $(am__append_17) dns_LDADD = libDim.la libDimExtension.la dns_SOURCES = src/dns.c @@ -1245,5 +1243,5 @@ src/DataProcessorImp.h src/DataCalib.cc src/DataCalib.h \ src/DataWriteRaw.cc src/DataWriteRaw.h src/DrsCalib.h \ - $(am__append_13) + $(am__append_11) fadctrl_LDADD = libDim++.la libDim.la libDimExtension.la \ libStateMachine.la libTools.la libTime.la \ @@ -1314,5 +1312,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_14) + src/DimState.cc src/DimState.h $(am__append_12) datalogger_LDADD = libDim++.la libDim.la libDimExtension.la \ libStateMachine.la libTools.la libTime.la \ @@ -1373,5 +1371,5 @@ @HAS_VIEWER_TRUE@viewer_SRCADD = $(viewer_DIALOGS:.ui=.h) $(viewer_RESOURCES:.qrc=.cc) $(viewer_QT_SOURCES:.cc=.moc.cc) BUILT_SOURCES = $(fact_SRCADD) $(viewer_SRCADD) -fact_LDADD = $(ROOTLDFLAGS) $(ROOTGLIBS) $(QT4_LIB) $(QT4_LDFLAGS) -L. \ +fact_LDADD = $(ROOTLDFLAGS) $(ROOTGLIBS) -lGQt $(QT4_LIB) $(QT4_LDFLAGS) -L. \ libDim++.la libDim.la libDimExtension.la \ libTools.la libStateMachine.la libTime.la libTools.la \ @@ -1402,5 +1400,5 @@ #------------------------------------------------------------------------- -MAN_TARGETS = $(dist_man1_MANS) $(am__append_15) $(am__append_18) +MAN_TARGETS = $(dist_man1_MANS) $(am__append_13) $(am__append_16) @HAS_JSDOC_TRUE@JAVA_SCRIPT_DOC = jsdoc all: $(BUILT_SOURCES)