Changeset 16957


Ignore:
Timestamp:
07/18/13 13:09:02 (11 years ago)
Author:
tbretz
Message:
Removed the need for the Soprano library, we are using the Qt-classes instead now. Added gcn to the list of programs to be compiles. Removed the linking of QtWebKit, it is not needed.
Location:
trunk/FACT++
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/Makefile.am

    r16823 r16957  
    3636        fadctrl \
    3737        fscctrl \
     38        gcn \
    3839        chatclient chatserv \
    3940        biasctrl drivectrl agilentctrl \
    4041        mcp feedback ratescan ratecontrol \
     42        tngweather lidctrl pwrctrl \
    4143        magicweather magiclidar \
    4244        smartfact \
    … …  
    5052if HAS_GUI
    5153bin_PROGRAMS += fact
    52 endif
    53 
    54 if HAS_SOPRANO
    55 bin_PROGRAMS += tngweather lidctrl pwrctrl
    5654endif
    5755
    … …  
    10098if HAS_HELP2MAN
    10199dist_man1_MANS = \
     100        biasctrl.man \
     101        datalogger.man \
    102102        dimctrl.man \
    103103        dimserver.man \
    104         datalogger.man \
    105         ftmctrl.man \
     104        drivectrl.man \
    106105        fadctrl.man \
    107         fscctrl.man \
    108         biasctrl.man \
    109         drivectrl.man \
    110         mcp.man \
    111106        feedback.man \
    112         ratescan.man \
    113         ratecontrol.man \
    114107        fitsdump.man \
    115108        fitscheck.man \
     109        fscctrl.man \
     110        ftmctrl.man \
     111        lidctrl.man \
     112        magiclidar.man \
    116113        magicweather.man \
    117         magiclidar.man \
     114        mcp.man \
     115        pwrctrl.man \
     116        ratecontrol.man \
     117        ratescan.man \
     118        showlog.man \
    118119        smartfact.man \
    119120        temperature.man \
    120121        timecheck.man \
    121         showlog.man \
     122        tngweather.man \
    122123        zfits.man
    123 if HAS_SOPRANO
    124 dist_man1_MANS += tngweather.man lidctrl.man pwrctrl.man
    125 endif
    126        
    127124endif
    128125
    … …  
    327324tngweather_LDADD   = libDim++.la libDim.la libDimExtension.la \
    328325        libStateMachine.la libTools.la libTime.la \
    329         libConfiguration.la
     326        libConfiguration.la -lQtXml
    330327
    331328lidctrl_SOURCES = src/lidctrl.cc src/LocalControl.h
    332329lidctrl_LDADD   = libDim++.la libDim.la libDimExtension.la \
    333330        libStateMachine.la libTools.la libTime.la \
    334         libConfiguration.la -lQtWebKit -lQtXml
     331        libConfiguration.la -lQtXml
    335332
    336333temperature_SOURCES = src/temperature.cc src/LocalControl.h
    … …  
    343340pwrctrl_LDADD   = libDim++.la libDim.la libDimExtension.la \
    344341        libStateMachine.la libTools.la libTime.la \
    345         libConfiguration.la -lQtWebKit -lQtXml
     342        libConfiguration.la -lQtXml
    346343
    347344timecheck_SOURCES = src/timecheck.cc src/LocalControl.h
    … …  
    364361fadctrl_SOURCES += src/FitsFile.h src/FitsFile.cc \
    365362        src/DataWriteFits.cc    src/DataWriteFits.h \
    366         src/DataWriteFits2.cc    src/DataWriteFits2.h
     363        src/DataWriteFits2.cc   src/DataWriteFits2.h
    367364endif
    368365fadctrl_LDADD   = libDim++.la libDim.la  libDimExtension.la \
    … …  
    374371       libStateMachine.la libTools.la libTime.la \
    375372       libConfiguration.la
     373
     374gcn_SOURCES = src/gcn.cc src/LocalControl.h
     375gcn_LDADD   = libDim++.la libDim.la  libDimExtension.la \
     376       libStateMachine.la libTools.la libTime.la \
     377       libConfiguration.la -lQtXml
    376378
    377379biasctrl_SOURCES = src/biasctrl.cc src/LocalControl.h src/PixelMap.cc

  • trunk/FACT++/Makefile.in

    r16823 r16957  
    4545        time$(EXEEXT) argv$(EXEEXT) dimctrl$(EXEEXT) \
    4646        dimserver$(EXEEXT) datalogger$(EXEEXT) ftmctrl$(EXEEXT) \
    47         fadctrl$(EXEEXT) fscctrl$(EXEEXT) chatclient$(EXEEXT) \
    48         chatserv$(EXEEXT) biasctrl$(EXEEXT) drivectrl$(EXEEXT) \
    49         agilentctrl$(EXEEXT) mcp$(EXEEXT) feedback$(EXEEXT) \
    50         ratescan$(EXEEXT) ratecontrol$(EXEEXT) magicweather$(EXEEXT) \
    51         magiclidar$(EXEEXT) smartfact$(EXEEXT) temperature$(EXEEXT) \
    52         timecheck$(EXEEXT) showlog$(EXEEXT) fitsdump$(EXEEXT) \
    53         fitscheck$(EXEEXT) zfits$(EXEEXT) fitsCompressor$(EXEEXT) \
    54         $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
    55         $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
    56         $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9)
     47        fadctrl$(EXEEXT) fscctrl$(EXEEXT) gcn$(EXEEXT) \
     48        chatclient$(EXEEXT) chatserv$(EXEEXT) biasctrl$(EXEEXT) \
     49        drivectrl$(EXEEXT) agilentctrl$(EXEEXT) mcp$(EXEEXT) \
     50        feedback$(EXEEXT) ratescan$(EXEEXT) ratecontrol$(EXEEXT) \
     51        tngweather$(EXEEXT) lidctrl$(EXEEXT) pwrctrl$(EXEEXT) \
     52        magicweather$(EXEEXT) magiclidar$(EXEEXT) smartfact$(EXEEXT) \
     53        temperature$(EXEEXT) timecheck$(EXEEXT) showlog$(EXEEXT) \
     54        fitsdump$(EXEEXT) fitscheck$(EXEEXT) zfits$(EXEEXT) \
     55        fitsCompressor$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
     56        $(am__EXEEXT_3) $(am__EXEEXT_4) $(am__EXEEXT_5) \
     57        $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8)
    5758@HAS_GUI_TRUE@am__append_1 = fact
    58 @HAS_SOPRANO_TRUE@am__append_2 = tngweather lidctrl pwrctrl
    59 @HAS_DBUS_TRUE@am__append_3 = skypeclient
    60 @HAS_VIEWER_TRUE@am__append_4 = viewer
    61 @HAS_NOVA_TRUE@am__append_5 = moon
    62 @HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__append_6 = makedata
    63 @HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__append_7 = makeplots
    64 @HAS_LIBXP_TRUE@am__append_8 = did webDid
     59@HAS_DBUS_TRUE@am__append_2 = skypeclient
     60@HAS_VIEWER_TRUE@am__append_3 = viewer
     61@HAS_NOVA_TRUE@am__append_4 = moon
     62@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__append_5 = makedata
     63@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__append_6 = makeplots
     64@HAS_LIBXP_TRUE@am__append_7 = did webDid
    6565
    6666# This is a trick to be able to build them but not having them in 'all'
    67 @IS_FALSE@am__append_9 = \
     67@IS_FALSE@am__append_8 = \
    6868@IS_FALSE@      ftm fsc fad \
    6969@IS_FALSE@      test scheduler \
    … …  
    7373@IS_FALSE@      sched astro readfits
    7474
    75 @HAS_HELP2MAN_TRUE@@HAS_SOPRANO_TRUE@am__append_10 = tngweather.man lidctrl.man pwrctrl.man
    76 @HAS_FITS_TRUE@am__append_11 = src/FitsFile.h src/FitsFile.cc \
     75@HAS_FITS_TRUE@am__append_9 = src/FitsFile.h src/FitsFile.cc \
    7776@HAS_FITS_TRUE@ src/DataWriteFits.cc    src/DataWriteFits.h \
    78 @HAS_FITS_TRUE@ src/DataWriteFits2.cc    src/DataWriteFits2.h
    79 
    80 @HAS_FITS_TRUE@am__append_12 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
    81 @HAS_GROFF_TRUE@am__append_13 = $(dist_man1_MANS:.man=.html)
    82 @HAS_GROFF_TRUE@am__append_14 = $(dist_man1_MANS:.man=.html)
    83 @HAS_GROFF_TRUE@am__append_15 = $(dist_man1_MANS:.man=.html)
     77@HAS_FITS_TRUE@ src/DataWriteFits2.cc   src/DataWriteFits2.h
     78
     79@HAS_FITS_TRUE@am__append_10 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
     80@HAS_GROFF_TRUE@am__append_11 = $(dist_man1_MANS:.man=.html)
     81@HAS_GROFF_TRUE@am__append_12 = $(dist_man1_MANS:.man=.html)
     82@HAS_GROFF_TRUE@am__append_13 = $(dist_man1_MANS:.man=.html)
     83@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_14 = $(dist_man1_MANS:.man=.pdf)
     84@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_15 = $(dist_man1_MANS:.man=.pdf)
    8485@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_16 = $(dist_man1_MANS:.man=.pdf)
    85 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_17 = $(dist_man1_MANS:.man=.pdf)
    86 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_18 = $(dist_man1_MANS:.man=.pdf)
    8786subdir = .
    8887DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \
    … …  
    188187libTools_la_OBJECTS = $(am_libTools_la_OBJECTS)
    189188@HAS_GUI_TRUE@am__EXEEXT_1 = fact$(EXEEXT)
    190 @HAS_SOPRANO_TRUE@am__EXEEXT_2 = tngweather$(EXEEXT) lidctrl$(EXEEXT) \
    191 @HAS_SOPRANO_TRUE@      pwrctrl$(EXEEXT)
    192 @HAS_DBUS_TRUE@am__EXEEXT_3 = skypeclient$(EXEEXT)
    193 @HAS_VIEWER_TRUE@am__EXEEXT_4 = viewer$(EXEEXT)
    194 @HAS_NOVA_TRUE@am__EXEEXT_5 = moon$(EXEEXT)
    195 @HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__EXEEXT_6 = makedata$(EXEEXT)
    196 @HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_7 = makeplots$(EXEEXT)
    197 @HAS_LIBXP_TRUE@am__EXEEXT_8 = did$(EXEEXT) webDid$(EXEEXT)
    198 @IS_FALSE@am__EXEEXT_9 = ftm$(EXEEXT) fsc$(EXEEXT) fad$(EXEEXT) \
     189@HAS_DBUS_TRUE@am__EXEEXT_2 = skypeclient$(EXEEXT)
     190@HAS_VIEWER_TRUE@am__EXEEXT_3 = viewer$(EXEEXT)
     191@HAS_NOVA_TRUE@am__EXEEXT_4 = moon$(EXEEXT)
     192@HAS_NOVA_TRUE@@HAS_SQL_TRUE@am__EXEEXT_5 = makedata$(EXEEXT)
     193@HAS_NOVA_TRUE@@HAS_ROOT_TRUE@@HAS_SQL_TRUE@am__EXEEXT_6 = makeplots$(EXEEXT)
     194@HAS_LIBXP_TRUE@am__EXEEXT_7 = did$(EXEEXT) webDid$(EXEEXT)
     195@IS_FALSE@am__EXEEXT_8 = ftm$(EXEEXT) fsc$(EXEEXT) fad$(EXEEXT) \
    199196@IS_FALSE@      test$(EXEEXT) scheduler$(EXEEXT) \
    200197@IS_FALSE@      triggerschedule$(EXEEXT) dclient5$(EXEEXT) \
    … …  
    355352ftmctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
    356353        libStateMachine.la libTime.la libTools.la libConfiguration.la
     354am_gcn_OBJECTS = src/gcn.$(OBJEXT)
     355gcn_OBJECTS = $(am_gcn_OBJECTS)
     356gcn_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
     357        libStateMachine.la libTools.la libTime.la libConfiguration.la
    357358am_lidctrl_OBJECTS = src/lidctrl.$(OBJEXT)
    358359lidctrl_OBJECTS = $(am_lidctrl_OBJECTS)
    … …  
    539540        $(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
    540541        $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
    541         $(ftm_SOURCES) $(ftmctrl_SOURCES) $(lidctrl_SOURCES) \
    542         $(log_SOURCES) $(logtime_SOURCES) $(magiclidar_SOURCES) \
    543         $(magicweather_SOURCES) $(makedata_SOURCES) \
    544         $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
    545         $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \
    546         $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \
    547         $(showlog_SOURCES) $(skypeclient_SOURCES) $(smartfact_SOURCES) \
    548         $(temperature_SOURCES) $(test_SOURCES) $(time_SOURCES) \
    549         $(timecheck_SOURCES) $(tngweather_SOURCES) \
     542        $(ftm_SOURCES) $(ftmctrl_SOURCES) $(gcn_SOURCES) \
     543        $(lidctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
     544        $(magiclidar_SOURCES) $(magicweather_SOURCES) \
     545        $(makedata_SOURCES) $(makeplots_SOURCES) $(mcp_SOURCES) \
     546        $(moon_SOURCES) $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) \
     547        $(ratescan_SOURCES) $(readfits_SOURCES) sched.c \
     548        $(scheduler_SOURCES) $(showlog_SOURCES) $(skypeclient_SOURCES) \
     549        $(smartfact_SOURCES) $(temperature_SOURCES) $(test_SOURCES) \
     550        $(time_SOURCES) $(timecheck_SOURCES) $(tngweather_SOURCES) \
    550551        $(triggerschedule_SOURCES) $(viewer_SOURCES) $(webDid_SOURCES) \
    551552        $(zfits_SOURCES)
    … …  
    563564        $(fitsdump_SOURCES) fitsgrep.c $(fitsloader_SOURCES) \
    564565        $(fsc_SOURCES) $(fscctrl_SOURCES) $(ftm_SOURCES) \
    565         $(ftmctrl_SOURCES) $(lidctrl_SOURCES) $(log_SOURCES) \
    566         $(logtime_SOURCES) $(magiclidar_SOURCES) \
     566        $(ftmctrl_SOURCES) $(gcn_SOURCES) $(lidctrl_SOURCES) \
     567        $(log_SOURCES) $(logtime_SOURCES) $(magiclidar_SOURCES) \
    567568        $(magicweather_SOURCES) $(makedata_SOURCES) \
    568569        $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
    … …  
    826827
    827828#       libAstro.la
    828 @HAS_HELP2MAN_TRUE@dist_man1_MANS = dimctrl.man dimserver.man \
    829 @HAS_HELP2MAN_TRUE@     datalogger.man ftmctrl.man fadctrl.man \
    830 @HAS_HELP2MAN_TRUE@     fscctrl.man biasctrl.man drivectrl.man \
    831 @HAS_HELP2MAN_TRUE@     mcp.man feedback.man ratescan.man \
    832 @HAS_HELP2MAN_TRUE@     ratecontrol.man fitsdump.man fitscheck.man \
    833 @HAS_HELP2MAN_TRUE@     magicweather.man magiclidar.man \
    834 @HAS_HELP2MAN_TRUE@     smartfact.man temperature.man timecheck.man \
    835 @HAS_HELP2MAN_TRUE@     showlog.man zfits.man $(am__append_10)
     829@HAS_HELP2MAN_TRUE@dist_man1_MANS = \
     830@HAS_HELP2MAN_TRUE@     biasctrl.man \
     831@HAS_HELP2MAN_TRUE@     datalogger.man \
     832@HAS_HELP2MAN_TRUE@     dimctrl.man \
     833@HAS_HELP2MAN_TRUE@     dimserver.man \
     834@HAS_HELP2MAN_TRUE@     drivectrl.man \
     835@HAS_HELP2MAN_TRUE@     fadctrl.man \
     836@HAS_HELP2MAN_TRUE@     feedback.man \
     837@HAS_HELP2MAN_TRUE@     fitsdump.man \
     838@HAS_HELP2MAN_TRUE@     fitscheck.man \
     839@HAS_HELP2MAN_TRUE@     fscctrl.man \
     840@HAS_HELP2MAN_TRUE@     ftmctrl.man \
     841@HAS_HELP2MAN_TRUE@     lidctrl.man \
     842@HAS_HELP2MAN_TRUE@     magiclidar.man \
     843@HAS_HELP2MAN_TRUE@     magicweather.man \
     844@HAS_HELP2MAN_TRUE@     mcp.man \
     845@HAS_HELP2MAN_TRUE@     pwrctrl.man \
     846@HAS_HELP2MAN_TRUE@     ratecontrol.man \
     847@HAS_HELP2MAN_TRUE@     ratescan.man \
     848@HAS_HELP2MAN_TRUE@     showlog.man \
     849@HAS_HELP2MAN_TRUE@     smartfact.man \
     850@HAS_HELP2MAN_TRUE@     temperature.man \
     851@HAS_HELP2MAN_TRUE@     timecheck.man \
     852@HAS_HELP2MAN_TRUE@     tngweather.man \
     853@HAS_HELP2MAN_TRUE@     zfits.man
     854
    836855
    837856#-------------------------------------------------------------------------
    838 CLEANFILES = $(BUILT_SOURCES) $(am__append_15) $(am__append_18)
     857CLEANFILES = $(BUILT_SOURCES) $(am__append_13) $(am__append_16)
    839858dist_noinst_SCRIPTS = autogen.sh
    840859EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \
    … …  
    844863        dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
    845864        $(fact_DIALOGS) $(fact_RESOURCES) $(viewer_DIALOGS) \
    846         $(viewer_RESOURCES) $(am__append_14) $(am__append_17)
     865        $(viewer_RESOURCES) $(am__append_12) $(am__append_15)
    847866dns_LDADD = libDim.la libDimExtension.la
    848867dns_SOURCES = src/dns.c
    … …  
    10081027tngweather_LDADD = libDim++.la libDim.la libDimExtension.la \
    10091028        libStateMachine.la libTools.la libTime.la \
    1010         libConfiguration.la
     1029        libConfiguration.la -lQtXml
    10111030
    10121031lidctrl_SOURCES = src/lidctrl.cc src/LocalControl.h
    10131032lidctrl_LDADD = libDim++.la libDim.la libDimExtension.la \
    10141033        libStateMachine.la libTools.la libTime.la \
    1015         libConfiguration.la -lQtWebKit -lQtXml
     1034        libConfiguration.la -lQtXml
    10161035
    10171036temperature_SOURCES = src/temperature.cc src/LocalControl.h
    … …  
    10251044pwrctrl_LDADD = libDim++.la libDim.la libDimExtension.la \
    10261045        libStateMachine.la libTools.la libTime.la \
    1027         libConfiguration.la -lQtWebKit -lQtXml
     1046        libConfiguration.la -lQtXml
    10281047
    10291048timecheck_SOURCES = src/timecheck.cc src/LocalControl.h
    … …  
    10411060        src/DataProcessorImp.h src/DataCalib.cc src/DataCalib.h \
    10421061        src/DataWriteRaw.cc src/DataWriteRaw.h src/DrsCalib.h \
    1043         $(am__append_11)
     1062        $(am__append_9)
    10441063fadctrl_LDADD = libDim++.la libDim.la  libDimExtension.la \
    10451064        libStateMachine.la libTools.la libTime.la \
    … …  
    10501069       libStateMachine.la libTools.la libTime.la \
    10511070       libConfiguration.la
     1071
     1072gcn_SOURCES = src/gcn.cc src/LocalControl.h
     1073gcn_LDADD = libDim++.la libDim.la  libDimExtension.la \
     1074       libStateMachine.la libTools.la libTime.la \
     1075       libConfiguration.la -lQtXml
    10521076
    10531077biasctrl_SOURCES = src/biasctrl.cc src/LocalControl.h src/PixelMap.cc
    … …  
    11051129test_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
    11061130datalogger_SOURCES = src/datalogger.cc src/LocalControl.h \
    1107         src/DimState.cc src/DimState.h $(am__append_12)
     1131        src/DimState.cc src/DimState.h $(am__append_10)
    11081132datalogger_LDADD = libDim++.la libDim.la libDimExtension.la \
    11091133        libStateMachine.la libTools.la libTime.la \
    … …  
    11901214
    11911215#-------------------------------------------------------------------------
    1192 MAN_TARGETS = $(dist_man1_MANS) $(am__append_13) $(am__append_16)
     1216MAN_TARGETS = $(dist_man1_MANS) $(am__append_11) $(am__append_14)
    11931217@HAS_JSDOC_TRUE@JAVA_SCRIPT_DOC = jsdoc
    11941218all: $(BUILT_SOURCES)
    … …  
    16141638        @rm -f ftmctrl$(EXEEXT)
    16151639        $(AM_V_CXXLD)$(CXXLINK) $(ftmctrl_OBJECTS) $(ftmctrl_LDADD) $(LIBS)
     1640src/gcn.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
     1641gcn$(EXEEXT): $(gcn_OBJECTS) $(gcn_DEPENDENCIES) $(EXTRA_gcn_DEPENDENCIES)
     1642        @rm -f gcn$(EXEEXT)
     1643        $(AM_V_CXXLD)$(CXXLINK) $(gcn_OBJECTS) $(gcn_LDADD) $(LIBS)
    16161644src/lidctrl.$(OBJEXT): src/$(am__dirstamp) \
    16171645        src/$(DEPDIR)/$(am__dirstamp)
    … …  
    19451973        -rm -f src/ftm.$(OBJEXT)
    19461974        -rm -f src/ftmctrl.$(OBJEXT)
     1975        -rm -f src/gcn.$(OBJEXT)
    19471976        -rm -f src/lidctrl.$(OBJEXT)
    19481977        -rm -f src/log.$(OBJEXT)
    … …  
    20932122@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ftm.Po@am__quote@
    20942123@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ftmctrl.Po@am__quote@
     2124@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/gcn.Po@am__quote@
    20952125@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/lidctrl.Po@am__quote@
    20962126@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/log.Po@am__quote@

  • trunk/FACT++/configure

    r15492 r16957  
    628628HAS_DBUS_FALSE
    629629HAS_DBUS_TRUE
    630 HAS_SOPRANO_FALSE
    631 HAS_SOPRANO_TRUE
    632630HAS_NOVA_FALSE
    633631HAS_NOVA_TRUE
    … …  
    982980with_qwt_include
    983981with_qwt_libdir
    984 with_soprano
    985 with_soprano_include
    986 with_soprano_libdir
    987982with_root
    988983with_rootsys
    … …  
    17571752  --with-qwt-libdir=DIR        specify exact library dir for qwt library (e.g. libqwt-qt4)
    17581753  --without-qwt        disables qwt usage completely
    1759   --with-soprano=DIR    root directory of soprano installation
    1760   --with-soprano-include=DIR        specify exact include dir for soprano headers (e.g. Soprano/Soprano)
    1761   --with-soprano-libdir=DIR        specify exact library dir for soprano library (e.g. libsoprano)
    1762   --without-soprano        disables soprano usage completely
    17631754  --without-root          Disable root, i.e. disable gui support.
    17641755  --with-rootsys          path to the ROOT executables or top ROOT
    … …  
    49334924# gl
    49344925# QtCore
    4935 # soprano
    49364926# cfitsio
    49374927
    … …  
    2398023970
    2398123971                cat > conftest.$ac_ext <<EOF
    23982 #line 23982 "configure"
     23972#line 23972 "configure"
    2398323973#include "confdefs.h"
    2398423974#include <qglobal.h>
    … …  
    2441624406
    2441724407
    24418 
    24419 
    24420 # Check whether --with-soprano was given.
    24421 if test "${with_soprano+set}" = set; then :
    24422   withval=$with_soprano; with_soprano=$withval
    24423 if test "${with_soprano}" != yes; then
    24424         soprano_include="$withval/include"
    24425         soprano_libdir="$withval/lib"
    24426 fi
    24427 
    24428 fi
    24429 
    24430 
    24431 
    24432 # Check whether --with-soprano-include was given.
    24433 if test "${with_soprano_include+set}" = set; then :
    24434   withval=$with_soprano_include; soprano_include="$withval"
    24435 fi
    24436 
    24437 
    24438 
    24439 # Check whether --with-soprano-libdir was given.
    24440 if test "${with_soprano_libdir+set}" = set; then :
    24441   withval=$with_soprano_libdir; soprano_libdir="$withval"
    24442 fi
    24443 
    24444 
    24445 if test "${with_soprano}" != no ; then
    24446         OLD_LIBS=$LIBS
    24447         OLD_LDFLAGS=$LDFLAGS
    24448         OLD_CFLAGS=$CFLAGS
    24449         OLD_CPPFLAGS=$CPPFLAGS
    24450 
    24451         if test "${soprano_libdir}" ; then
    24452                 LDFLAGS="$LDFLAGS -L${soprano_libdir}"
    24453         fi
    24454         if test "${soprano_include}" ; then
    24455                 CPPFLAGS="$CPPFLAGS -I${soprano_include}"
    24456                 CFLAGS="$CFLAGS -I${soprano_include}"
    24457         fi
    24458 
    24459         no_good=no
    24460 
    24461         ac_fn_cxx_check_header_mongrel "$LINENO" "Soprano/Soprano" "ac_cv_header_Soprano_Soprano" "$ac_includes_default"
    24462 if test "x$ac_cv_header_Soprano_Soprano" = xyes; then :
    24463 
    24464 else
    24465   no_good=yes
    24466 fi
    24467 
    24468 
    24469 
    24470         ac_ext=cpp
    24471 ac_cpp='$CXXCPP $CPPFLAGS'
    24472 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    24473 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    24474 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    24475 
    24476 
    24477 
    24478 
    24479 
    24480 
    24481 
    24482    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Soprano::PluginManager::instance in -lsoprano" >&5
    24483 $as_echo_n "checking for Soprano::PluginManager::instance in -lsoprano... " >&6; }
    24484 if ${ac_cv_lib_soprano_Soprano__PluginManager__instance+:} false; then :
    24485   $as_echo_n "(cached) " >&6
    24486 else
    24487 
    24488         ac_check_lib_save_LIBS=$LIBS
    24489         LIBS="-lsoprano  $LIBS"
    24490         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    24491 /* end confdefs.h.  */
    24492 #include <Soprano/Soprano>
    24493 int
    24494 main ()
    24495 {
    24496 Soprano::PluginManager::instance
    24497   ;
    24498   return 0;
    24499 }
    24500 _ACEOF
    24501 if ac_fn_cxx_try_link "$LINENO"; then :
    24502   ac_cv_lib_soprano_Soprano__PluginManager__instance=yes
    24503 else
    24504   ac_cv_lib_soprano_Soprano__PluginManager__instance=no
    24505 fi
    24506 rm -f core conftest.err conftest.$ac_objext \
    24507     conftest$ac_exeext conftest.$ac_ext
    24508         LIBS=$ac_check_lib_save_LIBS
    24509 fi
    24510 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soprano_Soprano__PluginManager__instance" >&5
    24511 $as_echo "$ac_cv_lib_soprano_Soprano__PluginManager__instance" >&6; }
    24512         if test $ac_cv_lib_soprano_Soprano__PluginManager__instance = yes; then :
    24513 
    24514 
    24515                         cat >>confdefs.h <<_ACEOF
    24516 #define HAVE_LIBSOPRANO 1
    24517 _ACEOF
    24518 
    24519                         LIBS="-lsoprano $LIBS"
    24520 
    24521 
    24522 else
    24523   no_good=yes
    24524 fi
    24525 
    24526 
    24527 
    24528         ac_ext=cpp
    24529 ac_cpp='$CXXCPP $CPPFLAGS'
    24530 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    24531 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    24532 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    24533 
    24534 
    24535         if test "$no_good" = yes; then
    24536                 HAVE_SOPRANO=no
    24537 
    24538                 LIBS=$OLD_LIBS
    24539                 LDFLAGS=$OLD_LDFLAGS
    24540                 CPPFLAGS=$OLD_CPPFLAGS
    24541                 CFLAGS=$OLD_CFLAGS
    24542         else
    24543                 HAVE_SOPRANO=yes
    24544 
    24545                 $as_echo "#define HAVE_PKG_soprano 1" >>confdefs.h
    24546 
    24547         fi
    24548 
    24549 fi
    24550 
    24551 
    24552 
    2455324408######################################################################
    2455424409# ROOT SUPPORT
    … …  
    2522725082  HAS_NOVA_TRUE='#'
    2522825083  HAS_NOVA_FALSE=
    25229 fi
    25230 
    25231  if test "$HAVE_SOPRANO" = yes; then
    25232   HAS_SOPRANO_TRUE=
    25233   HAS_SOPRANO_FALSE='#'
    25234 else
    25235   HAS_SOPRANO_TRUE='#'
    25236   HAS_SOPRANO_FALSE=
    2523725084fi
    2523825085
    … …  
    2562825475if test -z "${HAS_NOVA_TRUE}" && test -z "${HAS_NOVA_FALSE}"; then
    2562925476  as_fn_error $? "conditional \"HAS_NOVA\" was never defined.
    25630 Usually this means the macro was only invoked conditionally." "$LINENO" 5
    25631 fi
    25632 if test -z "${HAS_SOPRANO_TRUE}" && test -z "${HAS_SOPRANO_FALSE}"; then
    25633   as_fn_error $? "conditional \"HAS_SOPRANO\" was never defined.
    2563425477Usually this means the macro was only invoked conditionally." "$LINENO" 5
    2563525478fi
    … …  
    2814227985{ $as_echo "$as_me:${as_lineno-$LINENO}:  Qwt                    / qwt_plot.h         found: $HAVE_QWT" >&5
    2814327986$as_echo "$as_me:  Qwt                    / qwt_plot.h         found: $HAVE_QWT" >&6;}
    28144 { $as_echo "$as_me:${as_lineno-$LINENO}:  Soprano                / Soprano/Soprano    found: $HAVE_SOPRANO" >&5
    28145 $as_echo "$as_me:  Soprano                / Soprano/Soprano    found: $HAVE_SOPRANO" >&6;}
    2814627987{ $as_echo "$as_me:${as_lineno-$LINENO}:  cfitsio                / 'fitsio.h'         found: $HAVE_CFITSIO" >&5
    2814727988$as_echo "$as_me:  cfitsio                / 'fitsio.h'         found: $HAVE_CFITSIO" >&6;}
    … …  
    2842728268$as_echo "$as_me: WARNING:  DBus libraries missing - skypeclient will not be compiled!" >&2;}
    2842828269fi
    28429 if test -z "$HAS_SOPRANO_TRUE"; then :
    28430   else
    28431   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Soprano libraries missing - tngweather will not be compiled!" >&5
    28432 $as_echo "$as_me: WARNING:  Soprano libraries missing - tngweather will not be compiled!" >&2;}
    28433 fi
    2843428270{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
    2843528271$as_echo "$as_me: " >&6;}

  • trunk/FACT++/configure.ac

    r15412 r16957  
    6969# gl
    7070# QtCore
    71 # soprano
    7271# cfitsio
    7372
    … …  
    305304AC_CHECK_CLASS(qwt, [QwtPlot qwt],   qwt-qt4,  qwt_plot.h,
    306305        HAVE_QWT=yes, HAVE_QWT=no)
    307 AC_CHECK_CLASS(soprano, Soprano::PluginManager::instance, soprano, Soprano/Soprano,
    308         HAVE_SOPRANO=yes, HAVE_SOPRANO=no)
    309306
    310307######################################################################
    … …  
    393390AM_CONDITIONAL(HAS_QWT,       [test "$HAVE_QWT" = yes])
    394391AM_CONDITIONAL(HAS_NOVA,      [test "$HAVE_NOVA" = yes])
    395 AM_CONDITIONAL(HAS_SOPRANO,   [test "$HAVE_SOPRANO" = yes])
    396392AM_CONDITIONAL(HAS_DBUS,      [test "$HAVE_DBUS" = yes])
    397393AM_CONDITIONAL(HAS_V8,        [test "$HAVE_V8" = yes])
    … …  
    476472AC_MSG_NOTICE([ QtOpenGL               / QtOpenGL/QGLWidget found: $HAVE_QGL])
    477473AC_MSG_NOTICE([ Qwt                    / qwt_plot.h         found: $HAVE_QWT])
    478 AC_MSG_NOTICE([ Soprano                / Soprano/Soprano    found: $HAVE_SOPRANO])
    479474AC_MSG_NOTICE([ cfitsio                / 'fitsio.h'         found: $HAVE_CFITSIO])
    480475AC_MSG_NOTICE([ CCfits                 / 'CCfits/CCfits'    found: $HAVE_CCFITS])
    … …  
    607602AM_COND_IF(HAS_V8,,      AC_MSG_WARN([ libv8 missing - JavaScript support will be disabled!]))
    608603AM_COND_IF(HAS_DBUS,,    AC_MSG_WARN([ DBus libraries missing - skypeclient will not be compiled!]))
    609 AM_COND_IF(HAS_SOPRANO,, AC_MSG_WARN([ Soprano libraries missing - tngweather will not be compiled!]))
    610 AC_MSG_NOTICE()
     604AC_MSG_NOTICE()
Note: See TracChangeset for help on using the changeset viewer.