Changeset 18509


Ignore:
Timestamp:
05/23/16 17:21:06 (9 years ago)
Author:
tbretz
Message:
Moved -lGQt to fact compilation, removed duplicate rootifysql entry
File:
1 edited

Legend:

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

    r18503 r18509  
    4646        .aux_dir/install-sh .aux_dir/ltmain.sh .aux_dir/missing \
    4747        AUTHORS COPYING ChangeLog INSTALL NEWS
    48 @HAS_ROOT_QT_TRUE@am__append_1 = -lGQt
    4948bin_PROGRAMS = dns$(EXEEXT) log$(EXEEXT) logtime$(EXEEXT) \
    5049        time$(EXEEXT) argv$(EXEEXT) ftmctrl$(EXEEXT) fadctrl$(EXEEXT) \
     
    6160        $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \
    6261        $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
    63         $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \
    64         $(am__EXEEXT_11)
    65 @HAS_FITS_TRUE@am__append_2 = datalogger
    66 @HAS_V8_TRUE@am__append_3 = dimctrl dimserver
    67 @HAS_ROOT_TRUE@am__append_4 = rootifysql
    68 @HAS_GUI_TRUE@am__append_5 = fact
    69 @HAS_DBUS_TRUE@am__append_6 = skypeclient
    70 @HAS_VIEWER_TRUE@am__append_7 = viewer
    71 @HAS_NOVA_TRUE@am__append_8 = moon
    72 @HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__append_9 = makedata makeschedule
    73 @HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__append_10 = makeplots rootifysql
    74 @HAS_LIBXP_TRUE@am__append_11 = did webDid
     62        $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10)
     63@HAS_FITS_TRUE@am__append_1 = datalogger
     64@HAS_V8_TRUE@am__append_2 = dimctrl dimserver
     65@HAS_GUI_TRUE@am__append_3 = fact
     66@HAS_DBUS_TRUE@am__append_4 = skypeclient
     67@HAS_VIEWER_TRUE@am__append_5 = viewer
     68@HAS_NOVA_TRUE@am__append_6 = moon
     69@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__append_7 = makedata makeschedule
     70@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__append_8 = makeplots rootifysql
     71@HAS_LIBXP_TRUE@am__append_9 = did webDid
    7572
    7673# This is a trick to be able to build them but not having them in 'all'
    77 @IS_FALSE@am__append_12 = \
     74@IS_FALSE@am__append_10 = \
    7875@IS_FALSE@      ftm fsc fad \
    7976@IS_FALSE@      test scheduler \
     
    8481@IS_FALSE@      cosyctrl
    8582
    86 @HAS_FITS_TRUE@am__append_13 = src/FitsFile.h src/FitsFile.cc \
     83@HAS_FITS_TRUE@am__append_11 = src/FitsFile.h src/FitsFile.cc \
    8784@HAS_FITS_TRUE@ src/DataWriteFits.cc    src/DataWriteFits.h \
    8885@HAS_FITS_TRUE@ src/DataWriteFits2.cc   src/DataWriteFits2.h
    8986
    90 @HAS_FITS_TRUE@am__append_14 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
    91 @HAS_GROFF_TRUE@am__append_15 = $(dist_man1_MANS:.man=.html)
    92 @HAS_GROFF_TRUE@am__append_16 = $(dist_man1_MANS:.man=.html)
    93 @HAS_GROFF_TRUE@am__append_17 = $(dist_man1_MANS:.man=.html)
     87@HAS_FITS_TRUE@am__append_12 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
     88@HAS_GROFF_TRUE@am__append_13 = $(dist_man1_MANS:.man=.html)
     89@HAS_GROFF_TRUE@am__append_14 = $(dist_man1_MANS:.man=.html)
     90@HAS_GROFF_TRUE@am__append_15 = $(dist_man1_MANS:.man=.html)
     91@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_16 = $(dist_man1_MANS:.man=.pdf)
     92@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_17 = $(dist_man1_MANS:.man=.pdf)
    9493@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_18 = $(dist_man1_MANS:.man=.pdf)
    95 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_19 = $(dist_man1_MANS:.man=.pdf)
    96 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_20 = $(dist_man1_MANS:.man=.pdf)
    9794subdir = .
    9895ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    228225@HAS_FITS_TRUE@am__EXEEXT_1 = datalogger$(EXEEXT)
    229226@HAS_V8_TRUE@am__EXEEXT_2 = dimctrl$(EXEEXT) dimserver$(EXEEXT)
    230 @HAS_ROOT_TRUE@am__EXEEXT_3 = rootifysql$(EXEEXT)
    231 @HAS_GUI_TRUE@am__EXEEXT_4 = fact$(EXEEXT)
    232 @HAS_DBUS_TRUE@am__EXEEXT_5 = skypeclient$(EXEEXT)
    233 @HAS_VIEWER_TRUE@am__EXEEXT_6 = viewer$(EXEEXT)
    234 @HAS_NOVA_TRUE@am__EXEEXT_7 = moon$(EXEEXT)
    235 @HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__EXEEXT_8 = makedata$(EXEEXT) \
     227@HAS_GUI_TRUE@am__EXEEXT_3 = fact$(EXEEXT)
     228@HAS_DBUS_TRUE@am__EXEEXT_4 = skypeclient$(EXEEXT)
     229@HAS_VIEWER_TRUE@am__EXEEXT_5 = viewer$(EXEEXT)
     230@HAS_NOVA_TRUE@am__EXEEXT_6 = moon$(EXEEXT)
     231@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__EXEEXT_7 = makedata$(EXEEXT) \
    236232@HAS_NOVA_TRUE@@HAS_SQL_TRUE@   makeschedule$(EXEEXT)
    237 @HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_9 = makeplots$(EXEEXT) \
     233@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_8 = makeplots$(EXEEXT) \
    238234@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@    rootifysql$(EXEEXT)
    239 @HAS_LIBXP_TRUE@am__EXEEXT_10 = did$(EXEEXT) webDid$(EXEEXT)
    240 @IS_FALSE@am__EXEEXT_11 = ftm$(EXEEXT) fsc$(EXEEXT) fad$(EXEEXT) \
     235@HAS_LIBXP_TRUE@am__EXEEXT_9 = did$(EXEEXT) webDid$(EXEEXT)
     236@IS_FALSE@am__EXEEXT_10 = ftm$(EXEEXT) fsc$(EXEEXT) fad$(EXEEXT) \
    241237@IS_FALSE@      test$(EXEEXT) scheduler$(EXEEXT) \
    242238@IS_FALSE@      triggerschedule$(EXEEXT) dclient5$(EXEEXT) \
     
    922918BOOST_FLAGS = -DBOOST_DISABLE_ASSERTS
    923919AM_CFLAGS = -pedantic
    924 AM_CPPFLAGS = -Idim/dim -Ipal -Ierfa/src $(DIM_FLAGS) $(BOOST_FLAGS) \
    925         $(ROOTCPPFLAGS) -Wall -Winit-self -Wpointer-arith -Wcast-align \
    926         -Wextra -Wformat=2 $(SVN_REVISION) $(am__append_1)
     920AM_CPPFLAGS = -Idim/dim -Ipal -Ierfa/src \
     921   $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \
     922   -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
     923   $(SVN_REVISION)
     924
    927925AM_CXXFLAGS = $(AM_CPPFLAGS) \
    928926   -Woverloaded-virtual -Wnon-virtual-dtor -Wshadow
     
    970968
    971969#-------------------------------------------------------------------------
    972 CLEANFILES = $(BUILT_SOURCES) $(am__append_17) $(am__append_20)
     970CLEANFILES = $(BUILT_SOURCES) $(am__append_15) $(am__append_18)
    973971dist_noinst_SCRIPTS = autogen.sh
    974972EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \
     
    978976        dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
    979977        $(fact_DIALOGS) $(fact_RESOURCES) $(viewer_DIALOGS) \
    980         $(viewer_RESOURCES) $(am__append_16) $(am__append_19)
     978        $(viewer_RESOURCES) $(am__append_14) $(am__append_17)
    981979dns_LDADD = libDim.la libDimExtension.la
    982980dns_SOURCES = src/dns.c
     
    12451243        src/DataProcessorImp.h src/DataCalib.cc src/DataCalib.h \
    12461244        src/DataWriteRaw.cc src/DataWriteRaw.h src/DrsCalib.h \
    1247         $(am__append_13)
     1245        $(am__append_11)
    12481246fadctrl_LDADD = libDim++.la libDim.la  libDimExtension.la \
    12491247        libStateMachine.la libTools.la libTime.la \
     
    13141312test_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
    13151313datalogger_SOURCES = src/datalogger.cc src/LocalControl.h \
    1316         src/DimState.cc src/DimState.h $(am__append_14)
     1314        src/DimState.cc src/DimState.h $(am__append_12)
    13171315datalogger_LDADD = libDim++.la libDim.la libDimExtension.la \
    13181316        libStateMachine.la libTools.la libTime.la \
     
    13731371@HAS_VIEWER_TRUE@viewer_SRCADD = $(viewer_DIALOGS:.ui=.h) $(viewer_RESOURCES:.qrc=.cc) $(viewer_QT_SOURCES:.cc=.moc.cc)
    13741372BUILT_SOURCES = $(fact_SRCADD) $(viewer_SRCADD)
    1375 fact_LDADD = $(ROOTLDFLAGS) $(ROOTGLIBS) $(QT4_LIB) $(QT4_LDFLAGS) -L. \
     1373fact_LDADD = $(ROOTLDFLAGS) $(ROOTGLIBS) -lGQt $(QT4_LIB) $(QT4_LDFLAGS) -L. \
    13761374        libDim++.la libDim.la libDimExtension.la \
    13771375        libTools.la libStateMachine.la libTime.la libTools.la \
     
    14021400
    14031401#-------------------------------------------------------------------------
    1404 MAN_TARGETS = $(dist_man1_MANS) $(am__append_15) $(am__append_18)
     1402MAN_TARGETS = $(dist_man1_MANS) $(am__append_13) $(am__append_16)
    14051403@HAS_JSDOC_TRUE@JAVA_SCRIPT_DOC = jsdoc
    14061404all: $(BUILT_SOURCES)
Note: See TracChangeset for help on using the changeset viewer.