Changeset 10447

Timestamp:

04/21/11 17:40:34 (14 years ago)

Author:

tbretz

Message:

Replaced HAS_QT4 by HAS_GUI; added ROOTGLIBS

File:

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

trunk/FACT++/Makefile.am

@@ -23 +23 @@
 #-------------------------------------------------------------------------
 
-if HAS_QT4
+if HAS_GUI
 QT4_EXECUTABLES = fact
 endif
@@ -35 +35 @@
 #       ftmctrl ftm \
 #       chatclient chatserv \
-#       fitsgrep test \
-#       sched astro test ftm ftmctrl 
+#       fitsgrep test
+#       sched astro
 
 lib_LTLIBRARIES = libDim.la libDim++.la libTime.la libTools.la \
@@ -221 +221 @@
 # -----
 
-if HAS_QT4
+if HAS_GUI
 DIALOGS = \
         gui/design.ui
@@ -241 +241 @@
 EXTRA_DIST += $(DIALOGS) $(RESOURCES)
 
-fact_LDADD = $(ROOTLDFLAGS) $(QT4_LIB) $(QT4_LDFLAGS) \
+fact_LDADD = $(ROOTLDFLAGS) $(ROOTGLIBS) $(QT4_LIB) $(QT4_LDFLAGS) -L. \
         libDim.la libDim++.la libTools.la libTime.la libStateMachine.la