Changeset 10516


Ignore:
Timestamp:
05/02/11 19:10:17 (14 years ago)
Author:
tbretz
Message:
Updated.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/Makefile.in

    r10459 r10516  
    6060@IS_FALSE@      sched astro
    6161
    62 @HAS_GROFF_TRUE@am__append_3 = $(dist_man1_MANS:.man=.html)
    63 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_4 = $(dist_man1_MANS:.man=.pdf)
    64 @HAS_HELP2MAN_TRUE@am__append_5 = $(dist_man1_MANS)
     62@HAS_HELP2MAN_TRUE@am__append_3 = $(dist_man1_MANS)
     63@HAS_GROFF_TRUE@am__append_4 = $(dist_man1_MANS:.man=.html)
     64@HAS_GROFF_TRUE@am__append_5 = $(dist_man1_MANS:.man=.html)
     65@HAS_GROFF_TRUE@am__append_6 = $(dist_man1_MANS:.man=.html)
     66@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_7 = $(dist_man1_MANS:.man=.pdf)
     67@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_8 = $(dist_man1_MANS:.man=.pdf)
     68@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_9 = $(dist_man1_MANS:.man=.pdf)
    6569subdir = .
    6670ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    158162astro_OBJECTS = astro.$(OBJEXT)
    159163astro_LDADD = $(LDADD)
    160 chatclient_SOURCES = chatclient.c
    161 chatclient_OBJECTS = chatclient.$(OBJEXT)
    162 chatclient_LDADD = $(LDADD)
    163 chatserv_SOURCES = chatserv.c
    164 chatserv_OBJECTS = chatserv.$(OBJEXT)
    165 chatserv_LDADD = $(LDADD)
     164am_chatclient_OBJECTS = src/chatclient.$(OBJEXT) \
     165        src/ChatClient.$(OBJEXT)
     166chatclient_OBJECTS = $(am_chatclient_OBJECTS)
     167chatclient_DEPENDENCIES = libTools.la libStateMachine.la libTime.la \
     168        libDim.la libDim++.la libConfiguration.la
     169am_chatserv_OBJECTS = src/chatserv.$(OBJEXT) \
     170        src/LocalControl.$(OBJEXT)
     171chatserv_OBJECTS = $(am_chatserv_OBJECTS)
     172chatserv_DEPENDENCIES = libTools.la libStateMachine.la \
     173        libConfiguration.la libTime.la libDim.la libDim++.la
    166174am_dataLogger_OBJECTS = src/dataLogger.$(OBJEXT) \
    167175        src/LocalControl.$(OBJEXT) src/Fits.$(OBJEXT)
    168176dataLogger_OBJECTS = $(am_dataLogger_OBJECTS)
    169 dataLogger_DEPENDENCIES = libDim.la libDim++.la libTools.la libTime.la \
     177dataLogger_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \
    170178        libStateMachine.la libConfiguration.la
    171179am_dclient5_OBJECTS = src/dclient5.$(OBJEXT) \
    172180        src/LocalControl.$(OBJEXT)
    173181dclient5_OBJECTS = $(am_dclient5_OBJECTS)
    174 dclient5_DEPENDENCIES = libDim.la libDim++.la libTools.la libTime.la \
     182dclient5_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \
    175183        libStateMachine.la libConfiguration.la
    176184am_did_OBJECTS = dim/src/did/did-did.$(OBJEXT) \
    … …  
    207215fact_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
    208216        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libDim.la \
    209         libDim++.la libTools.la libTime.la libStateMachine.la
     217        libDim++.la libTools.la libTime.la libTools.la \
     218        libStateMachine.la libConfiguration.la
    210219fitsgrep_SOURCES = fitsgrep.c
    211220fitsgrep_OBJECTS = fitsgrep.$(OBJEXT)
    … …  
    218227        src/HeadersFTM.$(OBJEXT)
    219228ftmctrl_OBJECTS = $(am_ftmctrl_OBJECTS)
    220 ftmctrl_DEPENDENCIES = libDim.la libDim++.la libTools.la libTime.la \
     229ftmctrl_DEPENDENCIES = libDim.la libDim++.la libTime.la libTools.la \
    221230        libStateMachine.la libConfiguration.la
    222231am_log_OBJECTS = src/log.$(OBJEXT)
    223232log_OBJECTS = $(am_log_OBJECTS)
    224 log_DEPENDENCIES = libTime.la libTools.la libDim.la libDim++.la \
     233log_DEPENDENCIES = libTime.la libDim.la libDim++.la libTools.la \
    225234        libStateMachine.la
    226235am_logtime_OBJECTS = src/logtime.$(OBJEXT)
    227236logtime_OBJECTS = $(am_logtime_OBJECTS)
    228 logtime_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
     237logtime_DEPENDENCIES = libTools.la libStateMachine.la libTime.la \
    229238        libDim.la libDim++.la
    230239sched_SOURCES = sched.c
    … …  
    233242am_test_OBJECTS = src/test.$(OBJEXT)
    234243test_OBJECTS = $(am_test_OBJECTS)
    235 test_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
     244test_DEPENDENCIES = libTools.la libStateMachine.la libTime.la \
    236245        libDim.la libDim++.la libConfiguration.la
    237246am_test3_OBJECTS = src/test3.$(OBJEXT) src/RemoteControl.$(OBJEXT)
    238247test3_OBJECTS = $(am_test3_OBJECTS)
    239 test3_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
     248test3_DEPENDENCIES = libTools.la libStateMachine.la libTime.la \
    240249        libDim.la libDim++.la libConfiguration.la
    241250am_time_OBJECTS = src/time.$(OBJEXT)
    … …  
    288297        $(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \
    289298        $(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \
    290         astro.c chatclient.c chatserv.c $(dataLogger_SOURCES) \
    291         $(dclient5_SOURCES) $(did_SOURCES) $(dns_SOURCES) \
    292         $(dserver2_SOURCES) $(fact_SOURCES) fitsgrep.c $(ftm_SOURCES) \
    293         $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) sched.c \
    294         $(test_SOURCES) $(test3_SOURCES) $(time_SOURCES)
     299        astro.c $(chatclient_SOURCES) $(chatserv_SOURCES) \
     300        $(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
     301        $(dns_SOURCES) $(dserver2_SOURCES) $(fact_SOURCES) fitsgrep.c \
     302        $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
     303        $(logtime_SOURCES) sched.c $(test_SOURCES) $(test3_SOURCES) \
     304        $(time_SOURCES)
    295305DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
    296306        $(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \
    297307        $(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \
    298         astro.c chatclient.c chatserv.c $(dataLogger_SOURCES) \
    299         $(dclient5_SOURCES) $(did_SOURCES) $(dns_SOURCES) \
    300         $(dserver2_SOURCES) $(am__fact_SOURCES_DIST) fitsgrep.c \
    301         $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
     308        astro.c $(chatclient_SOURCES) $(chatserv_SOURCES) \
     309        $(dataLogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
     310        $(dns_SOURCES) $(dserver2_SOURCES) $(am__fact_SOURCES_DIST) \
     311        fitsgrep.c $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
    302312        $(logtime_SOURCES) sched.c $(test_SOURCES) $(test3_SOURCES) \
    303313        $(time_SOURCES)
    … …  
    574584
    575585#                 libAstro.la
    576 dist_man1_MANS = test3.man
    577586
    578587#-------------------------------------------------------------------------
     588CLEANFILES = $(BUILT_SOURCES) $(am__append_6) $(am__append_9)
    579589dist_noinst_SCRIPTS = autogen.sh
    580590EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \
    … …  
    583593        dim/README_v14.txt dim/README_v17.txt dim/README_v16.txt \
    584594        dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
    585         $(dist_man1_MANS:.man=.html) $(dist_man1_MANS:.man=.pdf) \
    586         $(DIALOGS) $(RESOURCES)
    587 CLEANFILES = $(dist_man1_MANS:.man=.pdf) $(dist_man1_MANS:.man=.html) \
    588         $(BUILT_SOURCES)
     595        $(DIALOGS) $(RESOURCES) $(am__append_5) $(am__append_8)
    589596dns_LDADD = libDim.la
    590597dns_SOURCES = dim/src/dns.c
    … …  
    684691ftm_LDADD = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
    685692log_SOURCES = src/log.cc
    686 log_LDADD = libTime.la libTools.la libDim.la libDim++.la libStateMachine.la
    687 logtime_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la
     693log_LDADD = libTime.la libDim.la libDim++.la libTools.la libStateMachine.la
     694logtime_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la
    688695logtime_SOURCES = src/logtime.cc
    689 
    690 #chatserv_LDADD = libStateMachine.la libConfiguration.la libTools.la libTime.la libDim.la libDim++.la
    691 #chatserv_SOURCES = src/chatserv.cc src/LocalControl.cc src/LocalControl.h
     696chatserv_LDADD = libTools.la libStateMachine.la libConfiguration.la libTime.la libDim.la libDim++.la
     697chatserv_SOURCES = src/chatserv.cc src/LocalControl.cc src/LocalControl.h
    692698dclient5_SOURCES = src/dclient5.cc src/LocalControl.cc src/LocalControl.h
    693 dclient5_LDADD = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
     699dclient5_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
    694700    libConfiguration.la
    695701
    696702ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFTM.cc
    697 ftmctrl_LDADD = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
     703ftmctrl_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
    698704    libConfiguration.la
    699705
    … …  
    701707argv_LDADD = libConfiguration.la
    702708test3_SOURCES = src/test3.cc src/RemoteControl.cc src/RemoteControl.h
    703 test3_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
    704 
    705 #chatclient_SOURCES = src/chatclient.cc src/ChatClient.cc src/ChatClient.h
    706 #chatclient_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
     709test3_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
     710chatclient_SOURCES = src/chatclient.cc src/ChatClient.cc src/ChatClient.h
     711chatclient_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
    707712time_SOURCES = src/time.cc
    708713time_LDADD = libTime.la
    … …  
    711716#astro_LDADD = libAstro.la libTime.la
    712717test_SOURCES = src/test.cc
    713 test_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
     718test_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
    714719dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc src/LocalControl.h src/Fits.cc
    715 dataLogger_LDADD = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
     720dataLogger_LDADD = libDim.la libDim++.la libTime.la libTools.la libStateMachine.la \
    716721    libConfiguration.la
    717722
    … …  
    735740BUILT_SOURCES = $(DIALOGS:.ui=.h) $(RESOURCES:.qrc=.cc) $(QT_SOURCES:.cc=.moc.cc)
    736741fact_LDADD = $(ROOTLDFLAGS) $(ROOTGLIBS) $(QT4_LIB) $(QT4_LDFLAGS) -L. \
    737         libDim.la libDim++.la libTools.la libTime.la libStateMachine.la
     742        libDim.la libDim++.la libTools.la libTime.la libTools.la libStateMachine.la \
     743        libConfiguration.la
    738744
    739745fact_SOURCES = $(BUILT_SOURCES) $(QT_SOURCES) \
    … …  
    745751
    746752#-------------------------------------------------------------------------
    747 MAN_TARGETS = $(am__append_3) $(am__append_4) $(am__append_5)
     753MAN_TARGETS = $(am__append_3) $(am__append_4) $(am__append_7)
     754@HAS_HELP2MAN_TRUE@dist_man1_MANS = test3.man
    748755all: $(BUILT_SOURCES)
    749756        $(MAKE) $(AM_MAKEFLAGS) all-am
    … …  
    977984        @rm -f astro$(EXEEXT)
    978985        $(AM_V_CCLD)$(LINK) $(astro_OBJECTS) $(astro_LDADD) $(LIBS)
     986src/chatclient.$(OBJEXT): src/$(am__dirstamp) \
     987        src/$(DEPDIR)/$(am__dirstamp)
     988src/ChatClient.$(OBJEXT): src/$(am__dirstamp) \
     989        src/$(DEPDIR)/$(am__dirstamp)
    979990chatclient$(EXEEXT): $(chatclient_OBJECTS) $(chatclient_DEPENDENCIES)
    980991        @rm -f chatclient$(EXEEXT)
    981         $(AM_V_CCLD)$(LINK) $(chatclient_OBJECTS) $(chatclient_LDADD) $(LIBS)
     992        $(AM_V_CXXLD)$(CXXLINK) $(chatclient_OBJECTS) $(chatclient_LDADD) $(LIBS)
     993src/chatserv.$(OBJEXT): src/$(am__dirstamp) \
     994        src/$(DEPDIR)/$(am__dirstamp)
     995src/LocalControl.$(OBJEXT): src/$(am__dirstamp) \
     996        src/$(DEPDIR)/$(am__dirstamp)
    982997chatserv$(EXEEXT): $(chatserv_OBJECTS) $(chatserv_DEPENDENCIES)
    983998        @rm -f chatserv$(EXEEXT)
    984         $(AM_V_CCLD)$(LINK) $(chatserv_OBJECTS) $(chatserv_LDADD) $(LIBS)
     999        $(AM_V_CXXLD)$(CXXLINK) $(chatserv_OBJECTS) $(chatserv_LDADD) $(LIBS)
    9851000src/dataLogger.$(OBJEXT): src/$(am__dirstamp) \
    986         src/$(DEPDIR)/$(am__dirstamp)
    987 src/LocalControl.$(OBJEXT): src/$(am__dirstamp) \
    9881001        src/$(DEPDIR)/$(am__dirstamp)
    9891002src/Fits.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    … …  
    11421155        -rm -f gui/design.$(OBJEXT)
    11431156        -rm -f gui/fact.$(OBJEXT)
     1157        -rm -f src/ChatClient.$(OBJEXT)
    11441158        -rm -f src/Configuration.$(OBJEXT)
    11451159        -rm -f src/Configuration.lo
    … …  
    11971211        -rm -f src/WindowLog.lo
    11981212        -rm -f src/argv.$(OBJEXT)
     1213        -rm -f src/chatclient.$(OBJEXT)
     1214        -rm -f src/chatserv.$(OBJEXT)
    11991215        -rm -f src/dataLogger.$(OBJEXT)
    12001216        -rm -f src/dclient5.$(OBJEXT)
    … …  
    12141230
    12151231@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/astro.Po@am__quote@
    1216 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chatclient.Po@am__quote@
    1217 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chatserv.Po@am__quote@
    12181232@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fitsgrep.Po@am__quote@
    12191233@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sched.Po@am__quote@
    … …  
    12501264@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/design.Po@am__quote@
    12511265@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/fact.Po@am__quote@
     1266@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ChatClient.Po@am__quote@
    12521267@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Configuration.Plo@am__quote@
    12531268@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Connection.Plo@am__quote@
    … …  
    12801295@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/WindowLog.Plo@am__quote@
    12811296@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/argv.Po@am__quote@
     1297@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatclient.Po@am__quote@
     1298@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatserv.Po@am__quote@
    12821299@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dataLogger.Po@am__quote@
    12831300@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dclient5.Po@am__quote@
    … …  
    19001917        $(AM_V_GEN)$(RCC4) -name `echo "$<" | sed 's|^.*/\(.*\)\.qrc$$|\1|'` $< -o $@
    19011918
    1902 @HAS_GROFF_TRUE@.man.html: $<
    1903 @HAS_GROFF_TRUE@        $(AM_V_GEN)groff -mandoc `man -w -l $<` -T html > $@
    1904 
    1905 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@.man.pdf: $<
    1906 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@       $(AM_V_GEN)groff -mandoc `man -w -l $<` | ps2pdf - $@
    1907 
    19081919@HAS_HELP2MAN_TRUE@$(dist_man1_MANS): $(dist_man1_MANS:.man=)
    19091920@HAS_HELP2MAN_TRUE@     @mkdir -p man
    19101921@HAS_HELP2MAN_TRUE@     $(AM_V_GEN)help2man -N -o $@ -m $(@:.man=) $(@:.man=)
     1922
     1923@HAS_GROFF_TRUE@.man.html: $<
     1924@HAS_GROFF_TRUE@        $(AM_V_GEN)groff -mandoc `man -w -l $<` -T html > $@
     1925
     1926@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@.man.pdf: $<
     1927@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@       $(AM_V_GEN)groff -mandoc `man -w -l $<` | ps2pdf - $@
    19111928
    19121929man: $(MAN_TARGETS) doxygen-doc
Note: See TracChangeset for help on using the changeset viewer.