Changeset 17193 for trunk/FACT++

Timestamp:

09/19/13 16:45:43 (11 years ago)

Author:

tbretz

Message:

Added libTools to fitsdump

Location:

trunk/FACT++

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (10 diffs)

trunk/FACT++/Makefile.am

@@ -47 +47 @@
         showlog \
         fitsdump fitscheck \
-        zfits \
-        fitsCompressor
+        zfits
 
 if HAS_GUI
@@ -453 +452 @@
 
 fitsdump_SOURCES = src/fitsdump.cc 
-fitsdump_LDADD   = $(ROOTLDFLAGS) $(ROOTLIBS) libConfiguration.la libTime.la
+fitsdump_LDADD   = $(ROOTLDFLAGS) $(ROOTLIBS) libTools.la libConfiguration.la libTime.la
 
 fitscheck_SOURCES = src/fitscheck.cc 

trunk/FACT++/Makefile.in

@@ -53 +53 @@
         temperature$(EXEEXT) timecheck$(EXEEXT) showlog$(EXEEXT) \
         fitsdump$(EXEEXT) fitscheck$(EXEEXT) zfits$(EXEEXT) \
-        fitsCompressor$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
-        $(am__EXEEXT_3) $(am__EXEEXT_4) $(am__EXEEXT_5) \
-        $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8)
+        $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
+        $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
+        $(am__EXEEXT_7) $(am__EXEEXT_8)
 @HAS_GUI_TRUE@am__append_1 = fact
 @HAS_DBUS_TRUE@am__append_2 = skypeclient
@@ -320 +320 @@
 feedback_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
         libStateMachine.la libTools.la libTime.la libConfiguration.la
-am_fitsCompressor_OBJECTS = src/fitsCompressor.$(OBJEXT)
-fitsCompressor_OBJECTS = $(am_fitsCompressor_OBJECTS)
-fitsCompressor_DEPENDENCIES = libConfiguration.la
 am_fitscheck_OBJECTS = src/fitscheck.$(OBJEXT)
 fitscheck_OBJECTS = $(am_fitscheck_OBJECTS)
@@ -329 +326 @@
 fitsdump_OBJECTS = $(am_fitsdump_OBJECTS)
 fitsdump_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-        libConfiguration.la libTime.la
+        libTools.la libConfiguration.la libTime.la
 fitsgrep_SOURCES = fitsgrep.c
 fitsgrep_OBJECTS = fitsgrep.$(OBJEXT)
@@ -537 +534 @@
         $(dns_SOURCES) $(drivectrl_SOURCES) $(dserver2_SOURCES) \
         $(fact_SOURCES) $(fad_SOURCES) $(fadctrl_SOURCES) \
-        $(feedback_SOURCES) $(fitsCompressor_SOURCES) \
-        $(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
-        $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
-        $(ftm_SOURCES) $(ftmctrl_SOURCES) $(gcn_SOURCES) \
-        $(lidctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
-        $(magiclidar_SOURCES) $(magicweather_SOURCES) \
-        $(makedata_SOURCES) $(makeplots_SOURCES) $(mcp_SOURCES) \
-        $(moon_SOURCES) $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) \
-        $(ratescan_SOURCES) $(readfits_SOURCES) sched.c \
-        $(scheduler_SOURCES) $(showlog_SOURCES) $(skypeclient_SOURCES) \
-        $(smartfact_SOURCES) $(temperature_SOURCES) $(test_SOURCES) \
-        $(time_SOURCES) $(timecheck_SOURCES) $(tngweather_SOURCES) \
+        $(feedback_SOURCES) $(fitscheck_SOURCES) $(fitsdump_SOURCES) \
+        fitsgrep.c $(fitsloader_SOURCES) $(fsc_SOURCES) \
+        $(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
+        $(gcn_SOURCES) $(lidctrl_SOURCES) $(log_SOURCES) \
+        $(logtime_SOURCES) $(magiclidar_SOURCES) \
+        $(magicweather_SOURCES) $(makedata_SOURCES) \
+        $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
+        $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \
+        $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \
+        $(showlog_SOURCES) $(skypeclient_SOURCES) $(smartfact_SOURCES) \
+        $(temperature_SOURCES) $(test_SOURCES) $(time_SOURCES) \
+        $(timecheck_SOURCES) $(tngweather_SOURCES) \
         $(triggerschedule_SOURCES) $(viewer_SOURCES) $(webDid_SOURCES) \
         $(zfits_SOURCES)
@@ -561 +558 @@
         $(dserver2_SOURCES) $(am__fact_SOURCES_DIST) $(fad_SOURCES) \
         $(am__fadctrl_SOURCES_DIST) $(feedback_SOURCES) \
-        $(fitsCompressor_SOURCES) $(fitscheck_SOURCES) \
-        $(fitsdump_SOURCES) fitsgrep.c $(fitsloader_SOURCES) \
-        $(fsc_SOURCES) $(fscctrl_SOURCES) $(ftm_SOURCES) \
-        $(ftmctrl_SOURCES) $(gcn_SOURCES) $(lidctrl_SOURCES) \
-        $(log_SOURCES) $(logtime_SOURCES) $(magiclidar_SOURCES) \
-        $(magicweather_SOURCES) $(makedata_SOURCES) \
-        $(makeplots_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
-        $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) $(ratescan_SOURCES) \
-        $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \
-        $(showlog_SOURCES) $(skypeclient_SOURCES) $(smartfact_SOURCES) \
-        $(temperature_SOURCES) $(test_SOURCES) $(time_SOURCES) \
-        $(timecheck_SOURCES) $(tngweather_SOURCES) \
+        $(fitscheck_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
+        $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
+        $(ftm_SOURCES) $(ftmctrl_SOURCES) $(gcn_SOURCES) \
+        $(lidctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
+        $(magiclidar_SOURCES) $(magicweather_SOURCES) \
+        $(makedata_SOURCES) $(makeplots_SOURCES) $(mcp_SOURCES) \
+        $(moon_SOURCES) $(pwrctrl_SOURCES) $(ratecontrol_SOURCES) \
+        $(ratescan_SOURCES) $(readfits_SOURCES) sched.c \
+        $(scheduler_SOURCES) $(showlog_SOURCES) $(skypeclient_SOURCES) \
+        $(smartfact_SOURCES) $(temperature_SOURCES) $(test_SOURCES) \
+        $(time_SOURCES) $(timecheck_SOURCES) $(tngweather_SOURCES) \
         $(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST) \
         $(webDid_SOURCES) $(zfits_SOURCES)
@@ -1141 +1137 @@
 fitsloader_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
 fitsdump_SOURCES = src/fitsdump.cc 
-fitsdump_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libConfiguration.la libTime.la
+fitsdump_LDADD = $(ROOTLDFLAGS) $(ROOTLIBS) libTools.la libConfiguration.la libTime.la
 fitscheck_SOURCES = src/fitscheck.cc 
 fitscheck_LDADD = libConfiguration.la
@@ -1597 +1593 @@
         @rm -f feedback$(EXEEXT)
         $(AM_V_CXXLD)$(CXXLINK) $(feedback_OBJECTS) $(feedback_LDADD) $(LIBS)
-src/fitsCompressor.$(OBJEXT): src/$(am__dirstamp) \
-        src/$(DEPDIR)/$(am__dirstamp)
-fitsCompressor$(EXEEXT): $(fitsCompressor_OBJECTS) $(fitsCompressor_DEPENDENCIES) $(EXTRA_fitsCompressor_DEPENDENCIES) 
-        @rm -f fitsCompressor$(EXEEXT)
-        $(AM_V_CXXLD)$(CXXLINK) $(fitsCompressor_OBJECTS) $(fitsCompressor_LDADD) $(LIBS)
 src/fitscheck.$(OBJEXT): src/$(am__dirstamp) \
         src/$(DEPDIR)/$(am__dirstamp)
@@ -1965 +1956 @@
         -rm -f src/fadctrl.$(OBJEXT)
         -rm -f src/feedback.$(OBJEXT)
-        -rm -f src/fitsCompressor.$(OBJEXT)
         -rm -f src/fitscheck.$(OBJEXT)
         -rm -f src/fitsdump.$(OBJEXT)
@@ -2114 +2104 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fadctrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/feedback.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fitsCompressor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fitscheck.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fitsdump.Po@am__quote@
@@ -2953 +2942 @@
 
 doc: $(MAN_TARGETS) $(JAVA_SCRIPT_DOC) doxygen-run
+        @ln -s index.html doxygen-doc/html/main.html
 
 diff: