Changeset 10432


Ignore:
Timestamp:
Apr 20, 2011, 5:21:21 PM (9 years ago)
Author:
tbretz
Message:
Added root support to the GUI.
File:
1 edited

Legend:

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

    r10412 r10432  
    88BOOST_FLAGS  = -DBOOST_DISABLE_ASSERTS
    99
    10 AM_CPPFLAGS = \
    11    -O3 -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
    12    -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS)
     10AM_CPPFLAGS = -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \
     11   -O3 -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2
    1312
    1413AM_CXXFLAGS = $(AM_CPPFLAGS) $(QT4_INCLUDES) \
     
    1615
    1716# -no-undefined
    18 AM_LDFLAGS = $(QT4_LIB) $(QT4_LDFLAGS) \
    19    -module -avoid-version
     17AM_LDFLAGS = -module -avoid-version
    2018
    2119#$(man3_MANS): doxygen-doc
     
    3432        log logtime time argv \
    3533        test3 dclient5 dserver2 \
    36         dataLogger
     34        dataLogger
     35#       ftmctrl ftm \
     36#       chatclient chatserv \
     37#       fitsgrep test \
    3738#       sched astro test ftm ftmctrl
    3839
     
    165166dserver2_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
    166167
    167 #ftm_SOURCES = src/ftm.cc
     168#ftm_SOURCES = src/ftm.cc src/HeadersFTM.cc
    168169#ftm_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
    169170
     
    185186    libConfiguration.la
    186187
    187 #ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.cc src/LocalControl.h
     188#ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFTM.cc
    188189#ftmctrl_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
    189190#    libConfiguration.la
     
    240241EXTRA_DIST += $(DIALOGS) $(RESOURCES)
    241242
    242 fact_LDADD = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la
     243fact_LDADD = $(ROOTLDFLAGS) $(QT4_LIB) $(QT4_LDFLAGS) \
     244        libDim.la libDim++.la libTools.la libTime.la libStateMachine.la
     245       
    243246fact_SOURCES = $(BUILT_SOURCES) $(QT_SOURCES) \
    244247        gui/fact.cc gui/FactGui.cc
Note: See TracChangeset for help on using the changeset viewer.