Changeset 12830 for trunk/FACT++


Ignore:
Timestamp:
02/03/12 12:41:58 (13 years ago)
Author:
tbretz
Message:
Reordered libraries to make it link with gcc 4.6
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/Makefile.am

    r12756 r12830  
    6565
    6666lib_LTLIBRARIES = \
    67         libDim.la libDim++.la libDimExtension.la libTime.la libTools.la \
    68         libConfiguration.la libStateMachine.la
     67        libDim++.la libDim.la libDimExtension.la \
     68        libConfiguration.la libStateMachine.la libTime.la libTools.la
    6969#       libAstro.la
    7070
    … …  
    201201        src/DimWriteStatistics.h src/DimWriteStatistics.cc
    202202
    203 
    204203libConfiguration_la_SOURCES = \
    205204        src/Configuration.h src/Configuration.cc \
    … …  
    215214
    216215ftm_SOURCES = src/ftm.cc src/HeadersFTM.cc
    217 ftm_LDADD   = libTime.la libTools.la libDim.la libDim++.la libConfiguration.la libDimExtension.la
     216ftm_LDADD   = libTime.la libTools.la libDim++.la libDim.la libConfiguration.la libDimExtension.la
    218217
    219218fad_SOURCES = src/fad.cc src/HeadersFAD.cc
    220 fad_LDADD   = libTime.la libTools.la libTools.la libDim.la libDim++.la libConfiguration.la libDimExtension.la
     219fad_LDADD   = libTime.la libTools.la libTools.la libDim++.la libDim.la libConfiguration.la libDimExtension.la
    221220
    222221fsc_SOURCES = src/fsc.cc
    … …  
    225224
    226225log_SOURCES = src/log.cc
    227 log_LDADD   = libTime.la libDim.la libDim++.la libTools.la libStateMachine.la
     226log_LDADD   = libDim++.la libDim.la libStateMachine.la libTime.la libTools.la
    228227
    229228
    230229logtime_SOURCES = src/logtime.cc
    231 logtime_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la
     230logtime_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la
    232231
    233232
    234233chatserv_SOURCES = src/chatserv.cc src/LocalControl.h
    235 chatserv_LDADD = libTools.la libStateMachine.la libConfiguration.la libTime.la \
    236         libDim.la libDim++.la libDimExtension.la
     234chatserv_LDADD = libStateMachine.la libTools.la libConfiguration.la libTime.la \
     235        libDim++.la libDim.la libDimExtension.la
    237236
    238237
    239238dclient5_SOURCES = src/dclient5.cc src/LocalControl.h
    240 dclient5_LDADD   = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
     239dclient5_LDADD   = libDim++.la libDim.la libStateMachine.la libTime.la libTools.la \
    241240    libConfiguration.la
    242241
    243242ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.h src/HeadersFTM.cc
    244 ftmctrl_LDADD   = libDim.la libDim++.la libDimExtension.la \
    245         libTime.la libTools.la libStateMachine.la \
     243ftmctrl_LDADD   = libDim++.la libDim.la libDimExtension.la \
     244        libStateMachine.la libTime.la libTools.la \
    246245        libConfiguration.la
    247246
    248247drivectrl_SOURCES = src/drivectrl.cc src/LocalControl.h src/HeadersFTM.cc
    249 drivectrl_LDADD   = libDim.la libDim++.la libDimExtension.la \
    250         libTime.la libTools.la libStateMachine.la \
     248drivectrl_LDADD   = libDim++.la libDim.la libDimExtension.la \
     249        libStateMachine.la libTools.la libTime.la \
    251250        libConfiguration.la
    252251
    253252magicweather_SOURCES = src/magicweather.cc src/LocalControl.h
    254 magicweather_LDADD   = libDim.la libDim++.la libDimExtension.la \
    255         libTime.la libTools.la libStateMachine.la \
     253magicweather_LDADD   = libDim++.la libDim.la libDimExtension.la \
     254        libStateMachine.la libTools.la libTime.la \
    256255        libConfiguration.la
    257256
    … …  
    266265        src/DataWriteFits.cc    src/DataWriteFits.h
    267266endif
    268 fadctrl_LDADD   = libDim.la libDim++.la  libDimExtension.la \
    269         libTime.la libTools.la libStateMachine.la \
     267fadctrl_LDADD   = libDim++.la libDim.la  libDimExtension.la \
     268        libStateMachine.la libTools.la libTime.la \
    270269        libConfiguration.la
    271270
    272271fscctrl_SOURCES = src/fscctrl.cc src/LocalControl.h
    273 fscctrl_LDADD   = libDim.la libDim++.la  libDimExtension.la \
    274         libTime.la libTools.la libStateMachine.la \
     272fscctrl_LDADD   = libDim++.la libDim.la  libDimExtension.la \
     273        libStateMachine.la libTools.la libTime.la \
    275274        libConfiguration.la
    276275
    277276biasctrl_SOURCES = src/biasctrl.cc src/LocalControl.h src/PixelMap.cc
    278 biasctrl_LDADD   = libDim.la libDim++.la  libDimExtension.la \
    279         libTime.la libTools.la libStateMachine.la \
     277biasctrl_LDADD   = libDim++.la libDim.la  libDimExtension.la \
     278        libStateMachine.la libTools.la libTime.la \
    280279        libConfiguration.la
    281280
    282281mcp_SOURCES = src/mcp.cc src/LocalControl.h
    283 mcp_LDADD   = libDim.la libDim++.la  libDimExtension.la \
    284         libTime.la libTools.la libStateMachine.la \
     282mcp_LDADD   = libDim++.la libDim.la  libDimExtension.la \
     283        libStateMachine.la libTools.la libTime.la \
    285284        libConfiguration.la
    286285
    287286feedback_SOURCES = src/feedback.cc src/LocalControl.h src/PixelMap.cc
    288 feedback_LDADD   = libDim.la libDim++.la  libDimExtension.la \
    289         libTime.la libTools.la libStateMachine.la \
     287feedback_LDADD   = libDim++.la libDim.la  libDimExtension.la \
     288        libStateMachine.la libTools.la libTime.la \
    290289        libConfiguration.la
    291290
    292291ratescan_SOURCES = src/ratescan.cc src/LocalControl.h src/PixelMap.cc
    293 ratescan_LDADD   = libDim.la libDim++.la  libDimExtension.la \
    294         libTime.la libTools.la libStateMachine.la \
     292ratescan_LDADD   = libDim++.la libDim.la  libDimExtension.la \
     293        libStateMachine.la libTools.la libTime.la \
    295294        libConfiguration.la
    296295
    297296ratecontrol_SOURCES = src/ratecontrol.cc src/LocalControl.h src/PixelMap.cc
    298 ratecontrol_LDADD   = libDim.la libDim++.la  libDimExtension.la \
    299         libTime.la libTools.la libStateMachine.la \
     297ratecontrol_LDADD   = libDim++.la libDim.la  libDimExtension.la \
     298        libStateMachine.la libTools.la libTime.la \
    300299        libConfiguration.la
    301300
    … …  
    306305
    307306dimctrl_SOURCES = src/dimctrl.cc src/RemoteControl.cc src/RemoteControl.h
    308 dimctrl_LDADD = libTools.la libStateMachine.la libTime.la \
    309         libDim.la libDim++.la libDimExtension.la libConfiguration.la
     307dimctrl_LDADD = libStateMachine.la libTools.la libTime.la \
     308        libDim++.la libDim.la libDimExtension.la libConfiguration.la
    310309
    311310
    312311chatclient_SOURCES = src/chatclient.cc src/ChatClient.h
    313 chatclient_LDADD = libTools.la libStateMachine.la libTime.la \
    314         libDim.la libDim++.la libDimExtension.la libConfiguration.la
     312chatclient_LDADD = libStateMachine.la libTools.la libTime.la \
     313        libDim++.la libDim.la libDimExtension.la libConfiguration.la
    315314
    316315
    … …  
    322321
    323322test_SOURCES = src/test.cc
    324 test_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
     323test_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
    325324
    326325datalogger_SOURCES = src/datalogger.cc src/LocalControl.h
    … …  
    328327datalogger_SOURCES += src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
    329328endif
    330 datalogger_LDADD  = libDim.la libDim++.la libDimExtension.la \
    331         libTime.la libTools.la libStateMachine.la \
     329datalogger_LDADD  = libDim++.la libDim.la libDimExtension.la \
     330        libStateMachine.la libTools.la libTime.la \
    332331        libConfiguration.la
    333332
    334333scheduler_SOURCES = src/scheduler.cc src/LocalControl.h
    335334scheduler_LDADD   = libStateMachine.la libTools.la libTime.la \
    336         libDim.la libDim++.la libDimExtension.la libConfiguration.la
     335        libDim++.la libDim.la libDimExtension.la libConfiguration.la
    337336
    338337fitsloader_SOURCES = src/fitsloader.cc src/LocalControl.h
    339 fitsloader_LDADD   = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
     338fitsloader_LDADD   = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
    340339
    341340fitsdump_SOURCES = src/fitsdump.cc
    … …  
    343342
    344343readfits_SOURCES = src/readfits.cc src/ReadFits.h
    345 readfits_LDADD   = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
     344readfits_LDADD   = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
    346345
    347346triggerschedule_SOURCES = src/triggerschedule.cc
    348 triggerschedule_LDADD   = libDim.la libDim++.la libDimExtension.la libConfiguration.la
     347triggerschedule_LDADD   = libDim++.la libDim.la libDimExtension.la libConfiguration.la
    349348
    350349#fitsgrep_SOURCES = src/fitsgrep.cc
    … …  
    398397
    399398fact_LDADD = $(ROOTLDFLAGS) $(ROOTGLIBS) $(QT4_LIB) $(QT4_LDFLAGS) -L. \
    400         libDim.la libDim++.la libDimExtension.la \
    401         libTools.la libTime.la libTools.la libStateMachine.la \
     399        libDim++.la libDim.la libDimExtension.la \
     400        libTools.la libStateMachine.la libTime.la libTools.la \
    402401        libConfiguration.la
    403402
    … …  
    411410
    412411viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU \
    413         libDim.la libDim++.la libDimExtension.la \
    414         libConfiguration.la libTools.la libStateMachine.la \
    415         libTime.la
     412        libDimExtension.la \
     413        libConfiguration.la libStateMachine.la libTools.la \
     414        libTime.la libDim++.la libDim.la
    416415
    417416viewer_SOURCES = $(viewer_SRCADD) $(viewer_QT_SOURCES) \
Note: See TracChangeset for help on using the changeset viewer.