Changeset 18503 for trunk


Ignore:
Timestamp:
05/20/16 18:34:54 (9 years ago)
Author:
tbretz
Message:
Implemented that some programs which should not be compiled if some stuff is missing are really not compiled
Location:
trunk/FACT++
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/Makefile.am

    r18494 r18503  
    1616   $(SVN_REVISION)
    1717
     18if HAS_ROOT_QT
     19AM_CPPFLAGS += -lGQt
     20endif
     21
    1822AM_CXXFLAGS = $(AM_CPPFLAGS) \
    1923   -Woverloaded-virtual -Wnon-virtual-dtor -Wshadow
    … …  
    3236        dns \
    3337        log logtime time argv \
    34         dimctrl \
    35         dimserver \
    36         datalogger \
    3738        ftmctrl \
    3839        fadctrl \
    … …  
    4950        showlog \
    5051        fitsdump fitscheck fitsselect \
    51         zfits \
    52         rootifysql
     52        zfits
     53
     54if HAS_FITS
     55bin_PROGRAMS += datalogger
     56endif
     57
     58if HAS_V8
     59bin_PROGRAMS += dimctrl dimserver
     60endif
     61
     62if HAS_ROOT
     63bin_PROGRAMS += rootifysql
     64endif
    5365
    5466if HAS_GUI

  • trunk/FACT++/Makefile.in

    r18496 r18503  
    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
    4849bin_PROGRAMS = dns$(EXEEXT) log$(EXEEXT) logtime$(EXEEXT) \
    49         time$(EXEEXT) argv$(EXEEXT) dimctrl$(EXEEXT) \
    50         dimserver$(EXEEXT) datalogger$(EXEEXT) ftmctrl$(EXEEXT) \
    51         fadctrl$(EXEEXT) fscctrl$(EXEEXT) gcn$(EXEEXT) \
    52         chatclient$(EXEEXT) chatserv$(EXEEXT) biasctrl$(EXEEXT) \
    53         drivectrl$(EXEEXT) agilentctrl$(EXEEXT) mcp$(EXEEXT) \
    54         feedback$(EXEEXT) ratescan$(EXEEXT) ratecontrol$(EXEEXT) \
    55         tngweather$(EXEEXT) lidctrl$(EXEEXT) gpsctrl$(EXEEXT) \
    56         pfminictrl$(EXEEXT) sqmctrl$(EXEEXT) pwrctrl$(EXEEXT) \
    57         magicweather$(EXEEXT) magiclidar$(EXEEXT) smartfact$(EXEEXT) \
    58         evtserver$(EXEEXT) getevent$(EXEEXT) temperature$(EXEEXT) \
    59         timecheck$(EXEEXT) showlog$(EXEEXT) fitsdump$(EXEEXT) \
    60         fitscheck$(EXEEXT) fitsselect$(EXEEXT) zfits$(EXEEXT) \
    61         rootifysql$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
    62         $(am__EXEEXT_3) $(am__EXEEXT_4) $(am__EXEEXT_5) \
    63         $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8)
    64 @HAS_GUI_TRUE@am__append_1 = fact
    65 @HAS_DBUS_TRUE@am__append_2 = skypeclient
    66 @HAS_VIEWER_TRUE@am__append_3 = viewer
    67 @HAS_NOVA_TRUE@am__append_4 = moon
    68 @HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__append_5 = makedata makeschedule
    69 @HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__append_6 = makeplots rootifysql
    70 @HAS_LIBXP_TRUE@am__append_7 = did webDid
     50        time$(EXEEXT) argv$(EXEEXT) ftmctrl$(EXEEXT) fadctrl$(EXEEXT) \
     51        fscctrl$(EXEEXT) gcn$(EXEEXT) chatclient$(EXEEXT) \
     52        chatserv$(EXEEXT) biasctrl$(EXEEXT) drivectrl$(EXEEXT) \
     53        agilentctrl$(EXEEXT) mcp$(EXEEXT) feedback$(EXEEXT) \
     54        ratescan$(EXEEXT) ratecontrol$(EXEEXT) tngweather$(EXEEXT) \
     55        lidctrl$(EXEEXT) gpsctrl$(EXEEXT) pfminictrl$(EXEEXT) \
     56        sqmctrl$(EXEEXT) pwrctrl$(EXEEXT) magicweather$(EXEEXT) \
     57        magiclidar$(EXEEXT) smartfact$(EXEEXT) evtserver$(EXEEXT) \
     58        getevent$(EXEEXT) temperature$(EXEEXT) timecheck$(EXEEXT) \
     59        showlog$(EXEEXT) fitsdump$(EXEEXT) fitscheck$(EXEEXT) \
     60        fitsselect$(EXEEXT) zfits$(EXEEXT) $(am__EXEEXT_1) \
     61        $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \
     62        $(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
    7175
    7276# This is a trick to be able to build them but not having them in 'all'
    73 @IS_FALSE@am__append_8 = \
     77@IS_FALSE@am__append_12 = \
    7478@IS_FALSE@      ftm fsc fad \
    7579@IS_FALSE@      test scheduler \
    … …  
    8084@IS_FALSE@      cosyctrl
    8185
    82 @HAS_FITS_TRUE@am__append_9 = src/FitsFile.h src/FitsFile.cc \
     86@HAS_FITS_TRUE@am__append_13 = src/FitsFile.h src/FitsFile.cc \
    8387@HAS_FITS_TRUE@ src/DataWriteFits.cc    src/DataWriteFits.h \
    8488@HAS_FITS_TRUE@ src/DataWriteFits2.cc   src/DataWriteFits2.h
    8589
    86 @HAS_FITS_TRUE@am__append_10 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
    87 @HAS_GROFF_TRUE@am__append_11 = $(dist_man1_MANS:.man=.html)
    88 @HAS_GROFF_TRUE@am__append_12 = $(dist_man1_MANS:.man=.html)
    89 @HAS_GROFF_TRUE@am__append_13 = $(dist_man1_MANS:.man=.html)
    90 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_14 = $(dist_man1_MANS:.man=.pdf)
    91 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_15 = $(dist_man1_MANS:.man=.pdf)
    92 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_16 = $(dist_man1_MANS:.man=.pdf)
     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)
     94@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)
    9397subdir = .
    9498ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    222226am_libTools_la_OBJECTS = src/tools.lo
    223227libTools_la_OBJECTS = $(am_libTools_la_OBJECTS)
    224 @HAS_GUI_TRUE@am__EXEEXT_1 = fact$(EXEEXT)
    225 @HAS_DBUS_TRUE@am__EXEEXT_2 = skypeclient$(EXEEXT)
    226 @HAS_VIEWER_TRUE@am__EXEEXT_3 = viewer$(EXEEXT)
    227 @HAS_NOVA_TRUE@am__EXEEXT_4 = moon$(EXEEXT)
    228 @HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__EXEEXT_5 = makedata$(EXEEXT) \
     228@HAS_FITS_TRUE@am__EXEEXT_1 = datalogger$(EXEEXT)
     229@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) \
    229236@HAS_NOVA_TRUE@@HAS_SQL_TRUE@   makeschedule$(EXEEXT)
    230 @HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_6 = makeplots$(EXEEXT) \
     237@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_9 = makeplots$(EXEEXT) \
    231238@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@    rootifysql$(EXEEXT)
    232 @HAS_LIBXP_TRUE@am__EXEEXT_7 = did$(EXEEXT) webDid$(EXEEXT)
    233 @IS_FALSE@am__EXEEXT_8 = ftm$(EXEEXT) fsc$(EXEEXT) fad$(EXEEXT) \
     239@HAS_LIBXP_TRUE@am__EXEEXT_10 = did$(EXEEXT) webDid$(EXEEXT)
     240@IS_FALSE@am__EXEEXT_11 = ftm$(EXEEXT) fsc$(EXEEXT) fad$(EXEEXT) \
    234241@IS_FALSE@      test$(EXEEXT) scheduler$(EXEEXT) \
    235242@IS_FALSE@      triggerschedule$(EXEEXT) dclient5$(EXEEXT) \
    … …  
    915922BOOST_FLAGS = -DBOOST_DISABLE_ASSERTS
    916923AM_CFLAGS = -pedantic
    917 AM_CPPFLAGS = -Idim/dim -Ipal -Ierfa/src \
    918    $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \
    919    -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
    920    $(SVN_REVISION)
    921 
     924AM_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)
    922927AM_CXXFLAGS = $(AM_CPPFLAGS) \
    923928   -Woverloaded-virtual -Wnon-virtual-dtor -Wshadow
    … …  
    965970
    966971#-------------------------------------------------------------------------
    967 CLEANFILES = $(BUILT_SOURCES) $(am__append_13) $(am__append_16)
     972CLEANFILES = $(BUILT_SOURCES) $(am__append_17) $(am__append_20)
    968973dist_noinst_SCRIPTS = autogen.sh
    969974EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \
    … …  
    973978        dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
    974979        $(fact_DIALOGS) $(fact_RESOURCES) $(viewer_DIALOGS) \
    975         $(viewer_RESOURCES) $(am__append_12) $(am__append_15)
     980        $(viewer_RESOURCES) $(am__append_16) $(am__append_19)
    976981dns_LDADD = libDim.la libDimExtension.la
    977982dns_SOURCES = src/dns.c
    … …  
    12401245        src/DataProcessorImp.h src/DataCalib.cc src/DataCalib.h \
    12411246        src/DataWriteRaw.cc src/DataWriteRaw.h src/DrsCalib.h \
    1242         $(am__append_9)
     1247        $(am__append_13)
    12431248fadctrl_LDADD = libDim++.la libDim.la  libDimExtension.la \
    12441249        libStateMachine.la libTools.la libTime.la \
    … …  
    13091314test_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
    13101315datalogger_SOURCES = src/datalogger.cc src/LocalControl.h \
    1311         src/DimState.cc src/DimState.h $(am__append_10)
     1316        src/DimState.cc src/DimState.h $(am__append_14)
    13121317datalogger_LDADD = libDim++.la libDim.la libDimExtension.la \
    13131318        libStateMachine.la libTools.la libTime.la \
    … …  
    13971402
    13981403#-------------------------------------------------------------------------
    1399 MAN_TARGETS = $(dist_man1_MANS) $(am__append_11) $(am__append_14)
     1404MAN_TARGETS = $(dist_man1_MANS) $(am__append_15) $(am__append_18)
    14001405@HAS_JSDOC_TRUE@JAVA_SCRIPT_DOC = jsdoc
    14011406all: $(BUILT_SOURCES)
Note: See TracChangeset for help on using the changeset viewer.