Changeset 11903 for trunk

Timestamp:

08/12/11 21:24:25 (13 years ago)

Author:

tbretz

Message:

Updated what is needed to compiule the viewer.

Location:

trunk/FACT++

Files:

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

trunk/FACT++/Makefile.am

@@ -348 +348 @@
 
 viewer_QT_SOURCES = \
-        gui/RawEventsViewer/RawEventsViewer.cc
+        gui/RawEventsViewer/RawEventsViewer.cc \
+        gui/BasicGlCamera.cc
 
 viewer_SRCADD = $(viewer_DIALOGS:.ui=.h) $(viewer_RESOURCES:.qrc=.cc) $(viewer_QT_SOURCES:.cc=.moc.cc)
@@ -373 +374 @@
         gui/fact.cc gui/FactGui.cc src/HeadersFTM.cc
 
-viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU libConfiguration.la
+viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU libConfiguration.la libTools.la
 
 viewer_SOURCES = $(viewer_SRCADD) $(viewer_QT_SOURCES)

trunk/FACT++/Makefile.in

@@ -331 +331 @@
 am__viewer_SOURCES_DIST = gui/RawEventsViewer/viewer.h \
         gui/RawEventsViewer/RawEventsViewer.moc.cc \
-        gui/RawEventsViewer/RawEventsViewer.cc
-@HAS_VIEWER_TRUE@am__objects_8 = gui/RawEventsViewer/RawEventsViewer.moc.$(OBJEXT)
+        gui/BasicGlCamera.moc.cc \
+        gui/RawEventsViewer/RawEventsViewer.cc gui/BasicGlCamera.cc
+@HAS_VIEWER_TRUE@am__objects_8 = gui/RawEventsViewer/RawEventsViewer.moc.$(OBJEXT) \
+@HAS_VIEWER_TRUE@       gui/BasicGlCamera.moc.$(OBJEXT)
 @HAS_VIEWER_TRUE@am__objects_9 = $(am__objects_2) $(am__objects_8)
-@HAS_VIEWER_TRUE@am__objects_10 = gui/RawEventsViewer/RawEventsViewer.$(OBJEXT)
+@HAS_VIEWER_TRUE@am__objects_10 = gui/RawEventsViewer/RawEventsViewer.$(OBJEXT) \
+@HAS_VIEWER_TRUE@       gui/BasicGlCamera.$(OBJEXT)
 am_viewer_OBJECTS = $(am__objects_9) $(am__objects_10)
 viewer_OBJECTS = $(am_viewer_OBJECTS)
 viewer_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-        libConfiguration.la
+        libConfiguration.la libTools.la
 SCRIPTS = $(dist_noinst_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
@@ -908 +911 @@
 
 @HAS_VIEWER_TRUE@viewer_QT_SOURCES = \
-@HAS_VIEWER_TRUE@       gui/RawEventsViewer/RawEventsViewer.cc
+@HAS_VIEWER_TRUE@       gui/RawEventsViewer/RawEventsViewer.cc \
+@HAS_VIEWER_TRUE@       gui/BasicGlCamera.cc
 
 @HAS_VIEWER_TRUE@viewer_SRCADD = $(viewer_DIALOGS:.ui=.h) $(viewer_RESOURCES:.qrc=.cc) $(viewer_QT_SOURCES:.cc=.moc.cc)
@@ -921 +925 @@
         gui/fact.cc gui/FactGui.cc src/HeadersFTM.cc
 
-viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU libConfiguration.la
+viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU libConfiguration.la libTools.la
 viewer_SOURCES = $(viewer_SRCADD) $(viewer_QT_SOURCES)