Changeset 10457


Ignore:
Timestamp:
Apr 26, 2011, 11:32:38 AM (8 years ago)
Author:
tbretz
Message:
Found a way to add some targets without having them in 'all'; made compilation of did conditional.
File:
1 edited

Legend:

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

    r10447 r10457  
    2929
    3030bin_PROGRAMS = $(QT4_EXECUTABLES) \
    31         dns did \
     31        dns \
    3232        log logtime time argv \
    3333        test3 dclient5 dserver2 \
    3434        dataLogger
    35 #       ftmctrl ftm \
    36 #       chatclient chatserv \
    37 #       fitsgrep test
    38 #       sched astro
     35
     36
     37if HAS_LIBXP
     38bin_PROGRAMS+= did
     39endif
     40
     41# This is a trick to be able to build them but not having them in 'all'
     42if IS_FALSE     
     43bin_PROGRAMS+= \
     44        test \
     45        ftmctrl ftm \
     46        chatclient chatserv \
     47        fitsgrep test \
     48        sched astro
     49endif
     50
    3951
    4052lib_LTLIBRARIES = libDim.la libDim++.la libTime.la libTools.la \
     
    166178dserver2_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
    167179
    168 #ftm_SOURCES = src/ftm.cc src/HeadersFTM.cc
    169 #ftm_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
     180ftm_SOURCES = src/ftm.cc src/HeadersFTM.cc
     181ftm_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
    170182
    171183
     
    186198    libConfiguration.la
    187199
    188 #ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFTM.cc
    189 #ftmctrl_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
    190 #    libConfiguration.la
     200ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFTM.cc
     201ftmctrl_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
     202    libConfiguration.la
    191203
    192204
     
    209221#astro_LDADD = libAstro.la libTime.la
    210222
    211 #test_SOURCES = src/test.cc
    212 #test_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
     223test_SOURCES = src/test.cc
     224test_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
    213225
    214226dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc src/LocalControl.h src/Fits.cc
Note: See TracChangeset for help on using the changeset viewer.