Changeset 11006 for trunk


Ignore:
Timestamp:
06/10/11 23:07:44 (13 years ago)
Author:
tbretz
Message:
Updated.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/Makefile.in

    r10871 r11006  
    134134        dim/src/dim_thr.lo dim/src/utilities.lo
    135135libDim_la_OBJECTS = $(am_libDim_la_OBJECTS)
     136libDimExtension_la_LIBADD =
     137am_libDimExtension_la_OBJECTS = src/DimSetup.lo
     138libDimExtension_la_OBJECTS = $(am_libDimExtension_la_OBJECTS)
    136139libStateMachine_la_LIBADD =
    137140am_libStateMachine_la_OBJECTS = src/WindowLog.lo src/Readline.lo \
    … …  
    191194dimctrl_DEPENDENCIES = libTools.la libStateMachine.la libTime.la \
    192195        libDim.la libDim++.la libConfiguration.la
    193 am_dns_OBJECTS = dim/src/dns.$(OBJEXT)
     196am_dns_OBJECTS = src/dns.$(OBJEXT)
    194197dns_OBJECTS = $(am_dns_OBJECTS)
    195 dns_DEPENDENCIES = libDim.la
     198dns_DEPENDENCIES = libDim.la libDimExtension.la
    196199am_drivectrl_OBJECTS = src/drivectrl.$(OBJEXT) \
    197200        src/HeadersFTM.$(OBJEXT)
    … …  
    321324am__v_GEN_0 = @echo "  GEN   " $@;
    322325SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
    323         $(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \
    324         $(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \
    325         astro.c $(chatclient_SOURCES) $(chatserv_SOURCES) \
     326        $(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
     327        $(libStateMachine_la_SOURCES) $(libTime_la_SOURCES) \
     328        $(libTools_la_SOURCES) $(argv_SOURCES) astro.c \
     329        $(chatclient_SOURCES) $(chatserv_SOURCES) \
    326330        $(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
    327331        $(dimctrl_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \
    … …  
    332336        $(test_SOURCES) $(time_SOURCES) $(triggerschedule_SOURCES)
    333337DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
    334         $(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \
    335         $(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \
    336         astro.c $(chatclient_SOURCES) $(chatserv_SOURCES) \
     338        $(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
     339        $(libStateMachine_la_SOURCES) $(libTime_la_SOURCES) \
     340        $(libTools_la_SOURCES) $(argv_SOURCES) astro.c \
     341        $(chatclient_SOURCES) $(chatserv_SOURCES) \
    337342        $(am__dataLogger_SOURCES_DIST) $(dclient5_SOURCES) \
    338343        $(did_SOURCES) $(dimctrl_SOURCES) $(dns_SOURCES) \
    … …  
    612617@HAS_GUI_TRUE@QT4_EXECUTABLES = fact
    613618lib_LTLIBRARIES = \
    614         libDim.la libDim++.la libTime.la libTools.la \
     619        libDim.la libDim++.la libDimExtension.la libTime.la libTools.la \
    615620        libConfiguration.la libStateMachine.la
    616621
    … …  
    629634        dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
    630635        $(DIALOGS) $(RESOURCES) $(am__append_5) $(am__append_8)
    631 dns_LDADD = libDim.la
    632 dns_SOURCES = dim/src/dns.c
     636dns_LDADD = libDim.la libDimExtension.la
     637dns_SOURCES = src/dns.c
    633638#dns_CPPFLAGS = $(AM_CPPFLAGS) $(DIM_FLAGS)
    634639did_LDADD = libDim.la
    … …  
    665670        dim/src/utilities.c
    666671
     672libDimExtension_la_SOURCES = src/DimSetup.cc src/DimSetup.h
    667673
    668674#libDimCpp_la_CXXFLAGS = $(AM_CXXFLAGS) $(DIM_FLAGS)
    … …  
    736742log_SOURCES = src/log.cc
    737743log_LDADD = libTime.la libDim.la libDim++.la libTools.la libStateMachine.la
     744logtime_SOURCES = src/logtime.cc
    738745logtime_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la
    739 logtime_SOURCES = src/logtime.cc
     746chatserv_SOURCES = src/chatserv.cc src/LocalControl.h
    740747chatserv_LDADD = libTools.la libStateMachine.la libConfiguration.la libTime.la libDim.la libDim++.la
    741 chatserv_SOURCES = src/chatserv.cc src/LocalControl.h
    742748dclient5_SOURCES = src/dclient5.cc src/LocalControl.h
    743749dclient5_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
    … …  
    942948libDim.la: $(libDim_la_OBJECTS) $(libDim_la_DEPENDENCIES)
    943949        $(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libDim_la_OBJECTS) $(libDim_la_LIBADD) $(LIBS)
     950src/DimSetup.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
     951libDimExtension.la: $(libDimExtension_la_OBJECTS) $(libDimExtension_la_DEPENDENCIES)
     952        $(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libDimExtension_la_OBJECTS) $(libDimExtension_la_LIBADD) $(LIBS)
    944953src/WindowLog.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    945954src/Readline.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    … …  
    10881097        @rm -f dimctrl$(EXEEXT)
    10891098        $(AM_V_CXXLD)$(CXXLINK) $(dimctrl_OBJECTS) $(dimctrl_LDADD) $(LIBS)
    1090 dim/src/dns.$(OBJEXT): dim/src/$(am__dirstamp) \
    1091         dim/src/$(DEPDIR)/$(am__dirstamp)
     1099src/dns.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    10921100dns$(EXEEXT): $(dns_OBJECTS) $(dns_DEPENDENCIES)
    10931101        @rm -f dns$(EXEEXT)
    … …  
    12211229        -rm -f dim/src/dna.$(OBJEXT)
    12221230        -rm -f dim/src/dna.lo
    1223         -rm -f dim/src/dns.$(OBJEXT)
    12241231        -rm -f dim/src/dtq.$(OBJEXT)
    12251232        -rm -f dim/src/dtq.lo
    … …  
    12691276        -rm -f src/DimServiceInfoList.$(OBJEXT)
    12701277        -rm -f src/DimServiceInfoList.lo
     1278        -rm -f src/DimSetup.$(OBJEXT)
     1279        -rm -f src/DimSetup.lo
    12711280        -rm -f src/Event.$(OBJEXT)
    12721281        -rm -f src/Event.lo
    … …  
    13121321        -rm -f src/dclient5.$(OBJEXT)
    13131322        -rm -f src/dimctrl.$(OBJEXT)
     1323        -rm -f src/dns.$(OBJEXT)
    13141324        -rm -f src/drivectrl.$(OBJEXT)
    13151325        -rm -f src/dserver2.$(OBJEXT)
    … …  
    13451355@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/dll.Plo@am__quote@
    13461356@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/dna.Plo@am__quote@
    1347 @AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/dns.Po@am__quote@
    13481357@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/dtq.Plo@am__quote@
    13491358@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/hash.Plo@am__quote@
    … …  
    13761385@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimServerList.Plo@am__quote@
    13771386@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimServiceInfoList.Plo@am__quote@
     1387@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimSetup.Plo@am__quote@
    13781388@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Event.Plo@am__quote@
    13791389@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/EventBuilder.Po@am__quote@
    … …  
    14031413@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dclient5.Po@am__quote@
    14041414@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dimctrl.Po@am__quote@
     1415@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dns.Po@am__quote@
    14051416@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/drivectrl.Po@am__quote@
    14061417@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dserver2.Po@am__quote@
Note: See TracChangeset for help on using the changeset viewer.