Changeset 18508 for trunk/FACT++

Timestamp:

05/23/16 17:20:47 (9 years ago)

Author:

tbretz

Message:

Moved -lGQt to fact compilation, removed duplicate rootifysql entry

File:

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

trunk/FACT++/Makefile.am

@@ -15 +15 @@
    -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
    $(SVN_REVISION)
-
-if HAS_ROOT_QT
-AM_CPPFLAGS += -lGQt
-endif
 
 AM_CXXFLAGS = $(AM_CPPFLAGS) \
@@ -58 +54 @@
 if HAS_V8
 bin_PROGRAMS += dimctrl dimserver
-endif
-
-if HAS_ROOT
-bin_PROGRAMS += rootifysql
 endif
 
@@ -620 +612 @@
         $(viewer_DIALOGS) $(viewer_RESOURCES) 
 
-fact_LDADD = $(ROOTLDFLAGS) $(ROOTGLIBS) $(QT4_LIB) $(QT4_LDFLAGS) -L. \
+fact_LDADD = $(ROOTLDFLAGS) $(ROOTGLIBS) -lGQt $(QT4_LIB) $(QT4_LDFLAGS) -L. \
         libDim++.la libDim.la libDimExtension.la \
         libTools.la libStateMachine.la libTime.la libTools.la \