Changeset 10432 for trunk

Timestamp:

04/20/11 17:21:21 (13 years ago)

Author:

tbretz

Message:

Added root support to the GUI.

File:

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

trunk/FACT++/Makefile.am

@@ -8 +8 @@
 BOOST_FLAGS  = -DBOOST_DISABLE_ASSERTS
 
-AM_CPPFLAGS = \
-   -O3 -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
-   -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS)
+AM_CPPFLAGS = -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \
+   -O3 -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2
 
 AM_CXXFLAGS = $(AM_CPPFLAGS) $(QT4_INCLUDES) \
@@ -16 +15 @@
 
 # -no-undefined
-AM_LDFLAGS = $(QT4_LIB) $(QT4_LDFLAGS) \
-   -module -avoid-version
+AM_LDFLAGS = -module -avoid-version
 
 #$(man3_MANS): doxygen-doc
@@ -34 +32 @@
         log logtime time argv \
         test3 dclient5 dserver2 \
-        dataLogger 
+        dataLogger
+#       ftmctrl ftm \
+#       chatclient chatserv \
+#       fitsgrep test \
 #       sched astro test ftm ftmctrl 
 
@@ -165 +166 @@
 dserver2_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
 
-#ftm_SOURCES = src/ftm.cc 
+#ftm_SOURCES = src/ftm.cc src/HeadersFTM.cc
 #ftm_LDADD   = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
 
@@ -185 +186 @@
     libConfiguration.la
 
-#ftmctrl_SOURCES = src/ftmctrl.cc src/LocalControl.cc src/LocalControl.h
+#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
@@ -240 +241 @@
 EXTRA_DIST += $(DIALOGS) $(RESOURCES)
 
-fact_LDADD = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la 
+fact_LDADD = $(ROOTLDFLAGS) $(QT4_LIB) $(QT4_LDFLAGS) \
+        libDim.la libDim++.la libTools.la libTime.la libStateMachine.la
+        
 fact_SOURCES = $(BUILT_SOURCES) $(QT_SOURCES) \
         gui/fact.cc gui/FactGui.cc