Changeset 11075
- Timestamp:
- 06/19/11 10:07:38 (13 years ago)
- Location:
- trunk/FACT++
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/Makefile.am
r11035 r11075 32 32 log logtime time argv \ 33 33 dimctrl dclient5 dserver2 \ 34 data Logger scheduler \34 datalogger scheduler \ 35 35 triggerschedule \ 36 36 ftmctrl ftm \ … … 61 61 if HAS_HELP2MAN 62 62 dist_man1_MANS = \ 63 dimctrl.man ftmctrl.man data Logger.man triggerschedule.man fitsdump.man63 dimctrl.man ftmctrl.man datalogger.man triggerschedule.man fitsdump.man 64 64 endif 65 65 … … 261 261 test_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la 262 262 263 data Logger_SOURCES = src/dataLogger.cc src/LocalControl.h263 datalogger_SOURCES = src/datalogger.cc src/LocalControl.h 264 264 if HAS_FITS 265 data Logger_SOURCES += src/Fits.cc266 endif 267 data Logger_LDADD= libDim.la libDim++.la libDimExtension.la \265 datalogger_SOURCES += src/Fits.cc 266 endif 267 datalogger_LDADD = libDim.la libDim++.la libDimExtension.la \ 268 268 libTime.la libTools.la libStateMachine.la \ 269 269 libConfiguration.la -
trunk/FACT++/Makefile.in
r11072 r11075 48 48 bin_PROGRAMS = $(am__EXEEXT_1) dns$(EXEEXT) log$(EXEEXT) \ 49 49 logtime$(EXEEXT) time$(EXEEXT) argv$(EXEEXT) dimctrl$(EXEEXT) \ 50 dclient5$(EXEEXT) dserver2$(EXEEXT) data Logger$(EXEEXT) \50 dclient5$(EXEEXT) dserver2$(EXEEXT) datalogger$(EXEEXT) \ 51 51 scheduler$(EXEEXT) triggerschedule$(EXEEXT) ftmctrl$(EXEEXT) \ 52 52 ftm$(EXEEXT) fadctrl$(EXEEXT) fad$(EXEEXT) fscctrl$(EXEEXT) \ … … 176 176 libConfiguration.la libTime.la libDim.la libDim++.la \ 177 177 libDimExtension.la 178 am__data Logger_SOURCES_DIST = src/dataLogger.cc src/LocalControl.h \178 am__datalogger_SOURCES_DIST = src/datalogger.cc src/LocalControl.h \ 179 179 src/Fits.cc 180 180 @HAS_FITS_TRUE@am__objects_1 = src/Fits.$(OBJEXT) 181 am_data Logger_OBJECTS = src/dataLogger.$(OBJEXT) $(am__objects_1)182 data Logger_OBJECTS = $(am_dataLogger_OBJECTS)183 data Logger_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \181 am_datalogger_OBJECTS = src/datalogger.$(OBJEXT) $(am__objects_1) 182 datalogger_OBJECTS = $(am_datalogger_OBJECTS) 183 datalogger_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \ 184 184 libTime.la libTools.la libStateMachine.la libConfiguration.la 185 185 am_dclient5_OBJECTS = src/dclient5.$(OBJEXT) … … 333 333 $(libTools_la_SOURCES) $(argv_SOURCES) astro.c \ 334 334 $(chatclient_SOURCES) $(chatserv_SOURCES) \ 335 $(data Logger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \335 $(datalogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \ 336 336 $(dimctrl_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \ 337 337 $(dserver2_SOURCES) $(fact_SOURCES) $(fad_SOURCES) \ … … 346 346 $(libTools_la_SOURCES) $(argv_SOURCES) astro.c \ 347 347 $(chatclient_SOURCES) $(chatserv_SOURCES) \ 348 $(am__data Logger_SOURCES_DIST) $(dclient5_SOURCES) \348 $(am__datalogger_SOURCES_DIST) $(dclient5_SOURCES) \ 349 349 $(did_SOURCES) $(dimctrl_SOURCES) $(dns_SOURCES) \ 350 350 $(drivectrl_SOURCES) $(dserver2_SOURCES) \ … … 629 629 # libAstro.la 630 630 @HAS_HELP2MAN_TRUE@dist_man1_MANS = \ 631 @HAS_HELP2MAN_TRUE@ dimctrl.man ftmctrl.man data Logger.man triggerschedule.man fitsdump.man631 @HAS_HELP2MAN_TRUE@ dimctrl.man ftmctrl.man datalogger.man triggerschedule.man fitsdump.man 632 632 633 633 … … 796 796 test_SOURCES = src/test.cc 797 797 test_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la 798 data Logger_SOURCES = src/dataLogger.cc src/LocalControl.h \798 datalogger_SOURCES = src/datalogger.cc src/LocalControl.h \ 799 799 $(am__append_3) 800 data Logger_LDADD = libDim.la libDim++.la libDimExtension.la \800 datalogger_LDADD = libDim.la libDim++.la libDimExtension.la \ 801 801 libTime.la libTools.la libStateMachine.la \ 802 802 libConfiguration.la … … 1088 1088 @rm -f chatserv$(EXEEXT) 1089 1089 $(AM_V_CXXLD)$(CXXLINK) $(chatserv_OBJECTS) $(chatserv_LDADD) $(LIBS) 1090 src/data Logger.$(OBJEXT): src/$(am__dirstamp) \1090 src/datalogger.$(OBJEXT): src/$(am__dirstamp) \ 1091 1091 src/$(DEPDIR)/$(am__dirstamp) 1092 1092 src/Fits.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) 1093 data Logger$(EXEEXT): $(dataLogger_OBJECTS) $(dataLogger_DEPENDENCIES)1094 @rm -f data Logger$(EXEEXT)1095 $(AM_V_CXXLD)$(CXXLINK) $(data Logger_OBJECTS) $(dataLogger_LDADD) $(LIBS)1093 datalogger$(EXEEXT): $(datalogger_OBJECTS) $(datalogger_DEPENDENCIES) 1094 @rm -f datalogger$(EXEEXT) 1095 $(AM_V_CXXLD)$(CXXLINK) $(datalogger_OBJECTS) $(datalogger_LDADD) $(LIBS) 1096 1096 src/dclient5.$(OBJEXT): src/$(am__dirstamp) \ 1097 1097 src/$(DEPDIR)/$(am__dirstamp) … … 1347 1347 -rm -f src/chatclient.$(OBJEXT) 1348 1348 -rm -f src/chatserv.$(OBJEXT) 1349 -rm -f src/data Logger.$(OBJEXT)1349 -rm -f src/datalogger.$(OBJEXT) 1350 1350 -rm -f src/dclient5.$(OBJEXT) 1351 1351 -rm -f src/dimctrl.$(OBJEXT) … … 1440 1440 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatclient.Po@am__quote@ 1441 1441 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatserv.Po@am__quote@ 1442 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/data Logger.Po@am__quote@1442 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/datalogger.Po@am__quote@ 1443 1443 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dclient5.Po@am__quote@ 1444 1444 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dimctrl.Po@am__quote@
Note:
See TracChangeset
for help on using the changeset viewer.