Changeset 10457 for trunk/FACT++

Timestamp:

04/26/11 11:32:38 (14 years ago)

Author:

tbretz

Message:

Found a way to add some targets without having them in 'all'; made compilation of did conditional.

File:

• trunk/FACT++/Makefile.am (modified) (4 diffs)

trunk/FACT++/Makefile.am

@@ -29 +29 @@
 
 bin_PROGRAMS = $(QT4_EXECUTABLES) \
-        dns did \
+        dns \
         log logtime time argv \
         test3 dclient5 dserver2 \
         dataLogger
-#       ftmctrl ftm \
-#       chatclient chatserv \
-#       fitsgrep test
-#       sched astro
+
+
+if HAS_LIBXP
+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+= \
+        test \
+        ftmctrl ftm \
+        chatclient chatserv \
+        fitsgrep test \
+        sched astro
+endif
+
 
 lib_LTLIBRARIES = libDim.la libDim++.la libTime.la libTools.la \
@@ -166 +178 @@
 dserver2_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
 
-#ftm_SOURCES = src/ftm.cc src/HeadersFTM.cc
-#ftm_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
+ftm_SOURCES = src/ftm.cc src/HeadersFTM.cc
+ftm_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
 
 
@@ -186 +198 @@
     libConfiguration.la
 
-#ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFTM.cc
-#ftmctrl_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
-#    libConfiguration.la
+ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.cc src/LocalControl.h src/HeadersFTM.cc
+ftmctrl_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
+    libConfiguration.la
 
 
@@ -209 +221 @@
 #astro_LDADD = libAstro.la libTime.la 
 
-#test_SOURCES = src/test.cc
-#test_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
+test_SOURCES = src/test.cc
+test_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
 
 dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc src/LocalControl.h src/Fits.cc