Changeset 18503 for trunk/FACT++

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:

• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (9 diffs)

trunk/FACT++/Makefile.am

@@ -16 +16 @@
    $(SVN_REVISION)
 
+if HAS_ROOT_QT
+AM_CPPFLAGS += -lGQt
+endif
+
 AM_CXXFLAGS = $(AM_CPPFLAGS) \
    -Woverloaded-virtual -Wnon-virtual-dtor -Wshadow
@@ -32 +36 @@
         dns \
         log logtime time argv \
-        dimctrl \
-        dimserver \
-        datalogger \
         ftmctrl \
         fadctrl \
@@ -49 +50 @@
         showlog \
         fitsdump fitscheck fitsselect \
-        zfits \
-        rootifysql
+        zfits
+
+if HAS_FITS
+bin_PROGRAMS += datalogger
+endif
+
+if HAS_V8
+bin_PROGRAMS += dimctrl dimserver
+endif
+
+if HAS_ROOT
+bin_PROGRAMS += rootifysql
+endif
 
 if HAS_GUI

trunk/FACT++/Makefile.in

@@ -46 +46 @@
         .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) dimctrl$(EXEEXT) \
-        dimserver$(EXEEXT) datalogger$(EXEEXT) ftmctrl$(EXEEXT) \
-        fadctrl$(EXEEXT) fscctrl$(EXEEXT) gcn$(EXEEXT) \
-        chatclient$(EXEEXT) chatserv$(EXEEXT) biasctrl$(EXEEXT) \
-        drivectrl$(EXEEXT) agilentctrl$(EXEEXT) mcp$(EXEEXT) \
-        feedback$(EXEEXT) ratescan$(EXEEXT) ratecontrol$(EXEEXT) \
-        tngweather$(EXEEXT) lidctrl$(EXEEXT) gpsctrl$(EXEEXT) \
-        pfminictrl$(EXEEXT) sqmctrl$(EXEEXT) pwrctrl$(EXEEXT) \
-        magicweather$(EXEEXT) magiclidar$(EXEEXT) smartfact$(EXEEXT) \
-        evtserver$(EXEEXT) getevent$(EXEEXT) temperature$(EXEEXT) \
-        timecheck$(EXEEXT) showlog$(EXEEXT) fitsdump$(EXEEXT) \
-        fitscheck$(EXEEXT) fitsselect$(EXEEXT) zfits$(EXEEXT) \
-        rootifysql$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
-        $(am__EXEEXT_3) $(am__EXEEXT_4) $(am__EXEEXT_5) \
-        $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8)
-@HAS_GUI_TRUE@am__append_1 = fact
-@HAS_DBUS_TRUE@am__append_2 = skypeclient
-@HAS_VIEWER_TRUE@am__append_3 = viewer
-@HAS_NOVA_TRUE@am__append_4 = moon
-@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__append_5 = makedata makeschedule
-@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__append_6 = makeplots rootifysql
-@HAS_LIBXP_TRUE@am__append_7 = did webDid
+        time$(EXEEXT) argv$(EXEEXT) ftmctrl$(EXEEXT) fadctrl$(EXEEXT) \
+        fscctrl$(EXEEXT) gcn$(EXEEXT) chatclient$(EXEEXT) \
+        chatserv$(EXEEXT) biasctrl$(EXEEXT) drivectrl$(EXEEXT) \
+        agilentctrl$(EXEEXT) mcp$(EXEEXT) feedback$(EXEEXT) \
+        ratescan$(EXEEXT) ratecontrol$(EXEEXT) tngweather$(EXEEXT) \
+        lidctrl$(EXEEXT) gpsctrl$(EXEEXT) pfminictrl$(EXEEXT) \
+        sqmctrl$(EXEEXT) pwrctrl$(EXEEXT) magicweather$(EXEEXT) \
+        magiclidar$(EXEEXT) smartfact$(EXEEXT) evtserver$(EXEEXT) \
+        getevent$(EXEEXT) temperature$(EXEEXT) timecheck$(EXEEXT) \
+        showlog$(EXEEXT) fitsdump$(EXEEXT) fitscheck$(EXEEXT) \
+        fitsselect$(EXEEXT) zfits$(EXEEXT) $(am__EXEEXT_1) \
+        $(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
 
 # This is a trick to be able to build them but not having them in 'all'
-@IS_FALSE@am__append_8 = \
+@IS_FALSE@am__append_12 = \
 @IS_FALSE@      ftm fsc fad \
 @IS_FALSE@      test scheduler \
@@ -80 +84 @@
 @IS_FALSE@      cosyctrl
 
-@HAS_FITS_TRUE@am__append_9 = src/FitsFile.h src/FitsFile.cc \
+@HAS_FITS_TRUE@am__append_13 = 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_10 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
-@HAS_GROFF_TRUE@am__append_11 = $(dist_man1_MANS:.man=.html)
-@HAS_GROFF_TRUE@am__append_12 = $(dist_man1_MANS:.man=.html) 
-@HAS_GROFF_TRUE@am__append_13 = $(dist_man1_MANS:.man=.html) 
-@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_14 = $(dist_man1_MANS:.man=.pdf)
-@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_15 = $(dist_man1_MANS:.man=.pdf)
-@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_16 = $(dist_man1_MANS:.man=.pdf)
+@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_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
@@ -222 +226 @@
 am_libTools_la_OBJECTS = src/tools.lo
 libTools_la_OBJECTS = $(am_libTools_la_OBJECTS)
-@HAS_GUI_TRUE@am__EXEEXT_1 = fact$(EXEEXT)
-@HAS_DBUS_TRUE@am__EXEEXT_2 = skypeclient$(EXEEXT)
-@HAS_VIEWER_TRUE@am__EXEEXT_3 = viewer$(EXEEXT)
-@HAS_NOVA_TRUE@am__EXEEXT_4 = moon$(EXEEXT)
-@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__EXEEXT_5 = makedata$(EXEEXT) \
+@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_NOVA_TRUE@@HAS_SQL_TRUE@   makeschedule$(EXEEXT)
-@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_6 = makeplots$(EXEEXT) \
+@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_9 = makeplots$(EXEEXT) \
 @HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@    rootifysql$(EXEEXT)
-@HAS_LIBXP_TRUE@am__EXEEXT_7 = did$(EXEEXT) webDid$(EXEEXT)
-@IS_FALSE@am__EXEEXT_8 = ftm$(EXEEXT) fsc$(EXEEXT) fad$(EXEEXT) \
+@HAS_LIBXP_TRUE@am__EXEEXT_10 = did$(EXEEXT) webDid$(EXEEXT)
+@IS_FALSE@am__EXEEXT_11 = ftm$(EXEEXT) fsc$(EXEEXT) fad$(EXEEXT) \
 @IS_FALSE@      test$(EXEEXT) scheduler$(EXEEXT) \
 @IS_FALSE@      triggerschedule$(EXEEXT) dclient5$(EXEEXT) \
@@ -915 +922 @@
 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_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_CXXFLAGS = $(AM_CPPFLAGS) \
    -Woverloaded-virtual -Wnon-virtual-dtor -Wshadow
@@ -965 +970 @@
 
 #-------------------------------------------------------------------------
-CLEANFILES = $(BUILT_SOURCES) $(am__append_13) $(am__append_16)
+CLEANFILES = $(BUILT_SOURCES) $(am__append_17) $(am__append_20)
 dist_noinst_SCRIPTS = autogen.sh
 EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \
@@ -973 +978 @@
         dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
         $(fact_DIALOGS) $(fact_RESOURCES) $(viewer_DIALOGS) \
-        $(viewer_RESOURCES) $(am__append_12) $(am__append_15)
+        $(viewer_RESOURCES) $(am__append_16) $(am__append_19)
 dns_LDADD = libDim.la libDimExtension.la
 dns_SOURCES = src/dns.c
@@ -1240 +1245 @@
         src/DataProcessorImp.h src/DataCalib.cc src/DataCalib.h \
         src/DataWriteRaw.cc src/DataWriteRaw.h src/DrsCalib.h \
-        $(am__append_9)
+        $(am__append_13)
 fadctrl_LDADD = libDim++.la libDim.la  libDimExtension.la \
         libStateMachine.la libTools.la libTime.la \
@@ -1309 +1314 @@
 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_10)
+        src/DimState.cc src/DimState.h $(am__append_14)
 datalogger_LDADD = libDim++.la libDim.la libDimExtension.la \
         libStateMachine.la libTools.la libTime.la \
@@ -1397 +1402 @@
 
 #-------------------------------------------------------------------------
-MAN_TARGETS = $(dist_man1_MANS) $(am__append_11) $(am__append_14)
+MAN_TARGETS = $(dist_man1_MANS) $(am__append_15) $(am__append_18)
 @HAS_JSDOC_TRUE@JAVA_SCRIPT_DOC = jsdoc
 all: $(BUILT_SOURCES)