Changeset 11009 for trunk


Ignore:
Timestamp:
06/10/11 23:21:45 (13 years ago)
Author:
tbretz
Message:
Added new library where needed.
Location:
trunk/FACT++
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/Makefile.am

    r11008 r11009  
    214214
    215215ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.h src/HeadersFTM.cc
    216 ftmctrl_LDADD   = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
    217     libConfiguration.la
     216ftmctrl_LDADD   = libDim.la libDim++.la  libDimExtension.la \
     217        libTime.la libTools.la libStateMachine.la \
     218        libConfiguration.la
    218219
    219220drivectrl_SOURCES = src/drivectrl.cc src/LocalControl.h src/HeadersFTM.cc
    … …  
    222223
    223224fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.h src/HeadersFAD.cc \
    224     src/EventBuilder.c src/EventBuilder.h
    225 fadctrl_LDADD   = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
    226     libConfiguration.la
     225        src/EventBuilder.c src/EventBuilder.h
     226fadctrl_LDADD   = libDim.la libDim++.la  libDimExtension.la \
     227        libTime.la libTools.la libStateMachine.la \
     228        libConfiguration.la
    227229
    228230
    … …  
    232234
    233235dimctrl_SOURCES = src/dimctrl.cc src/RemoteControl.cc src/RemoteControl.h
    234 dimctrl_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
     236dimctrl_LDADD = libTools.la libStateMachine.la libTime.la \
     237        libDim.la libDim++.la libDimExtension.la libConfiguration.la
    235238
    236239
    … …  
    252255dataLogger_SOURCES += src/Fits.cc
    253256endif
    254 dataLogger_LDADD   = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
    255     libConfiguration.la
     257dataLogger_LDADD   = libDim.la libDim++.la libDimExtension.la \
     258        libTime.la libTools.la libStateMachine.la \
     259        libConfiguration.la
    256260
    257261scheduler_SOURCES = src/scheduler.cc src/LocalControl.h
    258 scheduler_LDADD   = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
     262scheduler_LDADD   = libStateMachine.la libTools.la libTime.la \
     263        libDim.la libDim++.la libDimExtension.la libConfiguration.la
    259264
    260265fitsloader_SOURCES = src/fitsloader.cc src/LocalControl.h
    … …  
    265270
    266271triggerschedule_SOURCES = src/triggerschedule.cc
    267 triggerschedule_LDADD   = libDim.la libDim++.la libConfiguration.la
     272triggerschedule_LDADD   = libDim.la libDim++.la libDimExtension.la libConfiguration.la
    268273
    269274#fitsgrep_SOURCES = src/fitsgrep.cc
    … …  
    291296
    292297fact_LDADD = $(ROOTLDFLAGS) $(ROOTGLIBS) $(QT4_LIB) $(QT4_LDFLAGS) -L. \
    293         libDim.la libDim++.la libTools.la libTime.la libTools.la libStateMachine.la \
     298        libDim.la libDim++.la libDimExtension.la \
     299        libTools.la libTime.la libTools.la libStateMachine.la \
    294300        libConfiguration.la
    295301

  • trunk/FACT++/Makefile.in

    r11007 r11009  
    180180am_dataLogger_OBJECTS = src/dataLogger.$(OBJEXT) $(am__objects_1)
    181181dataLogger_OBJECTS = $(am_dataLogger_OBJECTS)
    182 dataLogger_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \
    183         libStateMachine.la libConfiguration.la
     182dataLogger_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \
     183        libTime.la libTools.la libStateMachine.la libConfiguration.la
    184184am_dclient5_OBJECTS = src/dclient5.$(OBJEXT)
    185185dclient5_OBJECTS = $(am_dclient5_OBJECTS)
    … …  
    193193dimctrl_OBJECTS = $(am_dimctrl_OBJECTS)
    194194dimctrl_DEPENDENCIES = libTools.la libStateMachine.la libTime.la \
    195         libDim.la libDim++.la libConfiguration.la
     195        libDim.la libDim++.la libDimExtension.la libConfiguration.la
    196196am_dns_OBJECTS = src/dns.$(OBJEXT)
    197197dns_OBJECTS = $(am_dns_OBJECTS)
    … …  
    225225fact_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
    226226        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libDim.la \
    227         libDim++.la libTools.la libTime.la libTools.la \
    228         libStateMachine.la libConfiguration.la
     227        libDim++.la libDimExtension.la libTools.la libTime.la \
     228        libTools.la libStateMachine.la libConfiguration.la
    229229am_fad_OBJECTS = src/fad.$(OBJEXT) src/HeadersFAD.$(OBJEXT)
    230230fad_OBJECTS = $(am_fad_OBJECTS)
    … …  
    234234        src/EventBuilder.$(OBJEXT)
    235235fadctrl_OBJECTS = $(am_fadctrl_OBJECTS)
    236 fadctrl_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \
    237         libStateMachine.la libConfiguration.la
     236fadctrl_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \
     237        libTime.la libTools.la libStateMachine.la libConfiguration.la
    238238am_fitsdump_OBJECTS = src/fitsdump.$(OBJEXT)
    239239fitsdump_OBJECTS = $(am_fitsdump_OBJECTS)
    … …  
    252252am_ftmctrl_OBJECTS = src/ftmctrl.$(OBJEXT) src/HeadersFTM.$(OBJEXT)
    253253ftmctrl_OBJECTS = $(am_ftmctrl_OBJECTS)
    254 ftmctrl_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \
    255         libStateMachine.la libConfiguration.la
     254ftmctrl_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \
     255        libTime.la libTools.la libStateMachine.la libConfiguration.la
    256256am_log_OBJECTS = src/log.$(OBJEXT)
    257257log_OBJECTS = $(am_log_OBJECTS)
    … …  
    268268scheduler_OBJECTS = $(am_scheduler_OBJECTS)
    269269scheduler_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
    270         libDim.la libDim++.la libConfiguration.la
     270        libDim.la libDim++.la libDimExtension.la libConfiguration.la
    271271am_test_OBJECTS = src/test.$(OBJEXT)
    272272test_OBJECTS = $(am_test_OBJECTS)
    … …  
    279279triggerschedule_OBJECTS = $(am_triggerschedule_OBJECTS)
    280280triggerschedule_DEPENDENCIES = libDim.la libDim++.la \
    281         libConfiguration.la
     281        libDimExtension.la libConfiguration.la
    282282SCRIPTS = $(dist_noinst_SCRIPTS)
    283283DEFAULT_INCLUDES = -I.@am__isrc@
    … …  
    750750
    751751ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.h src/HeadersFTM.cc
    752 ftmctrl_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
    753     libConfiguration.la
     752ftmctrl_LDADD = libDim.la libDim++.la  libDimExtension.la \
     753        libTime.la libTools.la libStateMachine.la \
     754        libConfiguration.la
    754755
    755756drivectrl_SOURCES = src/drivectrl.cc src/LocalControl.h src/HeadersFTM.cc
    … …  
    758759
    759760fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.h src/HeadersFAD.cc \
    760     src/EventBuilder.c src/EventBuilder.h
    761 
    762 fadctrl_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
    763     libConfiguration.la
     761        src/EventBuilder.c src/EventBuilder.h
     762
     763fadctrl_LDADD = libDim.la libDim++.la  libDimExtension.la \
     764        libTime.la libTools.la libStateMachine.la \
     765        libConfiguration.la
    764766
    765767argv_SOURCES = src/argv.cc
    766768argv_LDADD = libConfiguration.la
    767769dimctrl_SOURCES = src/dimctrl.cc src/RemoteControl.cc src/RemoteControl.h
    768 dimctrl_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
     770dimctrl_LDADD = libTools.la libStateMachine.la libTime.la \
     771        libDim.la libDim++.la libDimExtension.la libConfiguration.la
     772
    769773chatclient_SOURCES = src/chatclient.cc src/ChatClient.h
    770774chatclient_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
    … …  
    778782dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.h \
    779783        $(am__append_3)
    780 dataLogger_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
    781     libConfiguration.la
     784dataLogger_LDADD = libDim.la libDim++.la libDimExtension.la \
     785        libTime.la libTools.la libStateMachine.la \
     786        libConfiguration.la
    782787
    783788scheduler_SOURCES = src/scheduler.cc src/LocalControl.h
    784 scheduler_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
     789scheduler_LDADD = libStateMachine.la libTools.la libTime.la \
     790        libDim.la libDim++.la libDimExtension.la libConfiguration.la
     791
    785792fitsloader_SOURCES = src/fitsloader.cc src/LocalControl.h
    786793fitsloader_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
    … …  
    788795fitsdump_LDADD = libConfiguration.la
    789796triggerschedule_SOURCES = src/triggerschedule.cc
    790 triggerschedule_LDADD = libDim.la libDim++.la libConfiguration.la
     797triggerschedule_LDADD = libDim.la libDim++.la libDimExtension.la libConfiguration.la
    791798
    792799#fitsgrep_SOURCES = src/fitsgrep.cc
    … …  
    806813BUILT_SOURCES = $(DIALOGS:.ui=.h) $(RESOURCES:.qrc=.cc) $(QT_SOURCES:.cc=.moc.cc)
    807814fact_LDADD = $(ROOTLDFLAGS) $(ROOTGLIBS) $(QT4_LIB) $(QT4_LDFLAGS) -L. \
    808         libDim.la libDim++.la libTools.la libTime.la libTools.la libStateMachine.la \
     815        libDim.la libDim++.la libDimExtension.la \
     816        libTools.la libTime.la libTools.la libStateMachine.la \
    809817        libConfiguration.la
    810818
Note: See TracChangeset for help on using the changeset viewer.