Changeset 18376

Timestamp:

11/08/15 09:25:57 (9 years ago)

Author:

tbretz

Message:

Removed cosyctrl from the default programs which are built and fixed a bug in the doc target.

Location:

trunk/FACT++

Files:

• Makefile.am (modified) (4 diffs)
• Makefile.in (modified) (4 diffs)

trunk/FACT++/Makefile.am

@@ -40 +40 @@
         gcn \
         chatclient chatserv \
-        biasctrl drivectrl cosyctrl agilentctrl \
+        biasctrl drivectrl agilentctrl \
         mcp feedback ratescan ratecontrol \
         tngweather lidctrl gpsctrl pfminictrl sqmctrl pwrctrl \
@@ -89 +89 @@
         dclient5 dserver2 \
         fitsloader fitsgrep \
-        sched astro readfits
+        sched astro readfits \
+        cosyctrl
 endif
 
@@ -101 +102 @@
         biasctrl.man \
         datalogger.man \
-        cosyctrl.man \
         dimctrl.man \
         dimserver.man \
@@ -684 +684 @@
 doc: $(MAN_TARGETS) $(JAVA_SCRIPT_DOC) doxygen-run
         @cd doxygen-doc/html
-        @ln -s index.html main.html
+        @ln -sf index.html main.html
         @mkdir -p pdf
         @mkdir -p man

trunk/FACT++/Makefile.in

@@ -51 +51 @@
         fadctrl$(EXEEXT) fscctrl$(EXEEXT) gcn$(EXEEXT) \
         chatclient$(EXEEXT) chatserv$(EXEEXT) biasctrl$(EXEEXT) \
-        drivectrl$(EXEEXT) cosyctrl$(EXEEXT) agilentctrl$(EXEEXT) \
-        mcp$(EXEEXT) feedback$(EXEEXT) ratescan$(EXEEXT) \
-        ratecontrol$(EXEEXT) tngweather$(EXEEXT) lidctrl$(EXEEXT) \
-        gpsctrl$(EXEEXT) pfminictrl$(EXEEXT) sqmctrl$(EXEEXT) \
-        pwrctrl$(EXEEXT) magicweather$(EXEEXT) magiclidar$(EXEEXT) \
-        smartfact$(EXEEXT) evtserver$(EXEEXT) getevent$(EXEEXT) \
-        temperature$(EXEEXT) timecheck$(EXEEXT) showlog$(EXEEXT) \
-        fitsdump$(EXEEXT) fitscheck$(EXEEXT) fitsselect$(EXEEXT) \
-        zfits$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
+        drivectrl$(EXEEXT) agilentctrl$(EXEEXT) mcp$(EXEEXT) \
+        feedback$(EXEEXT) ratescan$(EXEEXT) ratecontrol$(EXEEXT) \
+        tngweather$(EXEEXT) lidctrl$(EXEEXT) gpsctrl$(EXEEXT) \
+        pfminictrl$(EXEEXT) sqmctrl$(EXEEXT) pwrctrl$(EXEEXT) \
+        magicweather$(EXEEXT) magiclidar$(EXEEXT) smartfact$(EXEEXT) \
+        evtserver$(EXEEXT) getevent$(EXEEXT) temperature$(EXEEXT) \
+        timecheck$(EXEEXT) showlog$(EXEEXT) fitsdump$(EXEEXT) \
+        fitscheck$(EXEEXT) fitsselect$(EXEEXT) zfits$(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)
@@ -77 +77 @@
 @IS_FALSE@      dclient5 dserver2 \
 @IS_FALSE@      fitsloader fitsgrep \
-@IS_FALSE@      sched astro readfits
+@IS_FALSE@      sched astro readfits \
+@IS_FALSE@      cosyctrl
 
 @HAS_FITS_TRUE@am__append_9 = src/FitsFile.h src/FitsFile.cc \
@@ -235 +236 @@
 @IS_FALSE@      dserver2$(EXEEXT) fitsloader$(EXEEXT) \
 @IS_FALSE@      fitsgrep$(EXEEXT) sched$(EXEEXT) astro$(EXEEXT) \
-@IS_FALSE@      readfits$(EXEEXT)
+@IS_FALSE@      readfits$(EXEEXT) cosyctrl$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 am_agilentctrl_OBJECTS = src/agilentctrl.$(OBJEXT)
@@ -924 +925 @@
 @HAS_HELP2MAN_TRUE@     biasctrl.man \
 @HAS_HELP2MAN_TRUE@     datalogger.man \
-@HAS_HELP2MAN_TRUE@     cosyctrl.man \
 @HAS_HELP2MAN_TRUE@     dimctrl.man \
 @HAS_HELP2MAN_TRUE@     dimserver.man \