Changeset 11341 for trunk

Timestamp:

07/11/11 11:15:26 (13 years ago)

Author:

tbretz

Message:

Updated; minor changes; compile chatclient and chatserver by default; do not compile dclient5 and dserver2 by default

Location:

trunk/FACT++

Files:

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

trunk/FACT++/Makefile.am

@@ -23 +23 @@
 #-------------------------------------------------------------------------
 
-if HAS_GUI
-QT4_EXECUTABLES = fact
-endif
-
 # Executables which are build by default ('all')
-bin_PROGRAMS = $(QT4_EXECUTABLES) \
+bin_PROGRAMS = \
         dns \
         log logtime time argv \
-        dimctrl dclient5 dserver2 \
+        dimctrl \
         datalogger scheduler \
         triggerschedule \
@@ -37 +33 @@
         fadctrl fad \
         fscctrl fsc \
+        chatclient chatserv \
         biasctrl \
         fitsdump
 
+if HAS_GUI
+bin_PROGRAMS += fact
+endif
 
 if HAS_LIBXP
-bin_PROGRAMS+= did
+bin_PROGRAMS += did
 endif
 
 # This is a trick to be able to build them but not having them in 'all'
 if IS_FALSE
-bin_PROGRAMS+= \
+bin_PROGRAMS += \
         test \
-        fadctrl \
-        chatclient chatserv \
-        fitsloader fitsgrep test \
+        dclient5 dserver2 \
+        fitsloader fitsgrep \
         sched astro drivectrl
 endif

trunk/FACT++/Makefile.in

@@ -46 +46 @@
         .aux_dir/ltmain.sh .aux_dir/missing AUTHORS COPYING ChangeLog \
         INSTALL NEWS
-bin_PROGRAMS = $(am__EXEEXT_1) dns$(EXEEXT) log$(EXEEXT) \
-        logtime$(EXEEXT) time$(EXEEXT) argv$(EXEEXT) dimctrl$(EXEEXT) \
-        dclient5$(EXEEXT) dserver2$(EXEEXT) datalogger$(EXEEXT) \
-        scheduler$(EXEEXT) triggerschedule$(EXEEXT) ftmctrl$(EXEEXT) \
-        ftm$(EXEEXT) fadctrl$(EXEEXT) fad$(EXEEXT) fscctrl$(EXEEXT) \
-        fsc$(EXEEXT) biasctrl$(EXEEXT) fitsdump$(EXEEXT) \
-        $(am__EXEEXT_2) $(am__EXEEXT_3)
-@HAS_LIBXP_TRUE@am__append_1 = did
+bin_PROGRAMS = dns$(EXEEXT) log$(EXEEXT) logtime$(EXEEXT) \
+        time$(EXEEXT) argv$(EXEEXT) dimctrl$(EXEEXT) \
+        datalogger$(EXEEXT) scheduler$(EXEEXT) \
+        triggerschedule$(EXEEXT) ftmctrl$(EXEEXT) ftm$(EXEEXT) \
+        fadctrl$(EXEEXT) fad$(EXEEXT) fscctrl$(EXEEXT) fsc$(EXEEXT) \
+        chatclient$(EXEEXT) chatserv$(EXEEXT) biasctrl$(EXEEXT) \
+        fitsdump$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
+        $(am__EXEEXT_3)
+@HAS_GUI_TRUE@am__append_1 = fact
+@HAS_LIBXP_TRUE@am__append_2 = did
 
 # This is a trick to be able to build them but not having them in 'all'
-@IS_FALSE@am__append_2 = \
+@IS_FALSE@am__append_3 = \
 @IS_FALSE@      test \
-@IS_FALSE@      fadctrl \
-@IS_FALSE@      chatclient chatserv \
-@IS_FALSE@      fitsloader fitsgrep test \
+@IS_FALSE@      dclient5 dserver2 \
+@IS_FALSE@      fitsloader fitsgrep \
 @IS_FALSE@      sched astro drivectrl
 
-@HAS_FITS_TRUE@am__append_3 = src/Fits.cc
-@HAS_GROFF_TRUE@am__append_4 = $(dist_man1_MANS:.man=.html)
-@HAS_GROFF_TRUE@am__append_5 = $(dist_man1_MANS:.man=.html) 
+@HAS_FITS_TRUE@am__append_4 = src/Fits.cc
+@HAS_GROFF_TRUE@am__append_5 = $(dist_man1_MANS:.man=.html)
 @HAS_GROFF_TRUE@am__append_6 = $(dist_man1_MANS:.man=.html) 
-@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_7 = $(dist_man1_MANS:.man=.pdf)
+@HAS_GROFF_TRUE@am__append_7 = $(dist_man1_MANS:.man=.html) 
 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_8 = $(dist_man1_MANS:.man=.pdf)
 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_9 = $(dist_man1_MANS:.man=.pdf)
+@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_10 = $(dist_man1_MANS:.man=.pdf)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -158 +159 @@
 @HAS_GUI_TRUE@am__EXEEXT_1 = fact$(EXEEXT)
 @HAS_LIBXP_TRUE@am__EXEEXT_2 = did$(EXEEXT)
-@IS_FALSE@am__EXEEXT_3 = test$(EXEEXT) fadctrl$(EXEEXT) \
-@IS_FALSE@      chatclient$(EXEEXT) chatserv$(EXEEXT) \
-@IS_FALSE@      fitsloader$(EXEEXT) fitsgrep$(EXEEXT) test$(EXEEXT) \
-@IS_FALSE@      sched$(EXEEXT) astro$(EXEEXT) drivectrl$(EXEEXT)
+@IS_FALSE@am__EXEEXT_3 = test$(EXEEXT) dclient5$(EXEEXT) \
+@IS_FALSE@      dserver2$(EXEEXT) fitsloader$(EXEEXT) \
+@IS_FALSE@      fitsgrep$(EXEEXT) sched$(EXEEXT) astro$(EXEEXT) \
+@IS_FALSE@      drivectrl$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 am_argv_OBJECTS = src/argv.$(OBJEXT)
@@ -622 +623 @@
 # -no-undefined
 AM_LDFLAGS = -module -avoid-version
-
-#$(man3_MANS): doxygen-doc
-#DX_CLEANFILES = everything to clean.
-# Add to MOSTLYCLEANFILES.
-
-#-------------------------------------------------------------------------
-@HAS_GUI_TRUE@QT4_EXECUTABLES = fact
 lib_LTLIBRARIES = \
         libDim.la libDim++.la libDimExtension.la libTime.la libTools.la \
@@ -639 +633 @@
 
 #-------------------------------------------------------------------------
-CLEANFILES = $(BUILT_SOURCES) $(am__append_6) $(am__append_9)
+CLEANFILES = $(BUILT_SOURCES) $(am__append_7) $(am__append_10)
 dist_noinst_SCRIPTS = autogen.sh
 EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \
@@ -646 +640 @@
         dim/README_v14.txt dim/README_v17.txt dim/README_v16.txt \
         dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
-        $(DIALOGS) $(RESOURCES) $(am__append_5) $(am__append_8)
+        $(DIALOGS) $(RESOURCES) $(am__append_6) $(am__append_9)
 dns_LDADD = libDim.la libDimExtension.la
 dns_SOURCES = src/dns.c
@@ -811 +805 @@
 test_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
 datalogger_SOURCES = src/datalogger.cc src/LocalControl.h \
-        $(am__append_3)
+        $(am__append_4)
 datalogger_LDADD = libDim.la libDim++.la libDimExtension.la \
         libTime.la libTools.la libStateMachine.la \
@@ -856 +850 @@
 
 #-------------------------------------------------------------------------
-MAN_TARGETS = $(dist_man1_MANS) $(am__append_4) $(am__append_7)
+MAN_TARGETS = $(dist_man1_MANS) $(am__append_5) $(am__append_8)
 all: $(BUILT_SOURCES)
         $(MAKE) $(AM_MAKEFLAGS) all-am