Changeset 10404 for trunk

Timestamp:

04/18/11 17:44:08 (14 years ago)

Author:

tbretz

Message:

Added the fact gui and QT4 support.

File:

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

trunk/FACT++/Makefile.am

@@ -5 +5 @@
 ACLOCAL_AMFLAGS = -I .macro_dir
 
-DIM_FLAGS   = -DMIPSEL -DPROTOCOL=1 -Dunix -Dlinux
-BOOST_FLAGS = -DBOOST_DISABLE_ASSERTS
+DIM_FLAGS    = -DMIPSEL -DPROTOCOL=1 -Dunix -Dlinux
+BOOST_FLAGS  = -DBOOST_DISABLE_ASSERTS
 
 AM_CPPFLAGS = \
@@ -12 +12 @@
    -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS)
 
-AM_CXXFLAGS = $(AM_CPPFLAGS) -Woverloaded-virtual -Wshadow -std=c++0x
+AM_CXXFLAGS = $(AM_CPPFLAGS) $(QT4_INCLUDES) \
+   -Woverloaded-virtual -Wshadow -std=c++0x
 
 # -no-undefined
-AM_LDFLAGS = -module -avoid-version
+AM_LDFLAGS = $(QT4_LIB) $(QT4_LDFLAGS) \
+   -module -avoid-version
 
 #$(man3_MANS): doxygen-doc
@@ -23 +25 @@
 #-------------------------------------------------------------------------
 
-bin_PROGRAMS = \
+if HAS_QT4
+QT4_EXECUTABLES = fact
+endif
+
+
+bin_PROGRAMS = $(QT4_EXECUTABLES) \
         dns did \
-        log logtime argv time \
-        test3 dclient5 dserver2 dataLogger
+        log logtime time argv \
+        test3 dclient5 dserver2 \
+        dataLogger 
 #       sched astro test ftm ftmctrl 
 
@@ -107 +115 @@
         dim/dim/sllist.hxx \
         dim/dim/tokenstring.hxx 
-        
+
 libDim___la_SOURCES = \
         dim/src/diccpp.cxx \
@@ -125 +133 @@
         src/EventImp.h        src/EventImp.cc \
         src/Event.h           src/Event.cc \
+        src/State.h           src/State.cc \
         src/Description.h     src/Description.cc \
         src/MessageImp.h      src/MessageImp.cc \
@@ -132 +141 @@
         \
         src/EventDim.h \
-        src/MessageDim.h      src/MessageDim.cc \
-        src/StateMachineDim.h src/StateMachineDim.cc \
-        src/ServiceList.h     src/ServiceList.cc \
+        src/MessageDim.h         src/MessageDim.cc \
+        src/StateMachineDim.h    src/StateMachineDim.cc \
+        src/DimServerList.h      src/DimServerList.cc \
+        src/DimServiceInfoList.h src/DimServiceInfoList.cc \
+        src/DimNetworkList.h     src/DimNetwork.cc \
+        src/ServiceList.h        src/ServiceList.cc \
         src/DimErrorRedirecter.h  \
         src/DimErrorRedirecter.cc \
@@ -165 +177 @@
 
 
+#chatserv_LDADD = libStateMachine.la libConfiguration.la libTools.la libTime.la libDim.la libDim++.la
+#chatserv_SOURCES = src/chatserv.cc src/LocalControl.cc src/LocalControl.h
+
+
 dclient5_SOURCES = src/dclient5.cc src/LocalControl.cc src/LocalControl.h
 dclient5_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
@@ -173 +189 @@
 #    libConfiguration.la
 
-#sched_SOURCES = src/sched.cc src/LocalControl.cc src/LocalControl.h
-#sched_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
-#    libConfiguration.la
-
 
 argv_SOURCES = src/argv.cc
@@ -186 +198 @@
 
 
+#chatclient_SOURCES = src/chatclient.cc src/ChatClient.cc src/ChatClient.h
+#chatclient_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
+
+
 time_SOURCES = src/time.cc
 time_LDADD = libTime.la 
@@ -195 +211 @@
 #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
+dataLogger_SOURCES = src/dataLogger.cc src/LocalControl.cc src/LocalControl.h src/Fits.cc
 dataLogger_LDADD   = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
     libConfiguration.la
 
+#fitsgrep_SOURCES = src/fitsgrep.cc
+#fitsgrep_LDADD   = libConfiguration.la
+
+# -----
+
+if HAS_QT4
+DIALOGS = \
+        gui/design.ui 
+
+QT_SOURCES = \
+        gui/HtmlDelegate.cc \
+        gui/CheckBoxDelegate.cc \
+        gui/DockWindow.cc \
+        gui/MainWindow.cc
+endif
+
+BUILT_SOURCES = $(DIALOGS:.ui=.h) $(QT_SOURCES:.cc=.moc.cc)
+                
+CLEANFILES += $(BUILT_SOURCES)
+
+fact_LDADD = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la 
+fact_SOURCES = $(BUILT_SOURCES) $(DIALOGS) $(QT_SOURCES) \
+        gui/fact.cc gui/FactGui.cc
+
+
+#-------------------------------------------------------------------------
+
+SUFFIXES = .moc.cc
+
+.ui.h: $<
+        $(AM_V_GEN)$(UIC4) $< -o $@
+
+.h.moc.cc:
+        $(AM_V_GEN)$(MOC4) $(EXTRA_CPPFLAGS) $< -o $@
+
+.qrc.qrc.cc:
+        $(AM_V_GEN)$(RCC4) -name `echo "$<" | sed 's|^.*/\(.*\)\.qrc$$|\1|'` $< -o $@
+
+
 #-------------------------------------------------------------------------
 
@@ -206 +261 @@
 
 .man.html: $<
-        $(AM_V_GEN)groff -mandoc `man -w ./$<` -T html > $@
+        $(AM_V_GEN)groff -mandoc `man -w -l $<` -T html > $@
 
 MAN_TARGETS += $(dist_man1_MANS:.man=.html)
@@ -213 +268 @@
 if HAS_PS2PDF
 .man.pdf: $<
-        $(AM_V_GEN)groff -mandoc `man -w ./$<` | ps2pdf - $@
+        $(AM_V_GEN)groff -mandoc `man -w -l $<` | ps2pdf - $@
 
 MAN_TARGETS += $(dist_man1_MANS:.man=.pdf)
@@ -234 +289 @@
         @svn diff | $(COLORDIFF)
 
+#-------------------------------------------------------------------------
 
 # Overwrite rules for silent or other verbosity levels
@@ -250 +306 @@
 #        done
 
+#CLEANFILES = *~ *.rej *.orig
+#MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in \
+#        stamp-h.in stamp-h[0-9].in
+#DISTCLEANFILES = config.cache config.log